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>2019-07-21 21:06:54 +0200
commit4f65dc5e20cc3af5b3595809707c632faa6e5900 (patch)
treeb265710b6dd2d87bb0f4409770ab77d116654de0 /src/server/game/Maps/MapScripts.cpp
parentad4e63bae145ae49b584ab2fc621660430cec0d3 (diff)
Core/Misc: Various crash fixes (#19059)
* Replaced some FindPlayer calls with GetPlayer Fixed some more crashes * Correction (cherrypicked from 14dfc377b48bc909894396e65d4e4ce89d9708b6)
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 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<Player>::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<Player>::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<Player>::Find(step.targetGUID);
+ target = GetPlayer(step.targetGUID);
break;
case HighGuid::GameObject:
case HighGuid::Transport: