From bb97e888ff634e0dbb5a0b829ff0807a47fecdb0 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Mon, 7 Dec 2015 23:34:00 +0100 Subject: 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 --- src/server/game/Entities/Player/Player.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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(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(target)->RemovePlayerFromVision(this); //must immediately set seer back otherwise may crash -- cgit v1.2.3