nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-28 08:06:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'azerothcore:master' into Playerbot

Browse Source
This commit is contained in:
ZhengPeiRu21
2022-04-17 17:59:20 -06:00
committed by GitHub
parent ec96415fda 93a8d4fb63
commit 534df7c448
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -3036,7 +3036,7 @@ bool Creature::SetSwim(bool enable)
*/ */
bool Creature::CanSwim() const bool Creature::CanSwim() const
{ {
if (Unit::CanSwim() || (!Unit::CanSwim() && !CanFly())) if (Unit::CanSwim())
return true; return true;
if (IsPet()) if (IsPet())

2
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
View File

@@ -958,7 +958,6 @@ struct npc_drakonid_spawner : public ScriptedAI
ObjectGuid summonGuid = summon->GetGUID(); ObjectGuid summonGuid = summon->GetGUID();
summon->SetCorpseDelay(DAY * IN_MILLISECONDS);
summon->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE); summon->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
summon->SetHomePosition(summon->GetPosition()); summon->SetHomePosition(summon->GetPosition());
@@ -976,6 +975,7 @@ struct npc_drakonid_spawner : public ScriptedAI
construct->SetReactState(REACT_PASSIVE); construct->SetReactState(REACT_PASSIVE);
construct->SetStandState(UNIT_STAND_STATE_DEAD); construct->SetStandState(UNIT_STAND_STATE_DEAD);
construct->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE); construct->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
construct->SetCorpseRemoveTime(DAY * IN_MILLISECONDS);
construct->SetVisible(true); construct->SetVisible(true);
} }
}); });