diff options
author | JaredNinja <github@exclusive-it.nl> | 2016-09-27 08:38:47 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2016-09-27 08:38:47 +0200 |
commit | 9c220e8f55eaa8cfc93ed26ea7318430e5c6749b (patch) | |
tree | f55073f3e9df9aa9f5dafb3c87951bc03bf6ad28 | |
parent | f17471e9d1424da3f1575e147adb18b1876552ee (diff) |
Core/Player: Allow graveyards to be specified for areas, not only zones
Closes #14089
Closes #18006
-rw-r--r-- | sql/updates/world/6.x/2016_09_27_00_world.sql | 3 | ||||
-rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sql/updates/world/6.x/2016_09_27_00_world.sql b/sql/updates/world/6.x/2016_09_27_00_world.sql new file mode 100644 index 00000000000..1db53d35bc5 --- /dev/null +++ b/sql/updates/world/6.x/2016_09_27_00_world.sql @@ -0,0 +1,3 @@ +-- Changing subzone 6170 (Northshire, Elwynn). Was zone 12 before, not right. +-- Part of my total fix for graveyard problems (https://github.com/TrinityCore/TrinityCore/issues/14089) +UPDATE `graveyard_zone` SET `GhostZone`= 6170 WHERE `ID`= 105 AND `Faction`= 469; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index b05576e223f..33bc54d8f45 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -5997,12 +5997,6 @@ void ObjectMgr::LoadGraveyardZones() continue; } - if (areaEntry->ParentAreaID != 0) - { - TC_LOG_ERROR("sql.sql", "Table `graveyard_zone` has a record for SubZone (ID: %u) instead of zone, skipped.", zoneId); - continue; - } - if (team != 0 && team != HORDE && team != ALLIANCE) { TC_LOG_ERROR("sql.sql", "Table `graveyard_zone` has a record for non player faction (%u), skipped.", team); |