sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/Combat): Restrict NullCreatureAI combat disallow to triggers only (#25289)

Browse Source 
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
This commit is contained in:
blinkysc
2026-03-29 04:28:33 -05:00
committed by GitHub
parent 74988d3452
commit 2b56061cb7
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/sql/updates/pending_db_world/rev_1774759571712435204.sql
+2
View File
@@ -0,0 +1,2 @@
-- Fix Ashtongue Channeler saved health (was incorrectly 1)
UPDATE `creature` SET `curhealth` = 87973 WHERE `id1` = 23421;
src/server/game/AI/CoreAI/PassiveAI.cpp
+3 -2
View File
@@ -23,8 +23,9 @@ PossessedAI::PossessedAI(Creature* c) : CreatureAI(c) { me->SetReactState(REACT_
NullCreatureAI::NullCreatureAI(Creature* c) : CreatureAI(c) NullCreatureAI::NullCreatureAI(Creature* c) : CreatureAI(c)
{ {
me->SetReactState(REACT_PASSIVE); me->SetReactState(REACT_PASSIVE);
// TODO: Remove once WorldObject casting is ported (triggers won't create combat refs from spell casts) // TODO: Remove once WorldObject spell casting is ported (triggers won't create combat refs from spell casts)
me->SetIsCombatDisallowed(true); if (me->IsTrigger())
me->SetIsCombatDisallowed(true);
} }
int32 NullCreatureAI::Permissible(Creature const* creature) int32 NullCreatureAI::Permissible(Creature const* creature)
src/server/scripts/World/npcs_special.cpp
+1 -7
View File
@@ -314,11 +314,7 @@ public:
struct npc_training_dummy : NullCreatureAI struct npc_training_dummy : NullCreatureAI
{ {
npc_training_dummy(Creature* creature) : NullCreatureAI(creature) npc_training_dummy(Creature* creature) : NullCreatureAI(creature) { }
{
// TODO: Remove once WorldObject casting is ported
me->SetIsCombatDisallowed(false);
}
void JustEnteredCombat(Unit* who) override void JustEnteredCombat(Unit* who) override
{ {
@@ -363,8 +359,6 @@ struct npc_target_dummy : NullCreatureAI
{ {
npc_target_dummy(Creature* creature) : NullCreatureAI(creature) npc_target_dummy(Creature* creature) : NullCreatureAI(creature)
{ {
// TODO: Remove once WorldObject casting is ported
me->SetIsCombatDisallowed(false);
_deathTimer = 15s; _deathTimer = 15s;
} }