From 15dde4778a1697dd178012120f61743f858bfd70 Mon Sep 17 00:00:00 2001 From: Paul Coene Date: Thu, 2 Apr 2020 11:52:27 -0400 Subject: [PATCH] Update aggro.cpp --- zone/aggro.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/zone/aggro.cpp b/zone/aggro.cpp index 87b98d599..dad9aacc4 100644 --- a/zone/aggro.cpp +++ b/zone/aggro.cpp @@ -237,6 +237,11 @@ bool Mob::CheckWillAggro(Mob *mob) { if (!mob->CastToClient()->ClientFinishedLoading() || mob->CastToClient()->IsHoveringForRespawn() || mob->CastToClient()->bZoning) return false; } + + // We don't want to aggro clients outside of water if we're water only. + if (mob->IsClient() && mob->CastToClient()->GetLastRegion() != RegionTypeWater && IsUnderwaterOnly()) { + return false; + } /** * Pets shouldn't scan for aggro