diff options
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObjectData.h | 1 | ||||
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 10 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/SharedDefines.h | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/server/game/Entities/GameObject/GameObjectData.h b/src/server/game/Entities/GameObject/GameObjectData.h index fef749e99b6..19df41fff0c 100644 --- a/src/server/game/Entities/GameObject/GameObjectData.h +++ b/src/server/game/Entities/GameObject/GameObjectData.h @@ -126,6 +126,7 @@ struct GameObjectTemplate uint32 turnpersonallootsecurityoff; // 31 turn personal loot security off, enum { false, true, }; Default: false uint32 ChestProperties; // 32 Chest Properties, References: ChestProperties, NoValue = 0 uint32 chestPushLoot; // 33 chest Push Loot, References: Treasure, NoValue = 0 + uint32 ForceSingleLooter; // 34 Force Single Looter, enum { false, true, }; Default: false } chest; // 4 GAMEOBJECT_TYPE_BINDER struct diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index f70b8217cef..18fa0c844ed 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -7322,8 +7322,8 @@ void ObjectMgr::LoadGameObjectTemplate() "Data0, Data1, Data2, Data3, Data4, Data5, Data6, Data7, Data8, Data9, Data10, Data11, Data12, " // 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 "Data13, Data14, Data15, Data16, Data17, Data18, Data19, Data20, Data21, Data22, Data23, Data24, Data25, Data26, Data27, Data28, " - // 37 38 39 40 41 42 43 44 - "Data29, Data30, Data31, Data32, Data33, ContentTuningId, AIName, ScriptName " + // 37 38 39 40 41 42 43 44 45 + "Data29, Data30, Data31, Data32, Data33, Data34, ContentTuningId, AIName, ScriptName " "FROM gameobject_template"); if (!result) @@ -7352,9 +7352,9 @@ void ObjectMgr::LoadGameObjectTemplate() for (uint8 i = 0; i < MAX_GAMEOBJECT_DATA; ++i) got.raw.data[i] = fields[8 + i].GetUInt32(); - got.ContentTuningId = fields[42].GetInt32(); - got.AIName = fields[43].GetString(); - got.ScriptId = GetScriptId(fields[44].GetString()); + got.ContentTuningId = fields[43].GetInt32(); + got.AIName = fields[44].GetString(); + got.ScriptId = GetScriptId(fields[45].GetString()); // Checks if (!got.AIName.empty() && !sGameObjectAIRegistry->HasItem(got.AIName)) diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 024aea08142..5a19b8f7572 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -2734,7 +2734,7 @@ enum GameobjectTypes : uint8 }; #define MAX_GAMEOBJECT_TYPE 61 // sending to client this or greater value can crash client. -#define MAX_GAMEOBJECT_DATA 34 // Max number of uint32 vars in gameobject_template data field +#define MAX_GAMEOBJECT_DATA 35 // Max number of uint32 vars in gameobject_template data field enum GameObjectFlags { |