Merge branch 'azerothcore:master' into Playerbot

This commit is contained in:
ZhengPeiRu21
2022-04-17 17:59:20 -06:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

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

View File

@@ -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);
}
});