diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 4efa8fb0f..915eafdbc 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -1649,7 +1649,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 		if(!$this->isAlive() and $this->spawned){
 			$this->deadTicks += $tickDiff;
-			if($this->deadTicks >= 20){
+			if($this->deadTicks >= $this->maxDeadTicks){
 				$this->despawnFromAll();
 			}
 			return true;
diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php
index d1de8b736..7c9682305 100644
--- a/src/pocketmine/entity/Entity.php
+++ b/src/pocketmine/entity/Entity.php
@@ -382,6 +382,8 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	/** @var int */
 	public $deadTicks = 0;
 	/** @var int */
+	protected $maxDeadTicks = 0;
+	/** @var int */
 	protected $age = 0;
 
 	/** @var float */
@@ -1260,13 +1262,13 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 
 		if(!$this->isAlive()){
 			$this->deadTicks += $tickDiff;
-			if($this->deadTicks >= 20){
+			if($this->deadTicks >= $this->maxDeadTicks){
 				$this->despawnFromAll();
 				if(!$this->isPlayer){
 					$this->close();
 				}
 			}
-			return $this->deadTicks < 20;
+			return $this->deadTicks < $this->maxDeadTicks;
 		}
 
 
diff --git a/src/pocketmine/entity/Living.php b/src/pocketmine/entity/Living.php
index 7e06285f8..6da5e726e 100644
--- a/src/pocketmine/entity/Living.php
+++ b/src/pocketmine/entity/Living.php
@@ -50,6 +50,9 @@ abstract class Living extends Entity implements Damageable{
 
 	protected $attackTime = 0;
 
+	/** @var int */
+	protected $maxDeadTicks = 20;
+
 	protected $invisible = false;
 
 	protected $jumpVelocity = 0.42;