From 1406d80b2b8410b1d31d75d07430433915440a42 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Mon, 1 Apr 2013 18:05:41 +0000 Subject: Pawn, Player: fixed asserts when teleporting players outside of the world (setting spawn Y to 256) git-svn-id: http://mc-server.googlecode.com/svn/trunk@1346 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Pawn.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'source/Pawn.cpp') diff --git a/source/Pawn.cpp b/source/Pawn.cpp index c1b8d6683..960f95de3 100644 --- a/source/Pawn.cpp +++ b/source/Pawn.cpp @@ -315,8 +315,14 @@ void cPawn::SetMetaData(MetaData a_MetaData) //----Change Entity MetaData -void cPawn::CheckMetaDataBurn() +void cPawn::CheckMetaDataBurn(void) { + if ((GetPosY() < 1) || (GetPosY() >= 254)) + { + // Y coord out of range + return; + } + BLOCKTYPE Block = GetWorld()->GetBlock((int) GetPosX(), (int) GetPosY(), (int) GetPosZ()); BLOCKTYPE BlockAbove = GetWorld()->GetBlock((int) GetPosX(), (int) GetPosY() + 1, (int) GetPosZ()); BLOCKTYPE BlockBelow = GetWorld()->GetBlock((int) GetPosX(), (int) GetPosY() - 1, (int) GetPosZ()); -- cgit v1.2.3