mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-04 00:59:51 +00:00
Code Issues Projects Releases Wiki Activity

Added capability to remove owners/target entities

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-08-16 19:14:15 +01:00
parent 741394dab1
commit 20aa519f3a
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/pocketmine/entity/Entity.php
View File

@ -600,18 +600,20 @@ abstract class Entity extends Location implements Metadatable{
} }
/** /**
* Sets the owner of the entity. * Sets the owner of the entity. Passing null will remove the current owner.
* *
* @param Entity $owner * @param Entity|null $owner
* *
* @throws \InvalidArgumentException if the supplied entity is not valid * @throws \InvalidArgumentException if the supplied entity is not valid
*/ */
public function setOwningEntity(Entity $owner){ public function setOwningEntity(Entity $owner = null){
if($owner->closed){ if($owner === null){
$this->removeDataProperty(self::DATA_OWNER_EID);
}elseif($owner->closed){
throw new \InvalidArgumentException("Supplied owning entity is garbage and cannot be used"); throw new \InvalidArgumentException("Supplied owning entity is garbage and cannot be used");
}else{
$this->setDataProperty(self::DATA_OWNER_EID, self::DATA_TYPE_LONG, $owner->getId());
} }
$this->setDataProperty(self::DATA_OWNER_EID, self::DATA_TYPE_LONG, $owner->getId());
} }
/** /**
@ -638,18 +640,20 @@ abstract class Entity extends Location implements Metadatable{
} }
/** /**
* Sets the entity's target entity. * Sets the entity's target entity. Passing null will remove the current target.
* *
* @param Entity $target * @param Entity|null $target
* *
* @throws \InvalidArgumentException if the target entity is not valid * @throws \InvalidArgumentException if the target entity is not valid
*/ */
public function setTargetEntity(Entity $target){ public function setTargetEntity(Entity $target = null){
if($target->closed){ if($target === null){
$this->removeDataProperty(self::DATA_TARGET_EID);
}elseif($target->closed){
throw new \InvalidArgumentException("Supplied target entity is garbage and cannot be used"); throw new \InvalidArgumentException("Supplied target entity is garbage and cannot be used");
}else{
$this->setDataProperty(self::DATA_TARGET_EID, self::DATA_TYPE_LONG, $target->getId());
} }
$this->setDataProperty(self::DATA_TARGET_EID, self::DATA_TYPE_LONG, $target->getId());
} }
/** /**
@ -1875,6 +1879,10 @@ abstract class Entity extends Location implements Metadatable{
return isset($this->dataProperties[$id]) ? $this->dataProperties[$id][1] : null; return isset($this->dataProperties[$id]) ? $this->dataProperties[$id][1] : null;
} }
public function removeDataProperty(int $id){
unset($this->dataProperties[$id]);
}
/** /**
* @param int $id * @param int $id
* *