From ccc51c8fe7af96e1a5429959879dbeca97a4334b Mon Sep 17 00:00:00 2001 From: ArkQuark <74979909+ArkQuark@users.noreply.github.com> Date: Thu, 2 Jun 2022 22:41:59 +0300 Subject: [PATCH] Update Entity.php if entity is baby don't drop anything fix entity from spawn egg health --- src/world/Entity.php | 78 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 74 insertions(+), 4 deletions(-) diff --git a/src/world/Entity.php b/src/world/Entity.php index e6857e11..b00e8370 100644 --- a/src/world/Entity.php +++ b/src/world/Entity.php @@ -113,13 +113,74 @@ class Entity extends Position{ break; case ENTITY_MOB: switch($this->type){ + + //Animals case MOB_CHICKEN: $this->server->schedule(mt_rand(0,6000) + 6000, array($this, "dropAnEgg")); + $this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:4, "generic"); + $this->update(); + //$this->setName('Chicken'); + if(isset($this->data['isBaby'])) $this->size = 0.35; + else $this->size = 0.7; + break; + case MOB_COW: + $this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:10, "generic"); + $this->update(); + //$this->setName('Cow'); + if(isset($this->data['isBaby'])) $this->size = 0.65; + else $this->size = 1.4; + break; + case MOB_PIG: + $this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:10, "generic"); + $this->update(); + //$this->setName('Pig'); + if(isset($this->data['isBaby'])) $this->size = 0.60; //not original + else $this->size = 1.1875; + break; + case MOB_SHEEP: + $this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:8, "generic"); + $this->update(); + //$this->setName('Sheep'); + if(isset($this->data['isBaby'])) $this->size = 0.65; + else $this->size = 1.3; + break; + + //Monsters + case MOB_CREEPER: + $this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:20, "generic"); + $this->update(); + //$this->setName('Creeper'); + $this->size = 1.6; //not original + break; + case MOB_PIGMAN: + $this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:20, "generic"); + $this->update(); + //$this->setName('Pigman'); + $this->size = 1.8; //not original + break; + case MOB_SKELETON: + $this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:20, "generic"); + $this->update(); + //$this->setName('Skeleton'); + $this->size = 1.9; + break; + case MOB_SPIDER: + $this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:20, "generic"); + $this->update(); + //$this->setName('Spider'); + $this->size = 0.6; //not original + break; + case MOB_ZOMBIE: + $this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:20, "generic"); + $this->update(); + //$this->setName('Zombie'); + $this->size = 1.95; + break; default: //no break uwu? - $this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:10, "generic"); - $this->update(); - //$this->setName((isset($mobs[$this->type]) ? $mobs[$this->type]:$this->type)); - $this->size = 1; + $this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:1, "generic"); + $this->update(); + //$this->setName((isset($mobs[$this->type]) ? $mobs[$this->type]:$this->type)); + $this->size = 1; } break; case ENTITY_FALLING: @@ -205,7 +266,14 @@ class Entity extends Position{ ); } }elseif($this->class === ENTITY_MOB){ + if($this->data["isBaby"]){ + return array( + array(AIR, 0, 0), + ); + } switch($this->type){ + + //Monsters case MOB_ZOMBIE: return array( array(FEATHER, 0, mt_rand(0,2)), @@ -228,6 +296,8 @@ class Entity extends Position{ array(ARROW, 0, mt_rand(0,2)), array(BONE, 0, mt_rand(0,2)), ); + + //Animals case MOB_CHICKEN: return array( array(FEATHER, 0, mt_rand(0,2)),