aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps/MapScripts.cpp
diff options
context:
space:
mode:
authorxinef1 <w.szyszko2@gmail.com>2017-02-05 23:42:31 +0100
committerShauren <shauren.trinity@gmail.com>2017-02-05 23:42:31 +0100
commit14dfc377b48bc909894396e65d4e4ce89d9708b6 (patch)
tree4c4a44bbbbd26e1266f1ffead2ce16890035e335 /src/server/game/Maps/MapScripts.cpp
parent075f0e26ccaea835f1b3b771b717e9edef0d0b59 (diff)
Core/Misc: Various crash fixes (#19059)
* Replaced some FindPlayer calls with GetPlayer Fixed some more crashes * Correction
Diffstat (limited to 'src/server/game/Maps/MapScripts.cpp')
-rw-r--r--src/server/game/Maps/MapScripts.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Maps/MapScripts.cpp b/src/server/game/Maps/MapScripts.cpp
index c3a933a753b..300c7fa38e5 100644
--- a/src/server/game/Maps/MapScripts.cpp
+++ b/src/server/game/Maps/MapScripts.cpp
@@ -295,7 +295,7 @@ void Map::ScriptsProcess()
switch (step.sourceGUID.GetHigh())
{
case HighGuid::Item: // as well as HighGuid::Container
- if (Player* player = HashMapHolder<Player>::Find(step.ownerGUID))
+ if (Player* player = GetPlayer(step.ownerGUID))
source = player->GetItemByGuid(step.sourceGUID);
break;
case HighGuid::Unit:
@@ -306,7 +306,7 @@ void Map::ScriptsProcess()
source = GetPet(step.sourceGUID);
break;
case HighGuid::Player:
- source = HashMapHolder<Player>::Find(step.sourceGUID);
+ source = GetPlayer(step.sourceGUID);
break;
case HighGuid::Transport:
case HighGuid::GameObject:
@@ -338,7 +338,7 @@ void Map::ScriptsProcess()
target = GetPet(step.targetGUID);
break;
case HighGuid::Player: // empty GUID case also
- target = HashMapHolder<Player>::Find(step.targetGUID);
+ target = GetPlayer(step.targetGUID);
break;
case HighGuid::Transport:
case HighGuid::GameObject: