From ca4f55b20a427b9aef17bb934593300988e80ca0 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Mon, 24 Aug 2020 10:34:53 -0400 Subject: [PATCH] Core/Unit: Don't apply liquid effects to game masters. Port From (https://github.com/TrinityCore/TrinityCore/commit/acb4934f766321efbf90d0c6716f2df44c47ef16) --- Source/Game/Entities/Unit/Unit.Movement.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Game/Entities/Unit/Unit.Movement.cs b/Source/Game/Entities/Unit/Unit.Movement.cs index 245829894..7aa68b48f 100644 --- a/Source/Game/Entities/Unit/Unit.Movement.cs +++ b/Source/Game/Entities/Unit/Unit.Movement.cs @@ -779,7 +779,8 @@ namespace Game.Entities { if (_lastLiquid != null && _lastLiquid.SpellID != 0) RemoveAurasDueToSpell(_lastLiquid.SpellID); - if (curLiquid != null && curLiquid.SpellID != 0) + Player player = GetCharmerOrOwnerPlayerOrPlayerItself(); + if (curLiquid != null && curLiquid.SpellID != 0 && (!player || !player.IsGameMaster())) CastSpell(this, curLiquid.SpellID, true); _lastLiquid = curLiquid; }