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

Kill entity runtime NBT (#2361)

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-08-14 13:33:02 +01:00
committed by GitHub
parent 4b7300de8d
commit 0273e2484e
17 changed files with 224 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -436,8 +436,6 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
public $lastUpdate;
/** @var int */
public $fireTicks = 0;
/** @var CompoundTag */
public $namedtag;
/** @var bool */
public $canCollide = true;
@ -495,13 +493,12 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
}
$this->id = Entity::$entityCount++;
$this->namedtag = $nbt;
$this->server = $level->getServer();
/** @var float[] $pos */
$pos = $this->namedtag->getListTag("Pos")->getAllValues();
$pos = $nbt->getListTag("Pos")->getAllValues();
/** @var float[] $rotation */
$rotation = $this->namedtag->getListTag("Rotation")->getAllValues();
$rotation = $nbt->getListTag("Rotation")->getAllValues();
parent::__construct($pos[0], $pos[1], $pos[2], $rotation[0], $rotation[1], $level);
assert(!is_nan($this->x) and !is_infinite($this->x) and !is_nan($this->y) and !is_infinite($this->y) and !is_nan($this->z) and !is_infinite($this->z));
@ -514,15 +511,15 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
throw new \InvalidStateException("Cannot create entities in unloaded chunks");
}
if($this->namedtag->hasTag("Motion", ListTag::class)){
if($nbt->hasTag("Motion", ListTag::class)){
/** @var float[] $motion */
$motion = $this->namedtag->getListTag("Motion")->getAllValues();
$motion = $nbt->getListTag("Motion")->getAllValues();
$this->setMotion($this->temporalVector->setComponents(...$motion));
}
$this->resetLastMovements();
$this->fallDistance = $this->namedtag->getFloat("FallDistance", 0.0);
$this->fallDistance = $nbt->getFloat("FallDistance", 0.0);
$this->propertyManager = new DataPropertyManager();
@ -534,14 +531,14 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
$this->propertyManager->setFloat(self::DATA_BOUNDING_BOX_WIDTH, $this->width);
$this->propertyManager->setFloat(self::DATA_BOUNDING_BOX_HEIGHT, $this->height);
$this->fireTicks = $this->namedtag->getShort("Fire", 0);
$this->fireTicks = $nbt->getShort("Fire", 0);
if($this->isOnFire()){
$this->setGenericFlag(self::DATA_FLAG_ONFIRE);
}
$this->propertyManager->setShort(self::DATA_AIR, $this->namedtag->getShort("Air", 300));
$this->onGround = $this->namedtag->getByte("OnGround", 0) !== 0;
$this->invulnerable = $this->namedtag->getByte("Invulnerable", 0) !== 0;
$this->propertyManager->setShort(self::DATA_AIR, $nbt->getShort("Air", 300));
$this->onGround = $nbt->getByte("OnGround", 0) !== 0;
$this->invulnerable = $nbt->getByte("Invulnerable", 0) !== 0;
$this->attributeMap = new AttributeMap();
$this->addAttributes();
@ -549,7 +546,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
$this->setGenericFlag(self::DATA_FLAG_AFFECTED_BY_GRAVITY, true);
$this->setGenericFlag(self::DATA_FLAG_HAS_COLLISION, true);
$this->initEntity();
$this->initEntity($nbt);
$this->propertyManager->clearDirtyProperties(); //Prevents resending properties that were set during construction
$this->chunk->addEntity($this);
@ -838,54 +835,52 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
return current(self::$saveNames[static::class]);
}
public function saveNBT() : void{
public function saveNBT() : CompoundTag{
$nbt = new CompoundTag();
if(!($this instanceof Player)){
$this->namedtag->setString("id", $this->getSaveId(), true);
$nbt->setString("id", $this->getSaveId(), true);
if($this->getNameTag() !== ""){
$this->namedtag->setString("CustomName", $this->getNameTag());
$this->namedtag->setByte("CustomNameVisible", $this->isNameTagVisible() ? 1 : 0);
}else{
$this->namedtag->removeTag("CustomName", "CustomNameVisible");
$nbt->setString("CustomName", $this->getNameTag());
$nbt->setByte("CustomNameVisible", $this->isNameTagVisible() ? 1 : 0);
}
}
$this->namedtag->setTag(new ListTag("Pos", [
$nbt->setTag(new ListTag("Pos", [
new DoubleTag("", $this->x),
new DoubleTag("", $this->y),
new DoubleTag("", $this->z)
]));
$this->namedtag->setTag(new ListTag("Motion", [
$nbt->setTag(new ListTag("Motion", [
new DoubleTag("", $this->motion->x),
new DoubleTag("", $this->motion->y),
new DoubleTag("", $this->motion->z)
]));
$this->namedtag->setTag(new ListTag("Rotation", [
$nbt->setTag(new ListTag("Rotation", [
new FloatTag("", $this->yaw),
new FloatTag("", $this->pitch)
]));
$this->namedtag->setFloat("FallDistance", $this->fallDistance);
$this->namedtag->setShort("Fire", $this->fireTicks);
$this->namedtag->setShort("Air", $this->propertyManager->getShort(self::DATA_AIR));
$this->namedtag->setByte("OnGround", $this->onGround ? 1 : 0);
$this->namedtag->setByte("Invulnerable", $this->invulnerable ? 1 : 0);
$nbt->setFloat("FallDistance", $this->fallDistance);
$nbt->setShort("Fire", $this->fireTicks);
$nbt->setShort("Air", $this->propertyManager->getShort(self::DATA_AIR));
$nbt->setByte("OnGround", $this->onGround ? 1 : 0);
$nbt->setByte("Invulnerable", $this->invulnerable ? 1 : 0);
return $nbt;
}
protected function initEntity() : void{
assert($this->namedtag instanceof CompoundTag);
protected function initEntity(CompoundTag $nbt) : void{
if($nbt->hasTag("CustomName", StringTag::class)){
$this->setNameTag($nbt->getString("CustomName"));
if($this->namedtag->hasTag("CustomName", StringTag::class)){
$this->setNameTag($this->namedtag->getString("CustomName"));
if($this->namedtag->hasTag("CustomNameVisible", StringTag::class)){
if($nbt->hasTag("CustomNameVisible", StringTag::class)){
//Older versions incorrectly saved this as a string (see 890f72dbf23a77f294169b79590770470041adc4)
$this->setNameTagVisible($this->namedtag->getString("CustomNameVisible") !== "");
$this->namedtag->removeTag("CustomNameVisible");
$this->setNameTagVisible($nbt->getString("CustomNameVisible") !== "");
}else{
$this->setNameTagVisible($this->namedtag->getByte("CustomNameVisible", 1) !== 0);
$this->setNameTagVisible($nbt->getByte("CustomNameVisible", 1) !== 0);
}
}
}
@ -2036,7 +2031,6 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
$this->setLevel(null);
}
$this->namedtag = null;
$this->lastDamageCause = null;
}
}