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

Merge branch '3.5'

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-01-19 17:48:57 +00:00
commit f9c067db50
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pocketmine/tile/Sign.php
View File

@ -31,8 +31,6 @@ use pocketmine\utils\TextFormat;
use function array_map; use function array_map;
use function array_pad; use function array_pad;
use function array_slice; use function array_slice;
use function assert;
use function count;
use function explode; use function explode;
use function implode; use function implode;
use function sprintf; use function sprintf;
@ -41,13 +39,16 @@ class Sign extends Spawnable{
public const TAG_TEXT_BLOB = "Text"; public const TAG_TEXT_BLOB = "Text";
public const TAG_TEXT_LINE = "Text%d"; //sprintf()able public const TAG_TEXT_LINE = "Text%d"; //sprintf()able
private static function fixTextBlob(string $blob) : array{
return array_slice(array_pad(explode("\n", $blob), 4, ""), 0, 4);
}
/** @var string[] */ /** @var string[] */
protected $text = ["", "", "", ""]; protected $text = ["", "", "", ""];
public function readSaveData(CompoundTag $nbt) : void{ public function readSaveData(CompoundTag $nbt) : void{
if($nbt->hasTag(self::TAG_TEXT_BLOB, StringTag::class)){ //MCPE 1.2 save format if($nbt->hasTag(self::TAG_TEXT_BLOB, StringTag::class)){ //MCPE 1.2 save format
$this->text = array_pad(explode("\n", $nbt->getString(self::TAG_TEXT_BLOB)), 4, ""); $this->text = self::fixTextBlob($nbt->getString(self::TAG_TEXT_BLOB));
assert(count($this->text) === 4, "Too many lines!");
}else{ }else{
for($i = 1; $i <= 4; ++$i){ for($i = 1; $i <= 4; ++$i){
$textKey = sprintf(self::TAG_TEXT_LINE, $i); $textKey = sprintf(self::TAG_TEXT_LINE, $i);
@ -131,7 +132,7 @@ class Sign extends Spawnable{
public function updateCompoundTag(CompoundTag $nbt, Player $player) : bool{ public function updateCompoundTag(CompoundTag $nbt, Player $player) : bool{
if($nbt->hasTag(self::TAG_TEXT_BLOB, StringTag::class)){ if($nbt->hasTag(self::TAG_TEXT_BLOB, StringTag::class)){
$lines = array_slice(array_pad(explode("\n", $nbt->getString(self::TAG_TEXT_BLOB)), 4, ""), 0, 4); $lines = self::fixTextBlob($nbt->getString(self::TAG_TEXT_BLOB));
}else{ }else{
return false; return false;
} }