From 4c73629b9e4cad274ea3f4c3659f13db6a63404f Mon Sep 17 00:00:00 2001 From: williamtdr Date: Wed, 31 Jul 2013 22:38:17 -0500 Subject: [PATCH] Object check - Fixes #537 --- src/Player.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Player.php b/src/Player.php index e865ba98..3f1b9ba7 100644 --- a/src/Player.php +++ b/src/Player.php @@ -1492,10 +1492,14 @@ class Player{ } $this->craftingItems = array(); $this->toCraft = array(); - $this->entity->fire = 0; - $this->entity->air = 300; - $this->entity->setHealth(20, "respawn"); - $this->entity->updateMetadata(); + if($this->entity instanceof Entity){ + $this->entity->fire = 0; + $this->entity->air = 300; + $this->entity->setHealth(20, "respawn"); + $this->entity->updateMetadata(); + } else { + break; + } $this->sendInventory(); $this->teleport($this->spawnPosition); $this->blocked = false;