From acb4934f766321efbf90d0c6716f2df44c47ef16 Mon Sep 17 00:00:00 2001
From: Treeston <treeston.mmoc@gmail.com>
Date: Thu, 3 Aug 2017 19:38:15 +0200
Subject: Core/Unit: Don't apply liquid effects to game masters.

(cherry picked from commit 2644fa703a6b20b6f1d62360fb47bc719cf43933)
---
 src/server/game/Entities/Unit/Unit.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 10e56a66ab7..ff0e1ea8cb3 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -3185,7 +3185,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;
     }
-- 
cgit v1.2.3