Possible fix for #2267, #2314

PocketMine · Nov 27, 2014 · dd3207c · dd3207c
1 parent a7abd5f
commit dd3207c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php
@@ -1936,18 +1936,18 @@ public function getSafeSpawn($spawn = null){
 		}
 		if($spawn instanceof Vector3){
 			$v = $spawn->floor();
-			for(; $v->y > 0; $v->y -= 2){
+			for(; $v->y > 0; --$v->y){
 				$b = $this->getBlock($v);
 				if($b === null){
 					return $spawn;
-				}elseif(!($b instanceof Air)){
-					$v->y += 1;
+				}elseif($b->isSolid){
+					$v->y++;
 					break;
 				}
 			}
 			for(; $v->y < 128; ++$v->y){
-				if($this->getBlock($v->getSide(1)) instanceof Air){
-					if($this->getBlock($v) instanceof Air){
+				if(!$this->getBlock($v->getSide(1))->isSolid){
+					if(!$this->getBlock($v)->isSolid){
 						return new Position($spawn->x, $v->y === Math::floorFloat($spawn->y) ? $spawn->y : $v->y, $spawn->z, $this);
 					}
 				}else{