mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-12 22:45:28 +00:00
Code Issues Projects Releases Wiki Activity

Fixed #254

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo 2013-05-17 18:45:02 +02:00
parent 3bb7114e7c
commit edb93d6312
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/world/Entity.php
View File

@ -75,7 +75,8 @@ class Entity extends Position{
private $speedMeasure = array(0, 0, 0, 0, 0); private $speedMeasure = array(0, 0, 0, 0, 0);
private $server; private $server;
public $level; public $level;
public $check; public $check = true;
public $size = 1;
function __construct(Level $level, $eid, $class, $type = 0, $data = array()){ function __construct(Level $level, $eid, $class, $type = 0, $data = array()){
$this->level = $level; $this->level = $level;
@ -116,6 +117,7 @@ class Entity extends Position{
case ENTITY_PLAYER: case ENTITY_PLAYER:
$this->player = $this->data["player"]; $this->player = $this->data["player"];
$this->setHealth($this->health, "generic"); $this->setHealth($this->health, "generic");
$this->size = 1;
break; break;
case ENTITY_ITEM: case ENTITY_ITEM:
if(isset($data["item"]) and ($data["item"] instanceof Item)){ if(isset($data["item"]) and ($data["item"] instanceof Item)){
@ -127,11 +129,13 @@ class Entity extends Position{
} }
$this->setHealth(5, "generic"); $this->setHealth(5, "generic");
$this->server->schedule(5, array($this, "update"), array(), true); $this->server->schedule(5, array($this, "update"), array(), true);
$this->size = 0.25;
break; break;
case ENTITY_MOB: case ENTITY_MOB:
$this->setHealth($this->data["Health"], "generic"); $this->setHealth($this->data["Health"], "generic");
$this->server->schedule(5, array($this, "update"), array(), true); $this->server->schedule(5, array($this, "update"), array(), true);
//$this->setName((isset($mobs[$this->type]) ? $mobs[$this->type]:$this->type)); //$this->setName((isset($mobs[$this->type]) ? $mobs[$this->type]:$this->type));
$this->size = 1;
break; break;
case ENTITY_OBJECT: case ENTITY_OBJECT:
$this->x = isset($this->data["TileX"]) ? $this->data["TileX"]:$this->x; $this->x = isset($this->data["TileX"]) ? $this->data["TileX"]:$this->x;
@ -139,6 +143,7 @@ class Entity extends Position{
$this->z = isset($this->data["TileZ"]) ? $this->data["TileZ"]:$this->z; $this->z = isset($this->data["TileZ"]) ? $this->data["TileZ"]:$this->z;
$this->setHealth(1, "generic"); $this->setHealth(1, "generic");
//$this->setName((isset($objects[$this->type]) ? $objects[$this->type]:$this->type)); //$this->setName((isset($objects[$this->type]) ? $objects[$this->type]:$this->type));
$this->size = 1;
break; break;
} }
} }
@ -321,7 +326,7 @@ class Entity extends Position{
for($z = $startZ; $z <= $endZ; ++$z){ for($z = $startZ; $z <= $endZ; ++$z){
for($x = $startX; $x <= $endX; ++$x){ for($x = $startX; $x <= $endX; ++$x){
$v = new Vector3($x, $y, $z); $v = new Vector3($x, $y, $z);
if($this->isSupport($v)){ if($this->isSupport($v, $this->size)){
$b = $this->level->getBlock($v); $b = $this->level->getBlock($v);
if($b->isFlowable !== true){ if($b->isFlowable !== true){
$support = true; $support = true;