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

Tile NBT usage enhancements (#1259)

Browse Source 
* Do not create new NBT objects on Tile::getSpawnCompound()

* PocketMine's string formatting

* Remove more useless array indices and create lesser new NBT objects.

* Remove unused imports and type-hint Sign::setText() params

* Do not mess with Sign::setText() params due to #1204

* Fix formatting

* Make getSpawnCompound() final and add abstract addAdditionalSpawnData()

* Make the same changes for Bed tile

* Fix a missing "->" and remove some unneeded int casting.
This commit is contained in:
Muqsit Rayyan
2017-08-06 17:05:37 +05:30
committed by Dylan K. Taylor
parent 3fdbcee10f
commit 7d3fca83f0
11 changed files with 107 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/pocketmine/tile/Chest.php
View File

@ -74,7 +74,7 @@ class Chest extends Spawnable implements InventoryHolder, Container, Nameable{
}
public function saveNBT(){
$this->namedtag->Items = new ListTag("Items", []);
$this->namedtag->Items->setValue([]);
$this->namedtag->Items->setTagType(NBT::TAG_Compound);
for($index = 0; $index < $this->getSize(); ++$index){
$this->setItem($index, $this->inventory->getItem($index));
@ -95,7 +95,7 @@ class Chest extends Spawnable implements InventoryHolder, Container, Nameable{
*/
protected function getSlotIndex(int $index){
foreach($this->namedtag->Items as $i => $slot){
if((int) $slot["Slot"] === $index){
if($slot->Slot->getValue() === $index){
return (int) $i;
}
}
@ -225,7 +225,7 @@ class Chest extends Spawnable implements InventoryHolder, Container, Nameable{
*/
public function getPair(){
if($this->isPaired()){
$tile = $this->getLevel()->getTile(new Vector3((int) $this->namedtag["pairx"], $this->y, (int) $this->namedtag["pairz"]));
$tile = $this->getLevel()->getTile(new Vector3($this->namedtag->pairx->getValue(), $this->y, $this->namedtag->pairz->getValue()));
if($tile instanceof Chest){
return $tile;
}
@ -276,29 +276,14 @@ class Chest extends Spawnable implements InventoryHolder, Container, Nameable{
return true;
}
public function getSpawnCompound() : CompoundTag{
public function addAdditionalSpawnData(CompoundTag $nbt){
if($this->isPaired()){
$c = new CompoundTag("", [
new StringTag("id", Tile::CHEST),
new IntTag("x", (int) $this->x),
new IntTag("y", (int) $this->y),
new IntTag("z", (int) $this->z),
new IntTag("pairx", (int) $this->namedtag["pairx"]),
new IntTag("pairz", (int) $this->namedtag["pairz"])
]);
}else{
$c = new CompoundTag("", [
new StringTag("id", Tile::CHEST),
new IntTag("x", (int) $this->x),
new IntTag("y", (int) $this->y),
new IntTag("z", (int) $this->z)
]);
$nbt->pairx = $this->namedtag->pairx;
$nbt->pairz = $this->namedtag->pairz;
}
if($this->hasName()){
$c->CustomName = $this->namedtag->CustomName;
$nbt->CustomName = $this->namedtag->CustomName;
}
return $c;
}
}