aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Instances/InstanceSaveMgr.cpp
diff options
context:
space:
mode:
authorSpp <spp@jorge.gr>2013-03-25 14:34:22 +0100
committerSpp <spp@jorge.gr>2013-03-25 14:34:22 +0100
commitc97c381ea0b63963b3756f531b8c64636cb5d66b (patch)
treec5a99580d20b16b3eb957faab142b7761fefd507 /src/server/game/Instances/InstanceSaveMgr.cpp
parent132cc295ca7f1eeb29aaa1ff821faa47ef3478f9 (diff)
parent1a6a23ec96c7646d2753198f93eaba62d2732a83 (diff)
Merge branch 'master' into 4.3.4
Conflicts: src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Object/Object.h src/server/game/Entities/Pet/Pet.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Events/GameEventMgr.cpp src/server/game/Loot/LootMgr.cpp src/server/shared/Packets/ByteBuffer.h
Diffstat (limited to 'src/server/game/Instances/InstanceSaveMgr.cpp')
-rw-r--r--src/server/game/Instances/InstanceSaveMgr.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp
index c4967e46623..498abbdc597 100644
--- a/src/server/game/Instances/InstanceSaveMgr.cpp
+++ b/src/server/game/Instances/InstanceSaveMgr.cpp
@@ -51,14 +51,13 @@ InstanceSaveManager::~InstanceSaveManager()
++next;
(*itr2)->UnbindInstance(save->GetMapId(), save->GetDifficulty(), true);
}
- save->m_playerList.clear();
for (InstanceSave::GroupListType::iterator itr2 = save->m_groupList.begin(), next = itr2; itr2 != save->m_groupList.end(); itr2 = next)
{
++next;
(*itr2)->UnbindInstance(save->GetMapId(), save->GetDifficulty(), true);
}
- save->m_groupList.clear();
+
delete save;
}
}