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

Arrow: Save and load critical state (#4241)

Browse Source 
Fixes #3596
This commit is contained in:
Jason 2021-06-09 09:00:36 -04:00 committed by GitHub
parent 920eb7cce5
commit 532d57eec7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/entity/EntityFactory.php
View File

@ -77,7 +77,7 @@ final class EntityFactory{
//TODO: index them by version to allow proper multi-save compatibility //TODO: index them by version to allow proper multi-save compatibility
$this->register(Arrow::class, function(World $world, CompoundTag $nbt) : Arrow{ $this->register(Arrow::class, function(World $world, CompoundTag $nbt) : Arrow{
return new Arrow(EntityDataHelper::parseLocation($nbt, $world), null, false, $nbt); //TODO: missing critical flag return new Arrow(EntityDataHelper::parseLocation($nbt, $world), null, $nbt->getByte(Arrow::TAG_CRIT, 0) === 1, $nbt);
}, ['Arrow', 'minecraft:arrow'], EntityLegacyIds::ARROW); }, ['Arrow', 'minecraft:arrow'], EntityLegacyIds::ARROW);
$this->register(Egg::class, function(World $world, CompoundTag $nbt) : Egg{ $this->register(Egg::class, function(World $world, CompoundTag $nbt) : Egg{

3
src/entity/projectile/Arrow.php
View File

@ -50,6 +50,7 @@ class Arrow extends Projectile{
public const PICKUP_CREATIVE = 2; public const PICKUP_CREATIVE = 2;
private const TAG_PICKUP = "pickup"; //TAG_Byte private const TAG_PICKUP = "pickup"; //TAG_Byte
public const TAG_CRIT = "crit"; //TAG_Byte
protected $gravity = 0.05; protected $gravity = 0.05;
protected $drag = 0.01; protected $drag = 0.01;
@ -80,12 +81,14 @@ class Arrow extends Projectile{
parent::initEntity($nbt); parent::initEntity($nbt);
$this->pickupMode = $nbt->getByte(self::TAG_PICKUP, self::PICKUP_ANY); $this->pickupMode = $nbt->getByte(self::TAG_PICKUP, self::PICKUP_ANY);
$this->critical = $nbt->getByte(self::TAG_CRIT, 0) === 1;
$this->collideTicks = $nbt->getShort("life", $this->collideTicks); $this->collideTicks = $nbt->getShort("life", $this->collideTicks);
} }
public function saveNBT() : CompoundTag{ public function saveNBT() : CompoundTag{
$nbt = parent::saveNBT(); $nbt = parent::saveNBT();
$nbt->setByte(self::TAG_PICKUP, $this->pickupMode); $nbt->setByte(self::TAG_PICKUP, $this->pickupMode);
$nbt->setByte(self::TAG_CRIT, $this->critical ? 1 : 0);
$nbt->setShort("life", $this->collideTicks); $nbt->setShort("life", $this->collideTicks);
return $nbt; return $nbt;
} }