diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-04-23 15:47:50 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-04-23 15:47:50 +0200 |
| commit | 149ff8da879a8286a01081d4ffb1f200a67ddefd (patch) | |
| tree | c1921981e061348522410e7448ad73b0d89a8bb1 /src/server/game/Globals/ObjectMgr.cpp | |
| parent | 915828bb1ff3d8c8c43c253a4b645abbf5efa4f0 (diff) | |
Core/GameObjects: Removed the possibility to spawn transports wih gm commands (such objects did not have any transport mechanics but could still cause crashes)
Closes #14542
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index eafcf16383c..390962b1a0e 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -6583,7 +6583,7 @@ void ObjectMgr::LoadGameObjectTemplate() { if (got.moTransport.taxiPathID >= sTaxiPathNodesByPath.size() || sTaxiPathNodesByPath[got.moTransport.taxiPathID].empty()) TC_LOG_ERROR("sql.sql", "GameObject (Entry: %u GoType: %u) have data0=%u but TaxiPath (Id: %u) not exist.", - entry, got.type, got.moTransport.taxiPathID, got.moTransport.taxiPathID); + entry, got.type, got.moTransport.taxiPathID, got.moTransport.taxiPathID); } if (uint32 transportMap = got.moTransport.mapID) _transportMaps.insert(transportMap); @@ -9175,7 +9175,7 @@ void ObjectMgr::LoadCharacterTemplates() uint8 factionGroup = fields[0].GetUInt8(); uint8 classID = fields[1].GetUInt8(); - if (!((factionGroup & (FACTION_MASK_PLAYER | FACTION_MASK_ALLIANCE)) == (FACTION_MASK_PLAYER | FACTION_MASK_ALLIANCE)) && + if (!((factionGroup & (FACTION_MASK_PLAYER | FACTION_MASK_ALLIANCE)) == (FACTION_MASK_PLAYER | FACTION_MASK_ALLIANCE)) && !((factionGroup & (FACTION_MASK_PLAYER | FACTION_MASK_HORDE)) == (FACTION_MASK_PLAYER | FACTION_MASK_HORDE))) { TC_LOG_ERROR("sql.sql", "Faction group %u defined for character template %u in `character_template_class` is invalid. Skipped.", factionGroup, templateSetId); |