Permalink
Browse files

Fix flying after clicking a portal (#1567)

Fix for issue #1547 , point 2, as this is the only one I could reproduce.
  • Loading branch information...
DanielBallaSZTE authored and Zaffy committed Jun 14, 2017
1 parent 72ac3ed commit 5802628b38d5620e3d75cf7dfad7fd5d3c423e79
Showing with 5 additions and 4 deletions.
  1. +5 −4 src/game/GameObject.cpp
View
@@ -804,7 +804,7 @@ bool GameObject::IsAlwaysVisibleFor(WorldObject const* seer) const
if (IsTransport())
return true;
if (!seer)
return false;
@@ -1340,6 +1340,7 @@ void GameObject::Use(Unit* user)
}
user->RemoveAurasByType(SPELL_AURA_MOUNTED);
user->RemoveAurasByType(SPELL_AURA_FLY);
spellId = info->spellcaster.spellId;
break;
@@ -1491,7 +1492,7 @@ void GameObject::SetLootState(LootState s, Unit* unit)
// Use the current go state
if ((GetGoState() != GO_STATE_READY && (s == GO_ACTIVATED || s == GO_JUST_DEACTIVATED)) || s == GO_READY)
collision = !collision;
EnableCollision(collision);
}
}
@@ -1594,8 +1595,8 @@ void GameObject::SetGoState(GOState state)
// startOpen determines whether we are going to add or remove the LoS on activation
bool collision = false;
if (state == GO_STATE_READY)
collision = !collision;
collision = !collision;
EnableCollision(collision);
}
}

0 comments on commit 5802628

Please sign in to comment.