mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-16 15:40:45 +01:00
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
This commit is contained in:
@@ -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',
|
||||
|
||||
Reference in New Issue
Block a user