diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/BattleGround.cpp | 16 | ||||
| -rw-r--r-- | src/shared/revision_nr.h | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp index 3aa4aa27f04..bdb78552102 100644 --- a/src/game/BattleGround.cpp +++ b/src/game/BattleGround.cpp @@ -109,12 +109,16 @@ BattleGround::~BattleGround() DelObject(i); } - // delete creature and go respawn times - WorldDatabase.PExecute("DELETE FROM creature_respawn WHERE instance = '%u'",GetInstanceID()); - WorldDatabase.PExecute("DELETE FROM gameobject_respawn WHERE instance = '%u'",GetInstanceID()); - // delete instance from db - CharacterDatabase.PExecute("DELETE FROM instance WHERE id = '%u'",GetInstanceID()); - // remove from battlegrounds + if(GetInstanceID()) // not spam by useless queries in case BG templates + { + // delete creature and go respawn times + WorldDatabase.PExecute("DELETE FROM creature_respawn WHERE instance = '%u'",GetInstanceID()); + WorldDatabase.PExecute("DELETE FROM gameobject_respawn WHERE instance = '%u'",GetInstanceID()); + // delete instance from db + CharacterDatabase.PExecute("DELETE FROM instance WHERE id = '%u'",GetInstanceID()); + // remove from battlegrounds + } + sBattleGroundMgr.RemoveBattleGround(GetInstanceID()); // unload map if(Map * map = MapManager::Instance().FindMap(GetMapId(), GetInstanceID())) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 3eb4d8c1f70..f918ca2e368 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7292" + #define REVISION_NR "7293" #endif // __REVISION_NR_H__ |