From f9a76d99d4f965fd57e8c040c5f8a0fa2aa67477 Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Sun, 17 Apr 2022 11:50:53 -0300 Subject: [PATCH 1/2] fix(Scripts/BlackwingLair): Prevent Nefarian's adds corpse from decaying (#11424) --- .../BlackrockMountain/BlackwingLair/boss_nefarian.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index 7bf5d1e48..6f9143d9c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -958,7 +958,6 @@ struct npc_drakonid_spawner : public ScriptedAI ObjectGuid summonGuid = summon->GetGUID(); - summon->SetCorpseDelay(DAY * IN_MILLISECONDS); summon->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE); summon->SetHomePosition(summon->GetPosition()); @@ -976,6 +975,7 @@ struct npc_drakonid_spawner : public ScriptedAI construct->SetReactState(REACT_PASSIVE); construct->SetStandState(UNIT_STAND_STATE_DEAD); construct->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + construct->SetCorpseRemoveTime(DAY * IN_MILLISECONDS); construct->SetVisible(true); } }); From 93a8d4fb6337eac9058ac445b30e31328c4ccf74 Mon Sep 17 00:00:00 2001 From: acidmanifesto Date: Sun, 17 Apr 2022 13:24:15 -0400 Subject: [PATCH 2/2] fix (core) Remove not need operator || (#11425) Since the mysterous why things evade in shallow water root issue was finally determined because of our shallow water calculations was wrong that was corrected by pr https://github.com/azerothcore/azerothcore-wotlk/pull/11419 we can now remove this operator --- src/server/game/Entities/Creature/Creature.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 5ff6f1575..236bb6073 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -3035,7 +3035,7 @@ bool Creature::SetSwim(bool enable) */ bool Creature::CanSwim() const { - if (Unit::CanSwim() || (!Unit::CanSwim() && !CanFly())) + if (Unit::CanSwim()) return true; if (IsPet())