diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-19 22:33:35 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-19 22:33:35 +0200 |
| commit | d4ac53083f6313ae5c93f70df041b2ccbf8cd18c (patch) | |
| tree | 37cc4400aed3ef687edbc4025b69951b9a989f81 /sql/base | |
| parent | 557474f2ae0c393801717ce65656f7b9597ed026 (diff) | |
| parent | 1ac4f0a9c1d6bfd3d0432a76de415feb5349a821 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Globals/ObjectMgr.cpp
Diffstat (limited to 'sql/base')
| -rw-r--r-- | sql/base/characters_database.sql | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index 7d8ba894b5d..424d6fbcd0b 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -1424,7 +1424,7 @@ CREATE TABLE `corpse` ( `posZ` float NOT NULL DEFAULT '0', `orientation` float NOT NULL DEFAULT '0', `mapId` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Map Identifier', - `phaseMask` smallint(5) unsigned NOT NULL DEFAULT '1', + `phaseMask` int(10) unsigned NOT NULL DEFAULT '1', `displayId` int(10) unsigned NOT NULL DEFAULT '0', `itemCache` text NOT NULL, `bytes1` int(10) unsigned NOT NULL DEFAULT '0', |