From 484c1298e231aa95c03dfe26ba9be53b2b2ad7f3 Mon Sep 17 00:00:00 2001 From: megamage Date: Tue, 17 Feb 2009 17:40:38 -0600 Subject: [7293] Not attempt respawn/instance tables for battleground/arena templates (instance id == 0) Author: VladimirMangos --HG-- branch : trunk --- src/game/BattleGround.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/game') 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())) -- cgit v1.2.3