mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 19:02:59 +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

17
src/pocketmine/entity/object/PrimedTNT.php
View File

@ -28,6 +28,7 @@ use pocketmine\entity\Explosive;
use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\event\entity\ExplosionPrimeEvent;
use pocketmine\level\Explosion;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\ShortTag;
use pocketmine\network\mcpe\protocol\LevelEventPacket;
@ -53,11 +54,11 @@ class PrimedTNT extends Entity implements Explosive{
}
}
protected function initEntity() : void{
parent::initEntity();
protected function initEntity(CompoundTag $nbt) : void{
parent::initEntity($nbt);
if($this->namedtag->hasTag("Fuse", ShortTag::class)){
$this->fuse = $this->namedtag->getShort("Fuse");
if($nbt->hasTag("Fuse", ShortTag::class)){
$this->fuse = $nbt->getShort("Fuse");
}else{
$this->fuse = 80;
}
@ -73,9 +74,11 @@ class PrimedTNT extends Entity implements Explosive{
return false;
}
public function saveNBT() : void{
parent::saveNBT();
$this->namedtag->setShort("Fuse", $this->fuse, true); //older versions incorrectly saved this as a byte
public function saveNBT() : CompoundTag{
$nbt = parent::saveNBT();
$nbt->setShort("Fuse", $this->fuse, true); //older versions incorrectly saved this as a byte
return $nbt;
}
public function entityBaseTick(int $tickDiff = 1) : bool{