diff --git a/src/API/EntityAPI.php b/src/API/EntityAPI.php index 946c70b2..1d2660ec 100644 --- a/src/API/EntityAPI.php +++ b/src/API/EntityAPI.php @@ -90,92 +90,90 @@ class EntityAPI{ switch ($cmd){ case 'summon': case 'spawnmob': - - if(!($issuer instanceof Player)){ - $output .= "Please run this command in-game."; - break; - } - if((count($args) < 1) or (count($args) > 3)){ - $output .= "Usage: /$cmd [amount] [baby]"; - break; - } - - $type = $this->mob[strtolower($args[0])]; - if($type != (10 or 11 or 12 or 13 or 32 or 33 or 34 or 35 or 36)){ - $output .= "Unknown mob."; - break; - } - - if(count($args) == 1){//summon - - $spawnX = round($issuer->entity->x, 1, PHP_ROUND_HALF_UP); - $spawnY = round($issuer->entity->y, 1, PHP_ROUND_HALF_UP); - $spawnZ = round($issuer->entity->z, 1, PHP_ROUND_HALF_UP); - $spawnLevel = $issuer->entity->level; - - $entityit = $this->add($spawnLevel, ENTITY_MOB, $type, array( - "x" => $spawnX, - "y" => $spawnY, - "z" => $spawnZ, - "Health" => $this->hp[$type], - )); - $this->spawnToAll($entityit, $level); - $output .= $this->mobName[$type]." spawned in ".$spawnX.", ".$spawnY.", ".$spawnZ."."; - break; - } - elseif(is_numeric($args[1])){//summon [amount] - $amount = (int)$args[1]; - if($amount > 25){ - $output .= "Cannot spawn > 25 mobs"; + if(!($issuer instanceof Player)){ + $output .= "Please run this command in-game."; + break; + } + if((count($args) < 1) or (count($args) > 3)){ + $output .= "Usage: /$cmd [amount] [baby]"; break; } - $isBaby = 0; - if(strtolower($args[2]) == 'baby'){//summon [amount] [baby] - if($type > 13){ - $output .= "This mob cant be baby!"; - break; - } - $isBaby = 1; + $type = $this->mob[strtolower($args[0])]; + if($type != (10 or 11 or 12 or 13 or 32 or 33 or 34 or 35 or 36)){ + $output .= "Unknown mob."; + break; } - $spawnX = round($issuer->entity->x, 1, PHP_ROUND_HALF_UP); - $spawnY = round($issuer->entity->y, 1, PHP_ROUND_HALF_UP); - $spawnZ = round($issuer->entity->z, 1, PHP_ROUND_HALF_UP); - $spawnLevel = $issuer->entity->level; + if(count($args) == 1){//summon - for($cnt = $amount; $cnt > 0; --$cnt){ + $spawnX = round($issuer->entity->x, 1, PHP_ROUND_HALF_UP); + $spawnY = round($issuer->entity->y, 1, PHP_ROUND_HALF_UP); + $spawnZ = round($issuer->entity->z, 1, PHP_ROUND_HALF_UP); + $spawnLevel = $issuer->entity->level; + $entityit = $this->add($spawnLevel, ENTITY_MOB, $type, array( "x" => $spawnX, "y" => $spawnY, "z" => $spawnZ, "Health" => $this->hp[$type], - "IsBaby" => $isBaby, )); $this->spawnToAll($entityit, $level); + $output .= $this->mobName[$type]." spawned in ".$spawnX.", ".$spawnY.", ".$spawnZ."."; + break; } - - if($type == 13 or $amount == 1) $plural = ''; - else $plural = 's'; - - if($isBaby == 1) $baby = "Baby "; - else $baby = ''; - - $output .= $amount." ".$baby.$this->mobName[$type].$plural." spawned in ".$spawnX.", ".$spawnY.", ".$spawnZ."."; - - break; + elseif(is_numeric($args[1])){//summon [amount] + $amount = (int)$args[1]; + if($amount > 25){ + $output .= "Cannot spawn > 25 mobs"; + break; + } + + $isBaby = 0; + if(strtolower($args[2]) == 'baby'){//summon [amount] [baby] + if($type > 13){ + $output .= "This mob cant be baby!"; + break; + } + $isBaby = 1; + } + + $spawnX = round($issuer->entity->x, 1, PHP_ROUND_HALF_UP); + $spawnY = round($issuer->entity->y, 1, PHP_ROUND_HALF_UP); + $spawnZ = round($issuer->entity->z, 1, PHP_ROUND_HALF_UP); + $spawnLevel = $issuer->entity->level; + + for($cnt = $amount; $cnt > 0; --$cnt){ + $entityit = $this->add($spawnLevel, ENTITY_MOB, $type, array( + "x" => $spawnX, + "y" => $spawnY, + "z" => $spawnZ, + "Health" => $this->hp[$type], + "IsBaby" => $isBaby, + )); + $this->spawnToAll($entityit, $level); + } + + if($type == 13 or $amount == 1) $plural = ''; + else $plural = 's'; + + if($isBaby == 1) $baby = "Baby "; + else $baby = ''; + + $output .= $amount." ".$baby.$this->mobName[$type].$plural." spawned in ".$spawnX.", ".$spawnY.", ".$spawnZ."."; + + break; } elseif(strtolower($args[1]) == 'baby'){//summon [baby] if($type > 13){ - $output .= "Baby can be only animals!"; + $output .= "This mob cant be baby!"; break; } else{ $spawnX = round($issuer->entity->x, 1, PHP_ROUND_HALF_UP); $spawnY = round($issuer->entity->y, 1, PHP_ROUND_HALF_UP); $spawnZ = round($issuer->entity->z, 1, PHP_ROUND_HALF_UP); - $spawnLevel = $issuer->entity->level; - + $spawnLevel = $issuer->entity->level; $entityit = $this->add($spawnLevel, ENTITY_MOB, $type, array( "x" => $spawnX, "y" => $spawnY, @@ -201,7 +199,7 @@ class EntityAPI{ } } } - $output .= $cnt." mobs has been despawned!"; + $output .= $cnt." mobs have been despawned!"; break; } return $output; @@ -270,7 +268,7 @@ class EntityAPI{ public function add(Level $level, $class, $type = 0, $data = array()){ $eid = $this->eCnt++; - $efl = EntityRegistry::$entityList->getEntityFromType($type); + $efl = EntityRegistry::$entityList->getEntityFromTypeAndClass($type, $class); if($efl instanceof PropertyEntity){ $class = $efl->getEntityName(); $this->entities[$eid] = new $class($level, $eid, $efl->getEntityClass(), $efl->getEntityType(), $data); diff --git a/src/entity/Animal.php b/src/entity/Animal.php index 4c99cfc5..618e69d4 100644 --- a/src/entity/Animal.php +++ b/src/entity/Animal.php @@ -5,6 +5,9 @@ move methods */ abstract class Animal extends Creature implements Ageable, Breedable{ public function isBaby(){ + if(!isset($this->data["IsBaby"])){ + $this->data["IsBaby"] = false; + } return $this->data["IsBaby"]; } public function getMetadata(){ diff --git a/src/entity/Entity.php b/src/entity/Entity.php index 9e039ea8..fb2a5432 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -960,8 +960,8 @@ class Entity extends Position{ ); foreach($this->player->armor as $slot=>$part){ if($part instanceof Item and isset($values[$part->getID()])){ - $points += $values[$part->getID()]; if(is_numeric($cause)){ //check was entity damage by another entity + $points += $values[$part->getID()]; $this->player->damageArmorPart($slot, $part); } } diff --git a/src/entity/EntityRegistry.php b/src/entity/EntityRegistry.php index 02a75d0c..b79e2831 100644 --- a/src/entity/EntityRegistry.php +++ b/src/entity/EntityRegistry.php @@ -27,8 +27,8 @@ class EntityList{ $this->entities[$property->getEntityType()] = $property; } - public function getEntityFromType($type){ - return isset($this->entities[$type]) ? $this->entities[$type] : 0; + public function getEntityFromTypeAndClass($type, $class){ + return isset($this->entities[$type]) && $this->entities[$type]->getEntityClass() === $class ? $this->entities[$type] : 0; } private $entities = []; }