From 7d548c34a961f4dd5e1a831e0a414970a4abff8c Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Thu, 13 Aug 2020 21:12:37 +0200 Subject: Core/AI: Remove code that removed UNIT_DYNFLAG_LOOTABLE from possessed units (#25229) * Core/AI: Remove code that removed UNIT_DYNFLAG_LOOTABLE from possessed units * Update PassiveAI.cpp Restored logic that removes loot flag while being possessed * Restored logic that removes loot flag while being possessed (cherry picked from commit 298d7994850dfc777c56a7672042d78074b67f3d) --- src/server/game/AI/CoreAI/PassiveAI.cpp | 7 ------- src/server/game/AI/CoreAI/PassiveAI.h | 1 - 2 files changed, 8 deletions(-) (limited to 'src') diff --git a/src/server/game/AI/CoreAI/PassiveAI.cpp b/src/server/game/AI/CoreAI/PassiveAI.cpp index 6ded1919862..02c533ee68b 100644 --- a/src/server/game/AI/CoreAI/PassiveAI.cpp +++ b/src/server/game/AI/CoreAI/PassiveAI.cpp @@ -73,13 +73,6 @@ void PossessedAI::JustDied(Unit* /*u*/) me->RemoveDynamicFlag(UNIT_DYNFLAG_LOOTABLE); } -void PossessedAI::KilledUnit(Unit* victim) -{ - // We killed a creature, disable victim's loot - if (victim->GetTypeId() == TYPEID_UNIT) - me->RemoveDynamicFlag(UNIT_DYNFLAG_LOOTABLE); -} - void CritterAI::JustEngagedWith(Unit* /*who*/) { if (!me->HasUnitState(UNIT_STATE_FLEEING)) diff --git a/src/server/game/AI/CoreAI/PassiveAI.h b/src/server/game/AI/CoreAI/PassiveAI.h index 272ab21cbbd..1d000bc2433 100644 --- a/src/server/game/AI/CoreAI/PassiveAI.h +++ b/src/server/game/AI/CoreAI/PassiveAI.h @@ -46,7 +46,6 @@ class TC_GAME_API PossessedAI : public CreatureAI void EnterEvadeMode(EvadeReason /*why*/) override { } void JustDied(Unit*) override; - void KilledUnit(Unit* victim) override; static int32 Permissible(Creature const* /*creature*/) { return PERMIT_BASE_NO; } }; -- cgit v1.2.3