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

Entity: remove duplicated code from saveNBT()

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-06-19 01:07:18 +01:00
parent 0ae357cf8f
commit cf85857660
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/entity/Entity.php
View File

@ -41,8 +41,6 @@ use pocketmine\math\Facing;
use pocketmine\math\Vector2;
use pocketmine\math\Vector3;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\DoubleTag;
use pocketmine\nbt\tag\FloatTag;
use pocketmine\nbt\tag\ListTag;
use pocketmine\nbt\tag\StringTag;
use pocketmine\network\mcpe\protocol\AddActorPacket;
@ -460,7 +458,8 @@ abstract class Entity{
}
public function saveNBT() : CompoundTag{
$nbt = new CompoundTag();
$nbt = EntityFactory::createBaseNBT($this->location, $this->motion, $this->location->yaw, $this->location->pitch);
if(!($this instanceof Player)){
$nbt->setString("id", EntityFactory::getInstance()->getSaveId(get_class($this)));
@ -470,23 +469,6 @@ abstract class Entity{
}
}
$nbt->setTag("Pos", new ListTag([
new DoubleTag($this->location->x),
new DoubleTag($this->location->y),
new DoubleTag($this->location->z)
]));
$nbt->setTag("Motion", new ListTag([
new DoubleTag($this->motion->x),
new DoubleTag($this->motion->y),
new DoubleTag($this->motion->z)
]));
$nbt->setTag("Rotation", new ListTag([
new FloatTag($this->location->yaw),
new FloatTag($this->location->pitch)
]));
$nbt->setFloat("FallDistance", $this->fallDistance);
$nbt->setShort("Fire", $this->fireTicks);
$nbt->setByte("OnGround", $this->onGround ? 1 : 0);