mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 02:08:21 +00:00
Code Issues Projects Releases Wiki Activity

Heap of bugfixes, cleanup and PHP 7 upgrades

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-07-13 19:18:56 +01:00
parent c2a7c2c6cd
commit 2a7b736f18
49 changed files with 114 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ abstract class Command{
$this->name = $name;
$this->setLabel($name);
$this->setDescription($description);
$this->usageMessage = $usageMessage === null ? "/" . $name : $usageMessage;
$this->usageMessage = $usageMessage ?? ("/" . $name);
$this->setAliases($aliases);
}

2
src/pocketmine/command/CommandReader.php
View File

@ -40,7 +40,7 @@ class CommandReader extends Thread{
$this->buffer = new \Threaded;
$opts = getopt("", ["disable-readline"]);
if((extension_loaded("readline") and !isset($opts["disable-readline"]) and !$this->isPipe(STDIN))){
if(extension_loaded("readline") and !isset($opts["disable-readline"]) and !$this->isPipe(STDIN)){
$this->type = self::TYPE_READLINE;
}

2
src/pocketmine/command/FormattedCommandAlias.php
View File

@ -102,7 +102,7 @@ class FormattedCommandAlias extends Command{
throw new \InvalidArgumentException("Invalid replacement token");
}
$position = intval(substr($formatString, $argStart, $index));
$position = (int) (substr($formatString, $argStart, $index));
if($position === 0){
throw new \InvalidArgumentException("Invalid replacement token");

2
src/pocketmine/command/defaults/DumpMemoryCommand.php
View File

@ -52,7 +52,7 @@ class DumpMemoryCommand extends VanillaCommand{
++self::$executions;
$sender->getServer()->getMemoryManager()->dumpServerMemory(isset($args[1]) ? $args[1] : $sender->getServer()->getDataPath() . "/memoryDump_$token", 48, 80);
$sender->getServer()->getMemoryManager()->dumpServerMemory($args[1] ?? ($sender->getServer()->getDataPath() . "/memoryDump_$token"), 48, 80);
return true;
}
}

2
src/pocketmine/command/defaults/KickCommand.php
View File

@ -55,7 +55,7 @@ class KickCommand extends VanillaCommand{
if(($player = $sender->getServer()->getPlayer($name)) instanceof Player){
$player->kick($reason);
if(strlen($reason) >= 1){
if($reason !== ""){
Command::broadcastCommandMessage($sender, new TranslationContainer("commands.kick.success.reason", [$player->getName(), $reason]));
}else{
Command::broadcastCommandMessage($sender, new TranslationContainer("commands.kick.success", [$player->getName()]));

6
src/pocketmine/command/defaults/ParticleCommand.php
View File

@ -203,17 +203,17 @@ class ParticleCommand extends VanillaCommand{
}
if(substr($name, 0, 10) === "iconcrack_"){
if(strpos($name, "iconcrack_") === 0){
$d = explode("_", $name);
if(count($d) === 3){
return new ItemBreakParticle($pos, Item::get((int) $d[1], (int) $d[2]));
}
}elseif(substr($name, 0, 11) === "blockcrack_"){
}elseif(strpos($name, "blockcrack_") === 0){
$d = explode("_", $name);
if(count($d) === 2){
return new TerrainParticle($pos, Block::get($d[1] & 0xff, $d[1] >> 12));
}
}elseif(substr($name, 0, 10) === "blockdust_"){
}elseif(strpos($name, "blockdust_") === 0){
$d = explode("_", $name);
if(count($d) >= 4){
return new DustParticle($pos, $d[1] & 0xff, $d[2] & 0xff, $d[3] & 0xff, isset($d[4]) ? $d[4] & 0xff : 255);