aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2017-08-03 19:38:15 +0200
committerTreeston <treeston.mmoc@gmail.com>2017-08-03 19:38:15 +0200
commit2644fa703a6b20b6f1d62360fb47bc719cf43933 (patch)
tree0a15eb23a1ce1eea4a6b1653369799c2efc558b2
parent6691e41873f255c0f303229b0bd2e5db77a3c879 (diff)
Core/Unit: Don't apply liquid effects to game masters.
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index b27bd26f143..f16f119d132 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -3391,7 +3391,8 @@ void Unit::ProcessTerrainStatusUpdate(ZLiquidStatus status, Optional<LiquidData>
{
if (_lastLiquid && _lastLiquid->SpellId)
RemoveAurasDueToSpell(_lastLiquid->SpellId);
- if (curLiquid && curLiquid->SpellId)
+ Player* player = GetCharmerOrOwnerPlayerOrPlayerItself();
+ if (curLiquid && curLiquid->SpellId && (!player || !player->IsGameMaster()))
CastSpell(this, curLiquid->SpellId, true);
_lastLiquid = curLiquid;
}