From 6440c3bcac85a40de5c34aef1d8a8856966cc140 Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Wed, 22 Jul 2020 17:32:29 +0000 Subject: Core/Combat: Disable triggers entering combat (#25086) * Core/Combat: Disable triggers entering combat * Move check to database flags_extra flag in creature_template with value 0x00002000 * Fix Rotface puddle stalker too * Rename 9999_99_99_99_world.sql to 2020_07_22_00_world.sql --- src/server/game/Combat/CombatManager.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/server/game/Combat/CombatManager.cpp') diff --git a/src/server/game/Combat/CombatManager.cpp b/src/server/game/Combat/CombatManager.cpp index 02dff689cda..c2774a23ec2 100644 --- a/src/server/game/Combat/CombatManager.cpp +++ b/src/server/game/Combat/CombatManager.cpp @@ -44,6 +44,12 @@ return false; if (a->HasUnitState(UNIT_STATE_IN_FLIGHT) || b->HasUnitState(UNIT_STATE_IN_FLIGHT)) return false; + if (Creature const* aCreature = a->ToCreature()) + if (aCreature->IsCombatDisallowed()) + return false; + if (Creature const* bCreature = b->ToCreature()) + if (bCreature->IsCombatDisallowed()) + return false; if (a->IsFriendlyTo(b) || b->IsFriendlyTo(a)) return false; Player const* playerA = a->GetCharmerOrOwnerPlayerOrPlayerItself(); -- cgit v1.2.3