From 87da6d1d94d3faf2e1db1cefbc35bdfe1fe4c3bf Mon Sep 17 00:00:00 2001 From: Maxpro Date: Mon, 10 May 2021 19:48:59 -0700 Subject: [PATCH] fix(CORE/CREATURE) Polymorphed erratic mob behavior (#5699) --- src/server/game/Entities/Unit/Unit.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index bf2cd2a5d..7b9a5bcb4 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -9816,6 +9816,12 @@ bool Unit::Attack(Unit* victim, bool meleeAttack) return false; } + // creatures should not try to attack the player during polymorph + if (creature && creature->IsPolymorphed()) + { + return false; + } + //if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED)) // pussywizard: wtf? why having this flag prevents from entering combat? it should just prevent melee attack // return false;