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

Merge branch 'release/3.1'

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-07-05 12:11:26 +01:00
commit fbd4f4a849
4 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/command/Command.php
View File

@ -127,7 +127,7 @@ abstract class Command{
if($this->permissionMessage === null){ if($this->permissionMessage === null){
$target->sendMessage($target->getServer()->getLanguage()->translateString(TextFormat::RED . "%commands.generic.permission")); $target->sendMessage($target->getServer()->getLanguage()->translateString(TextFormat::RED . "%commands.generic.permission"));
}elseif($this->permissionMessage !== ""){ }elseif($this->permissionMessage !== ""){
$target->sendMessage(str_replace("<permission>", $this->getPermission(), $this->permissionMessage)); $target->sendMessage(str_replace("<permission>", $this->permission, $this->permissionMessage));
} }
return false; return false;
@ -139,11 +139,11 @@ abstract class Command{
* @return bool * @return bool
*/ */
public function testPermissionSilent(CommandSender $target) : bool{ public function testPermissionSilent(CommandSender $target) : bool{
if(($perm = $this->getPermission()) === null or $perm === ""){ if($this->permission === null or $this->permission === ""){
return true; return true;
} }
foreach(explode(";", $perm) as $permission){ foreach(explode(";", $this->permission) as $permission){
if($target->hasPermission($permission)){ if($target->hasPermission($permission)){
return true; return true;
} }

4
src/pocketmine/command/defaults/TellCommand.php
View File

@ -50,9 +50,7 @@ class TellCommand extends VanillaCommand{
throw new InvalidCommandSyntaxException(); throw new InvalidCommandSyntaxException();
} }
$name = strtolower(array_shift($args)); $player = $sender->getServer()->getPlayer(array_shift($args));
$player = $sender->getServer()->getPlayer($name);
if($player === $sender){ if($player === $sender){
$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.message.sameTarget")); $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.message.sameTarget"));

8
src/pocketmine/inventory/DoubleChestInventory.php
View File

@ -60,15 +60,11 @@ class DoubleChestInventory extends ChestInventory implements InventoryHolder{
} }
public function getItem(int $index) : Item{ public function getItem(int $index) : Item{
return $index < $this->left->getSize() ? $this->left->getItem($index) : $this->right->getItem($index - $this->right->getSize()); return $index < $this->left->getSize() ? $this->left->getItem($index) : $this->right->getItem($index - $this->left->getSize());
} }
public function setItem(int $index, Item $item, bool $send = true) : bool{ public function setItem(int $index, Item $item, bool $send = true) : bool{
return $index < $this->left->getSize() ? $this->left->setItem($index, $item, $send) : $this->right->setItem($index - $this->right->getSize(), $item, $send); return $index < $this->left->getSize() ? $this->left->setItem($index, $item, $send) : $this->right->setItem($index - $this->left->getSize(), $item, $send);
}
public function clear(int $index, bool $send = true) : bool{
return $index < $this->left->getSize() ? $this->left->clear($index, $send) : $this->right->clear($index - $this->right->getSize(), $send);
} }
public function getContents(bool $includeEmpty = false) : array{ public function getContents(bool $includeEmpty = false) : array{

10
src/pocketmine/level/format/Chunk.php
View File

@ -75,8 +75,8 @@ class Chunk{
/** @var Entity[] */ /** @var Entity[] */
protected $entities = []; protected $entities = [];
/** @var int[] */ /** @var \SplFixedArray|int[] */
protected $heightMap = []; protected $heightMap;
/** @var string */ /** @var string */
protected $biomeIds; protected $biomeIds;
@ -110,11 +110,11 @@ class Chunk{
} }
if(count($heightMap) === 256){ if(count($heightMap) === 256){
$this->heightMap = $heightMap; $this->heightMap = \SplFixedArray::fromArray($heightMap);
}else{ }else{
assert(count($heightMap) === 0, "Wrong HeightMap value count, expected 256, got " . count($heightMap)); assert(count($heightMap) === 0, "Wrong HeightMap value count, expected 256, got " . count($heightMap));
$val = ($this->height * 16); $val = ($this->height * 16);
$this->heightMap = array_fill(0, 256, $val); $this->heightMap = \SplFixedArray::fromArray(array_fill(0, 256, $val));
} }
if(strlen($biomeIds) === 256){ if(strlen($biomeIds) === 256){
@ -739,7 +739,7 @@ class Chunk{
* @return int[] * @return int[]
*/ */
public function getHeightMapArray() : array{ public function getHeightMapArray() : array{
return $this->heightMap; return $this->heightMap->toArray();
} }
/** /**