From 4f65dc5e20cc3af5b3595809707c632faa6e5900 Mon Sep 17 00:00:00 2001 From: xinef1 Date: Sun, 5 Feb 2017 23:42:31 +0100 Subject: Core/Misc: Various crash fixes (#19059) * Replaced some FindPlayer calls with GetPlayer Fixed some more crashes * Correction (cherrypicked from 14dfc377b48bc909894396e65d4e4ce89d9708b6) --- src/server/game/Maps/MapScripts.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/game/Maps/MapScripts.cpp') diff --git a/src/server/game/Maps/MapScripts.cpp b/src/server/game/Maps/MapScripts.cpp index 6729b02dd4f..f6fed3dad9a 100644 --- a/src/server/game/Maps/MapScripts.cpp +++ b/src/server/game/Maps/MapScripts.cpp @@ -310,7 +310,7 @@ void Map::ScriptsProcess() switch (step.sourceGUID.GetHigh()) { case HighGuid::Item: // as well as HIGHGUID_CONTAINER - if (Player* player = HashMapHolder::Find(step.ownerGUID)) + if (Player* player = GetPlayer(step.ownerGUID)) source = player->GetItemByGuid(step.sourceGUID); break; case HighGuid::Creature: @@ -321,7 +321,7 @@ void Map::ScriptsProcess() source = GetPet(step.sourceGUID); break; case HighGuid::Player: - source = HashMapHolder::Find(step.sourceGUID); + source = GetPlayer(step.sourceGUID); break; case HighGuid::GameObject: case HighGuid::Transport: @@ -350,7 +350,7 @@ void Map::ScriptsProcess() target = GetPet(step.targetGUID); break; case HighGuid::Player: - target = HashMapHolder::Find(step.targetGUID); + target = GetPlayer(step.targetGUID); break; case HighGuid::GameObject: case HighGuid::Transport: -- cgit v1.2.3