diff --git a/src/API/EntityAPI.php b/src/API/EntityAPI.php index d9d2ef83..d81a6ee4 100644 --- a/src/API/EntityAPI.php +++ b/src/API/EntityAPI.php @@ -133,7 +133,7 @@ class EntityAPI{ $isBaby = 0; if(strtolower($args[2]) == 'baby'){//summon [amount] [baby] if($type > 13){ - $output .= "Baby can be only animals!"; + $output .= "This mob cant be baby!"; break; } $isBaby = 1; @@ -150,7 +150,7 @@ class EntityAPI{ "y" => $spawnY, "z" => $spawnZ, "Health" => $this->hp[$type], - "isBaby" => $isBaby, + "IsBaby" => $isBaby, )); $this->spawnToAll($entityit, $level); } @@ -272,8 +272,8 @@ class EntityAPI{ $eid = $this->eCnt++; $efl = EntityRegistry::$entityList->getEntityFromType($type); if($efl instanceof PropertyEntity){ + console(json_encode($data)); $class = $efl->getEntityName(); - console("yey"); $this->entities[$eid] = new $class($level, $eid, $efl->getEntityClass(), $efl->getEntityType(), $data); }else{ $this->entities[$eid] = new Entity($level, $eid, $class, $type, $data); diff --git a/src/entity/Animal.php b/src/entity/Animal.php index 513e5002..c6fc9641 100644 --- a/src/entity/Animal.php +++ b/src/entity/Animal.php @@ -5,6 +5,14 @@ move methods */ class Animal extends Creature implements Ageable{ public function isBaby(){ - return $this->data["isBaby"]; + return $this->data["IsBaby"]; + } + + public function environmentUpdate(){ + if($this->server->api->getProperty("spawn-animals") !== true){ + $this->close(); + return false; + } + parent::environmentUpdate(); } } \ No newline at end of file diff --git a/src/entity/Entity.php b/src/entity/Entity.php index 76a69333..1c9a6e9b 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -49,7 +49,7 @@ class Entity extends Position{ public $fallStart; private $tickCounter; private $speedMeasure = array(0, 0, 0, 0, 0, 0, 0); - private $server; + protected $server; private $isStatic; public $level; public $isInMinecart = false; @@ -232,7 +232,7 @@ class Entity extends Position{ ); } }elseif($this->class === ENTITY_MOB){ - if($this->data["isBaby"]){ + if($this->data["IsBaby"]){ return array( array(AIR, 0, 0), ); @@ -264,26 +264,6 @@ 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)), - array(($this->fire > 0 ? COOKED_CHICKEN:RAW_CHICKEN), 0, 1), - ); - case MOB_COW: - return array( - array(LEATHER, 0, mt_rand(0,2)), - array(($this->fire > 0 ? STEAK:BEEF), 0, 1), - ); - case MOB_PIG: - return array( - array(($this->fire > 0 ? COOKED_PORKCHOP:RAW_PORKCHOP), 0, 1), - ); - case MOB_SHEEP: - return array( - array(WOOL, $this->data["Color"] & 0x0F, 1), - ); } } return array(); @@ -329,15 +309,6 @@ class Entity extends Position{ if($this->class === ENTITY_MOB){ switch($this->type){ - case MOB_CHICKEN: - case MOB_SHEEP: - case MOB_COW: - case MOB_PIG: - if($this->server->api->getProperty("spawn-animals") !== true){ - $this->close(); - return false; - } - break; case MOB_ZOMBIE: case MOB_CREEPER: case MOB_PIGMAN: @@ -689,36 +660,10 @@ class Entity extends Position{ ****************** 0 => array("type" => 0, "value" => $flags) --> Unknown 1 => array("type" => 1, "value" => $this->air) --> Entity Air - 14 => array("type" => 0, "value" => 1) --> isBaby, value: 0 => false, 1 => true + 14 => array("type" => 0, "value" => 1) --> IsBaby, value: 0 => false, 1 => true 16 => array("type" => 0, "value" => 0) --> Unknown 17 => array("type" => 6, "value" => array(0, 0, 0)) --> Unknown */ - - public function sheepColor(){ - $pink = 0.1558; - $brown = 2.85; - $lightgray_black_gray = 14.25; - $chance = Utils::randomFloat() * 100; - switch($chance){ - case($chance <= $pink): - $color = 6; - break; - case($chance > $pink and $chance <= ($brown+$pink)): - $color = 12; - break; - case($chance > ($brown+$pink) and $chance <= ($lightgray_black_gray+$brown+$pink)): - $rand = mt_rand(1,3); - if($rand == 1) $color = 15; - elseif($rand == 2) $color = 7; - else $color = 8; - break; - default: - $color = 0; - break; - } - return $color; - } - public function getMetadata(){ $flags = 0; $flags |= $this->fire > 0 ? 1:0; @@ -731,17 +676,11 @@ class Entity extends Position{ 16 => array("type" => 0, "value" => 0), 17 => array("type" => 6, "value" => array(0, 0, 0)), ); - if(!isset($this->data["isBaby"])){ - $this->data["isBaby"] = 0; + if(!isset($this->data["IsBaby"])){ + $this->data["IsBaby"] = 0; } - $d[14]["value"] = $this->data["isBaby"]; - if($this->class === ENTITY_MOB and $this->type === MOB_SHEEP){ - if(!isset($this->data["Sheared"])){ - $this->data["Sheared"] = 0; - $this->data["Color"] = $this->sheepColor(); - } - $d[16]["value"] = (($this->data["Sheared"] == 1 ? 1:0) << 4) | ($this->data["Color"] & 0x0F); - }elseif($this->class === ENTITY_OBJECT && $this->type === OBJECT_PRIMEDTNT){ //ladder fix 2.0 + $d[14]["value"] = $this->data["IsBaby"]; + if($this->class === ENTITY_OBJECT && $this->type === OBJECT_PRIMEDTNT){ //ladder fix 2.0 $d[16]["value"] = (int) max(0, $this->data["fuse"] - (microtime(true) - $this->spawntime) * 20); }elseif($this->class === ENTITY_PLAYER){ if($this->player->isSleeping !== false){ diff --git a/src/entity/animal/Chicken.php b/src/entity/animal/Chicken.php index 5dc85a4b..d500f03c 100644 --- a/src/entity/animal/Chicken.php +++ b/src/entity/animal/Chicken.php @@ -3,7 +3,6 @@ class Chicken extends Animal{ const TYPE = MOB_CHICKEN; function __construct(Level $level, $eid, $class, $type = 0, $data = array()){ - console("A constructor which indicates it works! ".":".$eid.":".$class.":".$type); parent::__construct($level, $eid, $class, $type, $data); $server = ServerAPI::request(); $server->schedule(mt_rand(0,6000) + 6000, array($this, "dropAnEgg")); @@ -17,4 +16,12 @@ class Chicken extends Animal{ ServerAPI::request()->api->entity->drop(new Position($this->x + 0.5, $this->y, $this->z + 0.5, $this->level), BlockAPI::getItem(EGG,0,1)); $this->server->schedule(mt_rand(0,6000) + 6000, array($this, "dropAnEgg")); } + + public function getDrops(){ + return $this->isBaby() ? array() : + array( + array(FEATHER, 0, mt_rand(0,2)), + array(($this->fire > 0 ? COOKED_CHICKEN : RAW_CHICKEN), 0, 1), + ); + } } \ No newline at end of file diff --git a/src/entity/animal/Cow.php b/src/entity/animal/Cow.php index 2f7914f4..15782589 100644 --- a/src/entity/animal/Cow.php +++ b/src/entity/animal/Cow.php @@ -3,11 +3,20 @@ class Cow extends Animal{ const TYPE = MOB_COW; function __construct(Level $level, $eid, $class, $type = 0, $data = array()){ - console("A constructor which indicates it works! ".":".$eid.":".$class.":".$type); parent::__construct($level, $eid, $class, $type, $data); $this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:10, "generic"); $this->update(); //$this->setName('Cow'); $this->size = $this->isBaby() ? 0.65 : 1.4; } + + + public function getDrops(){ + return $this->isBaby() ? array() : + array( + array(LEATHER, 0, mt_rand(0,2)), + array(($this->fire > 0 ? STEAK:BEEF), 0, 1), + ); + } + } \ No newline at end of file diff --git a/src/entity/animal/Pig.php b/src/entity/animal/Pig.php index 0b9c8815..5d7c5088 100644 --- a/src/entity/animal/Pig.php +++ b/src/entity/animal/Pig.php @@ -2,11 +2,18 @@ class Pig extends Animal{ const TYPE = MOB_PIG; function __construct(Level $level, $eid, $class, $type = 0, $data = array()){ - console("A constructor which indicates it works! ".":".$eid.":".$class.":".$type); parent::__construct($level, $eid, $class, $type, $data); $this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:10, "generic"); $this->update(); //$this->setName('Pig'); $this->size = $this->isBaby() ? 0.60 : 1.1875; } + + public function getDrops(){ + return $this->isBaby() ? array() : + array( + array(($this->fire > 0 ? COOKED_PORKCHOP:RAW_PORKCHOP), 0, 1), + ); + } + } \ No newline at end of file diff --git a/src/entity/animal/Sheep.php b/src/entity/animal/Sheep.php index cda6cc48..a01b4e15 100644 --- a/src/entity/animal/Sheep.php +++ b/src/entity/animal/Sheep.php @@ -3,11 +3,50 @@ class Sheep extends Animal{ const TYPE = MOB_SHEEP; function __construct(Level $level, $eid, $class, $type = 0, $data = array()){ - console("A constructor which indicates it works! ".":".$eid.":".$class.":".$type); parent::__construct($level, $eid, $class, $type, $data); - $this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:8, "generic"); + $this->setHealth(isset($this->data["Health"]) ? $this->data["Health"] : 8, "generic"); $this->update(); //$this->setName('Sheep'); $this->size = $this->isBaby() ? 0.65 : 1.3; } + + public function getDrops(){ + return $this->isBaby() ? array() : + array( + array(WOOL, $this->data["Color"] & 0x0F, 1), + ); + } + public function getMetadata(){ + $d = parent::getMetadata(); + if(!isset($this->data["Sheared"])){ + $this->data["Sheared"] = 0; + $this->data["Color"] = $this->sheepColor(); + } + $d[16]["value"] = (($this->data["Sheared"] == 1 ? 1:0) << 4) | ($this->data["Color"] & 0x0F); //dark manipulations are happening here... + return $d; + } + public function sheepColor(){ + $pink = 0.1558; + $brown = 2.85; + $lightgray_black_gray = 14.25; + $chance = Utils::randomFloat() * 100; + switch($chance){ + case($chance <= $pink): + $color = 6; + break; + case($chance > $pink and $chance <= ($brown+$pink)): + $color = 12; + break; + case($chance > ($brown+$pink) and $chance <= ($lightgray_black_gray+$brown+$pink)): + $rand = mt_rand(1,3); + if($rand == 1) $color = 15; + elseif($rand == 2) $color = 7; + else $color = 8; + break; + default: + $color = 0; + break; + } + return $color; + } } \ No newline at end of file diff --git a/src/material/item/generic/SpawnEgg.php b/src/material/item/generic/SpawnEgg.php index 6ee32f8f..82c24907 100644 --- a/src/material/item/generic/SpawnEgg.php +++ b/src/material/item/generic/SpawnEgg.php @@ -43,7 +43,7 @@ class SpawnEggItem extends Item{ "x" => $block->x + 0.5, "y" => $block->y, "z" => $block->z + 0.5, - "isBaby" => $ageable ? Utils::chance(5) ? 1 : 0 : 0, + "IsBaby" => $ageable ? Utils::chance(5) ? 1 : 0 : 0, ); $e = ServerAPI::request()->api->entity->add($block->level, ENTITY_MOB, $this->meta, $data); ServerAPI::request()->api->entity->spawnToAll($e); diff --git a/src/world/Level.php b/src/world/Level.php index 444d8b78..9df4baf5 100644 --- a/src/world/Level.php +++ b/src/world/Level.php @@ -163,7 +163,7 @@ class Level{ "id" => $entity->type, "Color" => @$entity->data["Color"], "Sheared" => @$entity->data["Sheared"], - "isBaby" => @$entity->data["isBaby"], + "IsBaby" => @$entity->data["IsBaby"], "Health" => $entity->health, "Pos" => array( 0 => $entity->x,