diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-12-07 23:34:00 +0100 |
|---|---|---|
| committer | MitchesD <majklprofik@seznam.cz> | 2016-01-15 20:36:16 +0100 |
| commit | bb97e888ff634e0dbb5a0b829ff0807a47fecdb0 (patch) | |
| tree | 64665f07539a1418681d9b8dafc39126853138fd | |
| parent | 1ab8f0b00ecf41ce4326bf85cbe39885877a763a (diff) | |
Core/Player: Fix crash related to vehicles
Fix assertion triggered when entering a vehicle while channelling a shared vision spell.
Fix #15953
(cherry picked from commit 2cb54d5606109305194ed3cdb1b56ca62317b891)
# Conflicts:
# src/server/game/Entities/Player/Player.cpp
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 0e27f1364ea..49086c07745 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -23858,7 +23858,7 @@ void Player::SetViewpoint(WorldObject* target, bool apply) // farsight dynobj or puppet may be very far away UpdateVisibilityOf(target); - if (target->isType(TYPEMASK_UNIT) && !GetVehicle()) + if (target->isType(TYPEMASK_UNIT) && target != GetVehicleBase()) static_cast<Unit*>(target)->AddPlayerToVision(this); } else @@ -23871,7 +23871,7 @@ void Player::SetViewpoint(WorldObject* target, bool apply) return; } - if (target->isType(TYPEMASK_UNIT) && !GetVehicle()) + if (target->isType(TYPEMASK_UNIT) && target != GetVehicleBase()) static_cast<Unit*>(target)->RemovePlayerFromVision(this); //must immediately set seer back otherwise may crash |