From e608acbd1cc35465b111b58a5430e3791c3750bf Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Tue, 16 Sep 2014 10:42:01 +0200 Subject: [PATCH] Improved Player last damage check --- src/pocketmine/Player.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 79021c0cb..addb9034e 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -1830,8 +1830,8 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{ $this->server->getPluginManager()->callEvent($ev = new PlayerRespawnEvent($this, $this->getSpawn())); $this->teleport($ev->getRespawnPosition()); - //$this->entity->fire = 0; - //$this->entity->air = 300; + $this->fireTicks = 0; + $this->airTicks = 300; $this->setHealth(20); $this->dead = false; @@ -2379,11 +2379,15 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{ } } - $pk = new EntityEventPacket(); - $pk->eid = 0; - $pk->event = 2; - $this->dataPacket($pk); + parent::attack($damage, $source); + + if($this->getLastDamageCause() === $source){ + $pk = new EntityEventPacket(); + $pk->eid = 0; + $pk->event = 2; + $this->dataPacket($pk); + } } public function getData(){ //TODO