diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2017-08-03 19:38:15 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-08-22 13:35:46 +0200 |
| commit | acb4934f766321efbf90d0c6716f2df44c47ef16 (patch) | |
| tree | 61e9aa732ada0df7646ca39e05572205384d243d | |
| parent | 50a64ccd1e4ab29a751cf222e4564c3b2cd5153f (diff) | |
Core/Unit: Don't apply liquid effects to game masters.
(cherry picked from commit 2644fa703a6b20b6f1d62360fb47bc719cf43933)
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 3 |
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 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; } |