From aea8b2af44aa7e8b15347c35a54180b806854c6c Mon Sep 17 00:00:00 2001 From: elecyb Date: Mon, 2 Jan 2012 22:49:08 -0300 Subject: Core/Spells: Fixed crash introduced in last commit --- src/server/game/Entities/Player/Player.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 3c1764e1266..74f475aab17 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -22973,7 +22973,10 @@ void Player::SetViewpoint(WorldObject* target, bool apply) WorldObject* Player::GetViewpoint() const { if (uint64 guid = GetUInt64Value(PLAYER_FARSIGHT)) - return (WorldObject*)ObjectAccessor::GetObjectByTypeMask(*this, guid, TYPEMASK_SEER); + { + WorldObject* viewpoint = (WorldObject*) ObjectAccessor::GetObjectByTypeMask(*this, guid, TYPEMASK_SEER); + return viewpoint ? viewpoint : (WorldObject*) this; // always expected not NULL + } return (WorldObject*) this; } -- cgit v1.2.3