Replaced array() with []

This commit is contained in:
Shoghi Cervantes 2014-08-28 17:04:22 +02:00
parent 2f2afe2336
commit eab86f5f90
122 changed files with 535 additions and 533 deletions

View File

@ -30,78 +30,78 @@ abstract class Achievement{
/** /**
* @var array[] * @var array[]
*/ */
public static $list = array( public static $list = [
/*"openInventory" => array( /*"openInventory" => array(
"name" => "Taking Inventory", "name" => "Taking Inventory",
"requires" => [], "requires" => [],
),*/ ),*/
"mineWood" => array( "mineWood" => [
"name" => "Getting Wood", "name" => "Getting Wood",
"requires" => array( //"openInventory", "requires" => [ //"openInventory",
), ],
), ],
"buildWorkBench" => array( "buildWorkBench" => [
"name" => "Benchmarking", "name" => "Benchmarking",
"requires" => array( "requires" => [
"mineWood", "mineWood",
), ],
), ],
"buildPickaxe" => array( "buildPickaxe" => [
"name" => "Time to Mine!", "name" => "Time to Mine!",
"requires" => array( "requires" => [
"buildWorkBench", "buildWorkBench",
), ],
), ],
"buildFurnace" => array( "buildFurnace" => [
"name" => "Hot Topic", "name" => "Hot Topic",
"requires" => array( "requires" => [
"buildPickaxe", "buildPickaxe",
), ],
), ],
"acquireIron" => array( "acquireIron" => [
"name" => "Acquire hardware", "name" => "Acquire hardware",
"requires" => array( "requires" => [
"buildFurnace", "buildFurnace",
), ],
), ],
"buildHoe" => array( "buildHoe" => [
"name" => "Time to Farm!", "name" => "Time to Farm!",
"requires" => array( "requires" => [
"buildWorkBench", "buildWorkBench",
), ],
), ],
"makeBread" => array( "makeBread" => [
"name" => "Bake Bread", "name" => "Bake Bread",
"requires" => array( "requires" => [
"buildHoe", "buildHoe",
), ],
), ],
"bakeCake" => array( "bakeCake" => [
"name" => "The Lie", "name" => "The Lie",
"requires" => array( "requires" => [
"buildHoe", "buildHoe",
), ],
), ],
"buildBetterPickaxe" => array( "buildBetterPickaxe" => [
"name" => "Getting an Upgrade", "name" => "Getting an Upgrade",
"requires" => array( "requires" => [
"buildPickaxe", "buildPickaxe",
), ],
), ],
"buildSword" => array( "buildSword" => [
"name" => "Time to Strike!", "name" => "Time to Strike!",
"requires" => array( "requires" => [
"buildWorkBench", "buildWorkBench",
), ],
), ],
"diamonds" => array( "diamonds" => [
"name" => "DIAMONDS!", "name" => "DIAMONDS!",
"requires" => array( "requires" => [
"acquireIron", "acquireIron",
), ],
), ],
); ];
public static function broadcast(Player $player, $achievementId){ public static function broadcast(Player $player, $achievementId){
@ -120,10 +120,10 @@ abstract class Achievement{
public static function add($achievementId, $achievementName, array $requires = []){ public static function add($achievementId, $achievementName, array $requires = []){
if(!isset(Achievement::$list[$achievementId])){ if(!isset(Achievement::$list[$achievementId])){
Achievement::$list[$achievementId] = array( Achievement::$list[$achievementId] = [
"name" => $achievementName, "name" => $achievementName,
"requires" => $requires, "requires" => $requires,
); ];
return true; return true;
} }

View File

@ -137,7 +137,7 @@ class CrashDump{
}else{ }else{
$error = (array) error_get_last(); $error = (array) error_get_last();
$error["trace"] = getTrace(4); $error["trace"] = getTrace(4);
$errorConversion = array( $errorConversion = [
E_ERROR => "E_ERROR", E_ERROR => "E_ERROR",
E_WARNING => "E_WARNING", E_WARNING => "E_WARNING",
E_PARSE => "E_PARSE", E_PARSE => "E_PARSE",
@ -153,7 +153,7 @@ class CrashDump{
E_RECOVERABLE_ERROR => "E_RECOVERABLE_ERROR", E_RECOVERABLE_ERROR => "E_RECOVERABLE_ERROR",
E_DEPRECATED => "E_DEPRECATED", E_DEPRECATED => "E_DEPRECATED",
E_USER_DEPRECATED => "E_USER_DEPRECATED", E_USER_DEPRECATED => "E_USER_DEPRECATED",
); ];
$error["fullFile"] = $error["file"]; $error["fullFile"] = $error["file"];
$error["file"] = cleanPath($error["file"]); $error["file"] = cleanPath($error["file"]);
$error["type"] = isset($errorConversion[$error["type"]]) ? $errorConversion[$error["type"]] : $error["type"]; $error["type"] = isset($errorConversion[$error["type"]]) ? $errorConversion[$error["type"]] : $error["type"];

View File

@ -809,7 +809,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$this->sendMetadata($this); $this->sendMetadata($this);
$this->setSpawn($pos); $this->setSpawn($pos);
$this->tasks[] = $this->server->getScheduler()->scheduleDelayedTask(new CallbackTask(array($this, "checkSleep")), 60); $this->tasks[] = $this->server->getScheduler()->scheduleDelayedTask(new CallbackTask([$this, "checkSleep"]), 60);
return true; return true;
@ -1135,7 +1135,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$this->displayName = $this->username; $this->displayName = $this->username;
$this->nameTag = $this->username; $this->nameTag = $this->username;
$this->iusername = strtolower($this->username); $this->iusername = strtolower($this->username);
$this->loginData = array("clientId" => $packet->clientId, "loginData" => $packet->loginData); $this->loginData = ["clientId" => $packet->clientId, "loginData" => $packet->loginData];
if(count($this->server->getOnlinePlayers()) > $this->server->getMaxPlayers()){ if(count($this->server->getOnlinePlayers()) > $this->server->getMaxPlayers()){
if($this->kick("server full") === true){ if($this->kick("server full") === true){
@ -1297,9 +1297,9 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$this->orderChunks(); $this->orderChunks();
$this->tasks[] = $this->server->getScheduler()->scheduleDelayedRepeatingTask(new CallbackTask(array($this, "orderChunks")), 10, 40); $this->tasks[] = $this->server->getScheduler()->scheduleDelayedRepeatingTask(new CallbackTask([$this, "orderChunks"]), 10, 40);
$this->sendNextChunk(); $this->sendNextChunk();
$this->tasks[] = $this->chunkLoadTask = $this->server->getScheduler()->scheduleRepeatingTask(new CallbackTask(array($this, "sendNextChunk")), 1); $this->tasks[] = $this->chunkLoadTask = $this->server->getScheduler()->scheduleRepeatingTask(new CallbackTask([$this, "sendNextChunk"]), 1);
break; break;
case ProtocolInfo::ROTATE_HEAD_PACKET: case ProtocolInfo::ROTATE_HEAD_PACKET:
@ -1790,7 +1790,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
} }
switch($packet->event){ switch($packet->event){
case 9: //Eating case 9: //Eating
$items = array( $items = [
Item::APPLE => 4, Item::APPLE => 4,
Item::MUSHROOM_STEW => 10, Item::MUSHROOM_STEW => 10,
Item::BEETROOT_SOUP => 10, Item::BEETROOT_SOUP => 10,
@ -1810,7 +1810,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
//Item::COOKIE => 2, //Item::COOKIE => 2,
//Item::COOKED_FISH => 5, //Item::COOKED_FISH => 5,
//Item::RAW_FISH => 2, //Item::RAW_FISH => 2,
); ];
$slot = $this->inventory->getItemInHand(); $slot = $this->inventory->getItemInHand();
if($this->getHealth() < 20 and isset($items[$slot->getID()])){ if($this->getHealth() < 20 and isset($items[$slot->getID()])){
$this->server->getPluginManager()->callEvent($ev = new PlayerItemConsumeEvent($this, $slot)); $this->server->getPluginManager()->callEvent($ev = new PlayerItemConsumeEvent($this, $slot));
@ -2309,17 +2309,17 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$flags |= $this->fireTicks > 0 ? 1 : 0; $flags |= $this->fireTicks > 0 ? 1 : 0;
//$flags |= ($this->crouched === true ? 0b10:0) << 1; //$flags |= ($this->crouched === true ? 0b10:0) << 1;
$flags |= ($this->inAction === true ? 0b10000:0); $flags |= ($this->inAction === true ? 0b10000:0);
$d = array( $d = [
0 => array("type" => 0, "value" => $flags), 0 => ["type" => 0, "value" => $flags],
1 => array("type" => 1, "value" => $this->airTicks), 1 => ["type" => 1, "value" => $this->airTicks],
16 => array("type" => 0, "value" => 0), 16 => ["type" => 0, "value" => 0],
17 => array("type" => 6, "value" => array(0, 0, 0)), 17 => ["type" => 6, "value" => [0, 0, 0]],
); ];
if($this->sleeping !== false){ if($this->sleeping !== false){
$d[16]["value"] = 2; $d[16]["value"] = 2;
$d[17]["value"] = array($this->sleeping->x, $this->sleeping->y, $this->sleeping->z); $d[17]["value"] = [$this->sleeping->x, $this->sleeping->y, $this->sleeping->z];
} }

View File

@ -148,7 +148,7 @@ namespace pocketmine {
ini_set("memory_limit", "256M"); //Default ini_set("memory_limit", "256M"); //Default
define("pocketmine\\START_TIME", microtime(true)); define("pocketmine\\START_TIME", microtime(true));
$opts = getopt("", array("enable-ansi", "disable-ansi", "data:", "plugins:", "no-wizard", "enable-profiler")); $opts = getopt("", ["enable-ansi", "disable-ansi", "data:", "plugins:", "no-wizard", "enable-profiler"]);
define("pocketmine\\DATA", isset($opts["data"]) ? realpath($opts["data"]) . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR); define("pocketmine\\DATA", isset($opts["data"]) ? realpath($opts["data"]) . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR);
define("pocketmine\\PLUGIN_PATH", isset($opts["plugins"]) ? realpath($opts["plugins"]) . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR); define("pocketmine\\PLUGIN_PATH", isset($opts["plugins"]) ? realpath($opts["plugins"]) . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
@ -217,7 +217,7 @@ namespace pocketmine {
if(error_reporting() === 0){ //@ error-control if(error_reporting() === 0){ //@ error-control
return false; return false;
} }
$errorConversion = array( $errorConversion = [
E_ERROR => "E_ERROR", E_ERROR => "E_ERROR",
E_WARNING => "E_WARNING", E_WARNING => "E_WARNING",
E_PARSE => "E_PARSE", E_PARSE => "E_PARSE",
@ -233,7 +233,7 @@ namespace pocketmine {
E_RECOVERABLE_ERROR => "E_RECOVERABLE_ERROR", E_RECOVERABLE_ERROR => "E_RECOVERABLE_ERROR",
E_DEPRECATED => "E_DEPRECATED", E_DEPRECATED => "E_DEPRECATED",
E_USER_DEPRECATED => "E_USER_DEPRECATED", E_USER_DEPRECATED => "E_USER_DEPRECATED",
); ];
$type = ($errno === E_ERROR or $errno === E_WARNING or $errno === E_USER_ERROR or $errno === E_USER_WARNING) ? LogLevel::ERROR : LogLevel::NOTICE; $type = ($errno === E_ERROR or $errno === E_WARNING or $errno === E_USER_ERROR or $errno === E_USER_WARNING) ? LogLevel::ERROR : LogLevel::NOTICE;
$errno = isset($errorConversion[$errno]) ? $errorConversion[$errno] : $errno; $errno = isset($errorConversion[$errno]) ? $errorConversion[$errno] : $errno;
if(($pos = strpos($errstr, "\n")) !== false){ if(($pos = strpos($errstr, "\n")) !== false){

View File

@ -626,14 +626,14 @@ class Server{
$path = $this->getDataPath() . "players/"; $path = $this->getDataPath() . "players/";
if(!file_exists($path . "$name.dat")){ if(!file_exists($path . "$name.dat")){
$spawn = $this->getDefaultLevel()->getSafeSpawn(); $spawn = $this->getDefaultLevel()->getSafeSpawn();
$nbt = new Compound(false, array( $nbt = new Compound(false, [
new Long("firstPlayed", floor(microtime(true) * 1000)), new Long("firstPlayed", floor(microtime(true) * 1000)),
new Long("lastPlayed", floor(microtime(true) * 1000)), new Long("lastPlayed", floor(microtime(true) * 1000)),
new Enum("Pos", array( new Enum("Pos", [
new Double(0, $spawn->x), new Double(0, $spawn->x),
new Double(1, $spawn->y), new Double(1, $spawn->y),
new Double(2, $spawn->z) new Double(2, $spawn->z)
)), ]),
new String("Level", $this->getDefaultLevel()->getName()), new String("Level", $this->getDefaultLevel()->getName()),
//new String("SpawnLevel", $this->getDefaultLevel()->getName()), //new String("SpawnLevel", $this->getDefaultLevel()->getName()),
//new Int("SpawnX", (int) $spawn->x), //new Int("SpawnX", (int) $spawn->x),
@ -643,22 +643,22 @@ class Server{
new Enum("Inventory", []), new Enum("Inventory", []),
new Compound("Achievements", []), new Compound("Achievements", []),
new Int("playerGameType", $this->getGamemode()), new Int("playerGameType", $this->getGamemode()),
new Enum("Motion", array( new Enum("Motion", [
new Double(0, 0.0), new Double(0, 0.0),
new Double(1, 0.0), new Double(1, 0.0),
new Double(2, 0.0) new Double(2, 0.0)
)), ]),
new Enum("Rotation", array( new Enum("Rotation", [
new Float(0, 0.0), new Float(0, 0.0),
new Float(1, 0.0) new Float(1, 0.0)
)), ]),
new Float("FallDistance", 0.0), new Float("FallDistance", 0.0),
new Short("Fire", 0), new Short("Fire", 0),
new Short("Air", 0), new Short("Air", 0),
new Byte("OnGround", 1), new Byte("OnGround", 1),
new Byte("Invulnerable", 0), new Byte("Invulnerable", 0),
new String("NameTag", $name), new String("NameTag", $name),
)); ]);
$nbt->Pos->setTagType(NBT::TAG_Double); $nbt->Pos->setTagType(NBT::TAG_Double);
$nbt->Inventory->setTagType(NBT::TAG_Compound); $nbt->Inventory->setTagType(NBT::TAG_Compound);
$nbt->Motion->setTagType(NBT::TAG_Double); $nbt->Motion->setTagType(NBT::TAG_Double);
@ -678,35 +678,35 @@ class Server{
$this->logger->notice("Old Player data found for \"" . $name . "\", upgrading profile"); $this->logger->notice("Old Player data found for \"" . $name . "\", upgrading profile");
foreach($data->get("inventory") as $slot => $item){ foreach($data->get("inventory") as $slot => $item){
if(count($item) === 3){ if(count($item) === 3){
$nbt->Inventory[$slot + 9] = new Compound(false, array( $nbt->Inventory[$slot + 9] = new Compound(false, [
new Short("id", $item[0]), new Short("id", $item[0]),
new Short("Damage", $item[1]), new Short("Damage", $item[1]),
new Byte("Count", $item[2]), new Byte("Count", $item[2]),
new Byte("Slot", $slot + 9), new Byte("Slot", $slot + 9),
new Byte("TrueSlot", $slot + 9) new Byte("TrueSlot", $slot + 9)
)); ]);
} }
} }
foreach($data->get("hotbar") as $slot => $itemSlot){ foreach($data->get("hotbar") as $slot => $itemSlot){
if(isset($nbt->Inventory[$itemSlot + 9])){ if(isset($nbt->Inventory[$itemSlot + 9])){
$item = $nbt->Inventory[$itemSlot + 9]; $item = $nbt->Inventory[$itemSlot + 9];
$nbt->Inventory[$slot] = new Compound(false, array( $nbt->Inventory[$slot] = new Compound(false, [
new Short("id", $item["id"]), new Short("id", $item["id"]),
new Short("Damage", $item["Damage"]), new Short("Damage", $item["Damage"]),
new Byte("Count", $item["Count"]), new Byte("Count", $item["Count"]),
new Byte("Slot", $slot), new Byte("Slot", $slot),
new Byte("TrueSlot", $item["TrueSlot"]) new Byte("TrueSlot", $item["TrueSlot"])
)); ]);
} }
} }
foreach($data->get("armor") as $slot => $item){ foreach($data->get("armor") as $slot => $item){
if(count($item) === 2){ if(count($item) === 2){
$nbt->Inventory[$slot + 100] = new Compound(false, array( $nbt->Inventory[$slot + 100] = new Compound(false, [
new Short("id", $item[0]), new Short("id", $item[0]),
new Short("Damage", $item[1]), new Short("Damage", $item[1]),
new Byte("Count", 1), new Byte("Count", 1),
new Byte("Slot", $slot + 100) new Byte("Slot", $slot + 100)
)); ]);
} }
} }
foreach($data->get("achievements") as $achievement => $status){ foreach($data->get("achievements") as $achievement => $status){
@ -788,7 +788,7 @@ class Server{
$matchedPlayers = []; $matchedPlayers = [];
foreach($this->getOnlinePlayers() as $player){ foreach($this->getOnlinePlayers() as $player){
if(strtolower($player->getName()) === $partialName){ if(strtolower($player->getName()) === $partialName){
$matchedPlayers = array($player); $matchedPlayers = [$player];
break; break;
}elseif(stripos($player->getName(), $partialName) !== false){ }elseif(stripos($player->getName(), $partialName) !== false){
$matchedPlayers[] = $player; $matchedPlayers[] = $player;
@ -1142,7 +1142,7 @@ class Server{
* @return string * @return string
*/ */
public function getConfigString($variable, $defaultValue = ""){ public function getConfigString($variable, $defaultValue = ""){
$v = getopt("", array("$variable::")); $v = getopt("", ["$variable::"]);
if(isset($v[$variable])){ if(isset($v[$variable])){
return (string) $v[$variable]; return (string) $v[$variable];
} }
@ -1192,7 +1192,7 @@ class Server{
* @return int * @return int
*/ */
public function getConfigInt($variable, $defaultValue = 0){ public function getConfigInt($variable, $defaultValue = 0){
$v = getopt("", array("$variable::")); $v = getopt("", ["$variable::"]);
if(isset($v[$variable])){ if(isset($v[$variable])){
return (int) $v[$variable]; return (int) $v[$variable];
} }
@ -1215,7 +1215,7 @@ class Server{
* @return boolean * @return boolean
*/ */
public function getConfigBoolean($variable, $defaultValue = false){ public function getConfigBoolean($variable, $defaultValue = false){
$v = getopt("", array("$variable::")); $v = getopt("", ["$variable::"]);
if(isset($v[$variable])){ if(isset($v[$variable])){
$value = $v[$variable]; $value = $v[$variable];
}else{ }else{
@ -1427,7 +1427,7 @@ class Server{
$this->config = new Config($this->dataPath . "pocketmine.yml", Config::YAML, []); $this->config = new Config($this->dataPath . "pocketmine.yml", Config::YAML, []);
$this->logger->info("Loading server properties..."); $this->logger->info("Loading server properties...");
$this->properties = new Config($this->dataPath . "server.properties", Config::PROPERTIES, array( $this->properties = new Config($this->dataPath . "server.properties", Config::PROPERTIES, [
"motd" => "Minecraft: PE Server", "motd" => "Minecraft: PE Server",
"server-port" => 19132, "server-port" => 19132,
"memory-limit" => "256M", "memory-limit" => "256M",
@ -1451,7 +1451,7 @@ class Server{
"enable-rcon" => false, "enable-rcon" => false,
"rcon.password" => substr(base64_encode(Utils::getRandomBytes(20, false)), 3, 10), "rcon.password" => substr(base64_encode(Utils::getRandomBytes(20, false)), 3, 10),
"auto-save" => true, "auto-save" => true,
)); ]);
ServerScheduler::$WORKERS = $this->getProperty("settings.async-workers", ServerScheduler::$WORKERS); ServerScheduler::$WORKERS = $this->getProperty("settings.async-workers", ServerScheduler::$WORKERS);
@ -1464,7 +1464,7 @@ class Server{
$this->maxPlayers = $this->getConfigInt("max-players", 20); $this->maxPlayers = $this->getConfigInt("max-players", 20);
if(($memory = str_replace("B", "", strtoupper($this->getConfigString("memory-limit", "256M")))) !== false){ if(($memory = str_replace("B", "", strtoupper($this->getConfigString("memory-limit", "256M")))) !== false){
$value = array("M" => 1, "G" => 1024); $value = ["M" => 1, "G" => 1024];
$real = ((int) substr($memory, 0, -1)) * $value[substr($memory, -1)]; $real = ((int) substr($memory, 0, -1)) * $value[substr($memory, -1)];
if($real < 128){ if($real < 128){
$this->logger->warning($this->getName() . " may not work right with less than 128MB of RAM", true, true, 0); $this->logger->warning($this->getName() . " may not work right with less than 128MB of RAM", true, true, 0);
@ -1582,7 +1582,7 @@ class Server{
$this->scheduler->scheduleDelayedRepeatingTask(new CallbackTask("pocketmine\\utils\\Cache::cleanup"), $this->getProperty("ticks-per.cache-cleanup", 900), $this->getProperty("ticks-per.cache-cleanup", 900)); $this->scheduler->scheduleDelayedRepeatingTask(new CallbackTask("pocketmine\\utils\\Cache::cleanup"), $this->getProperty("ticks-per.cache-cleanup", 900), $this->getProperty("ticks-per.cache-cleanup", 900));
if($this->getConfigBoolean("auto-save", true) === true and $this->getProperty("ticks-per.autosave", 6000) > 0){ if($this->getConfigBoolean("auto-save", true) === true and $this->getProperty("ticks-per.autosave", 6000) > 0){
$this->scheduler->scheduleDelayedRepeatingTask(new CallbackTask(array($this, "doAutoSave")), $this->getProperty("ticks-per.autosave", 6000), $this->getProperty("ticks-per.autosave", 6000)); $this->scheduler->scheduleDelayedRepeatingTask(new CallbackTask([$this, "doAutoSave"]), $this->getProperty("ticks-per.autosave", 6000), $this->getProperty("ticks-per.autosave", 6000));
} }
if($this->getProperty("chunk-gc.period-in-ticks", 600) > 0){ if($this->getProperty("chunk-gc.period-in-ticks", 600) > 0){
@ -1725,7 +1725,7 @@ class Server{
$this->maxPlayers = $this->getConfigInt("max-players", 20); $this->maxPlayers = $this->getConfigInt("max-players", 20);
if(($memory = str_replace("B", "", strtoupper($this->getConfigString("memory-limit", "256M")))) !== false){ if(($memory = str_replace("B", "", strtoupper($this->getConfigString("memory-limit", "256M")))) !== false){
$value = array("M" => 1, "G" => 1024); $value = ["M" => 1, "G" => 1024];
$real = ((int) substr($memory, 0, -1)) * $value[substr($memory, -1)]; $real = ((int) substr($memory, 0, -1)) * $value[substr($memory, -1)];
if($real < 256){ if($real < 256){
$this->logger->warning($this->getName() . " may not work right with less than 256MB of RAM", true, true, 0); $this->logger->warning($this->getName() . " may not work right with less than 256MB of RAM", true, true, 0);
@ -1809,7 +1809,7 @@ class Server{
if($this->getProperty("settings.send-usage", true) !== false){ if($this->getProperty("settings.send-usage", true) !== false){
$this->scheduler->scheduleDelayedRepeatingTask(new CallbackTask(array($this, "sendUsage")), 6000, 6000); $this->scheduler->scheduleDelayedRepeatingTask(new CallbackTask([$this, "sendUsage"]), 6000, 6000);
$this->sendUsage(); $this->sendUsage();
} }
@ -2014,11 +2014,11 @@ class Server{
$plist = ""; $plist = "";
foreach($this->getPluginManager()->getPlugins() as $p){ foreach($this->getPluginManager()->getPlugins() as $p){
$d = $p->getDescription(); $d = $p->getDescription();
$plist .= str_replace(array(";", ":"), "", $d->getName()) . ":" . str_replace(array(";", ":"), "", $d->getVersion()) . ";"; $plist .= str_replace([";", ":"], "", $d->getName()) . ":" . str_replace([";", ":"], "", $d->getVersion()) . ";";
} }
$version = new VersionString(); $version = new VersionString();
$this->lastSendUsage = new SendUsageTask("http://stats.pocketmine.net/usage.php", array( $this->lastSendUsage = new SendUsageTask("http://stats.pocketmine.net/usage.php", [
"serverid" => Binary::readLong(substr(Utils::getUniqueID(true, $this->getIp() . ":" . $this->getPort()), 0, 8)), "serverid" => Binary::readLong(substr(Utils::getUniqueID(true, $this->getIp() . ":" . $this->getPort()), 0, 8)),
"port" => $this->getPort(), "port" => $this->getPort(),
"os" => Utils::getOS(), "os" => Utils::getOS(),
@ -2032,7 +2032,7 @@ class Server{
"online" => count($this->players), "online" => count($this->players),
"max" => $this->getMaxPlayers(), "max" => $this->getMaxPlayers(),
"plugins" => $plist, "plugins" => $plist,
)); ]);
$this->scheduler->scheduleAsyncTask($this->lastSendUsage); $this->scheduler->scheduleAsyncTask($this->lastSendUsage);
} }

View File

@ -29,8 +29,8 @@ class AcaciaWoodStairs extends Stair{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array($this->id, 0, 1), [$this->id, 0, 1],
); ];
} }
} }

View File

@ -86,12 +86,12 @@ class Bed extends Transparent{
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
$down = $this->getSide(0); $down = $this->getSide(0);
if($down->isTransparent === false){ if($down->isTransparent === false){
$faces = array( $faces = [
0 => 3, 0 => 3,
1 => 4, 1 => 4,
2 => 2, 2 => 2,
3 => 5, 3 => 5,
); ];
$d = $player instanceof Player ? $player->getDirection() : 0; $d = $player instanceof Player ? $player->getDirection() : 0;
$next = $this->getSide($faces[(($d + 3) % 4)]); $next = $this->getSide($faces[(($d + 3) % 4)]);
$downNext = $this->getSide(0); $downNext = $this->getSide(0);
@ -140,9 +140,9 @@ class Bed extends Transparent{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array(Item::BED, 0, 1), [Item::BED, 0, 1],
); ];
} }
} }

View File

@ -86,10 +86,10 @@ class Beetroot extends Flowable{
public function getDrops(Item $item){ public function getDrops(Item $item){
$drops = []; $drops = [];
if($this->meta >= 0x07){ if($this->meta >= 0x07){
$drops[] = array(Item::BEETROOT, 0, 1); $drops[] = [Item::BEETROOT, 0, 1];
$drops[] = array(Item::BEETROOT_SEEDS, 0, mt_rand(0, 3)); $drops[] = [Item::BEETROOT_SEEDS, 0, mt_rand(0, 3)];
}else{ }else{
$drops[] = array(Item::BEETROOT_SEEDS, 0, 1); $drops[] = [Item::BEETROOT_SEEDS, 0, 1];
} }
return $drops; return $drops;

View File

@ -29,8 +29,8 @@ class BirchWoodStairs extends Stair{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array($this->id, 0, 1), [$this->id, 0, 1],
); ];
} }
} }

View File

@ -230,7 +230,7 @@ abstract class Block extends Position implements Metadatable{
const GLOWING_OBSIDIAN = 246; const GLOWING_OBSIDIAN = 246;
const NETHER_REACTOR = 247; const NETHER_REACTOR = 247;
public static $creative = array( public static $creative = [
//Building //Building
[Item::COBBLESTONE, 0], [Item::COBBLESTONE, 0],
[Item::STONE_BRICKS, 0], [Item::STONE_BRICKS, 0],
@ -500,7 +500,7 @@ abstract class Block extends Position implements Metadatable{
[Item::DYE, 9], [Item::DYE, 9],
[Item::DYE, 8], [Item::DYE, 8],
); ];
/** @var Block[] */ /** @var Block[] */
public static $list = []; public static $list = [];
@ -526,7 +526,7 @@ abstract class Block extends Position implements Metadatable{
public static function init(){ public static function init(){
if(count(self::$list) === 0){ if(count(self::$list) === 0){
self::$list = array( self::$list = [
self::AIR => Air::class, self::AIR => Air::class,
self::STONE => Stone::class, self::STONE => Stone::class,
self::GRASS => Grass::class, self::GRASS => Grass::class,
@ -663,7 +663,7 @@ abstract class Block extends Position implements Metadatable{
self::STONECUTTER => Stonecutter::class, self::STONECUTTER => Stonecutter::class,
self::GLOWING_OBSIDIAN => GlowingObsidian::class, self::GLOWING_OBSIDIAN => GlowingObsidian::class,
self::NETHER_REACTOR => NetherReactor::class, self::NETHER_REACTOR => NetherReactor::class,
); ];
} }
} }
@ -759,7 +759,7 @@ abstract class Block extends Position implements Metadatable{
return []; return [];
}else{ }else{
return [ return [
array($this->id, $this->meta, 1), [$this->id, $this->meta, 1],
]; ];
} }
} }

View File

@ -48,9 +48,9 @@ class Bricks extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 1){ if($item->isPickaxe() >= 1){
return array( return [
array(Item::BRICKS_BLOCK, 0, 1), [Item::BRICKS_BLOCK, 0, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -39,21 +39,21 @@ class BurningFurnace extends Solid{
} }
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
$faces = array( $faces = [
0 => 4, 0 => 4,
1 => 2, 1 => 2,
2 => 5, 2 => 5,
3 => 3, 3 => 3,
); ];
$this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0]; $this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0];
$this->getLevel()->setBlock($block, $this, true, false, true); $this->getLevel()->setBlock($block, $this, true, false, true);
$nbt = new Compound(false, array( $nbt = new Compound(false, [
new Enum("Items", []), new Enum("Items", []),
new String("id", Tile::FURNACE), new String("id", Tile::FURNACE),
new Int("x", $this->x), new Int("x", $this->x),
new Int("y", $this->y), new Int("y", $this->y),
new Int("z", $this->z) new Int("z", $this->z)
)); ]);
$nbt->Items->setTagType(NBT::TAG_Compound); $nbt->Items->setTagType(NBT::TAG_Compound);
new Furnace($this->getLevel()->getChunkAt($this->x >> 4, $this->z >> 4), $nbt); new Furnace($this->getLevel()->getChunkAt($this->x >> 4, $this->z >> 4), $nbt);
@ -73,13 +73,13 @@ class BurningFurnace extends Solid{
if($t instanceof Furnace){ if($t instanceof Furnace){
$furnace = $t; $furnace = $t;
}else{ }else{
$nbt = new Compound(false, array( $nbt = new Compound(false, [
new Enum("Items", []), new Enum("Items", []),
new String("id", Tile::FURNACE), new String("id", Tile::FURNACE),
new Int("x", $this->x), new Int("x", $this->x),
new Int("y", $this->y), new Int("y", $this->y),
new Int("z", $this->z) new Int("z", $this->z)
)); ]);
$nbt->Items->setTagType(NBT::TAG_Compound); $nbt->Items->setTagType(NBT::TAG_Compound);
$furnace = new Furnace($this->getLevel()->getChunkAt($this->x >> 4, $this->z >> 4), $nbt); $furnace = new Furnace($this->getLevel()->getChunkAt($this->x >> 4, $this->z >> 4), $nbt);
} }
@ -114,14 +114,14 @@ class BurningFurnace extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
$drops = []; $drops = [];
if($item->isPickaxe() >= 1){ if($item->isPickaxe() >= 1){
$drops[] = array(Item::FURNACE, 0, 1); $drops[] = [Item::FURNACE, 0, 1];
} }
$t = $this->getLevel()->getTile($this); $t = $this->getLevel()->getTile($this);
if($t instanceof Furnace){ if($t instanceof Furnace){
for($s = 0; $s < $t->getInventory()->getSize(); ++$s){ for($s = 0; $s < $t->getInventory()->getSize(); ++$s){
$slot = $t->getInventory()->getItem($s); $slot = $t->getInventory()->getItem($s);
if($slot->getID() > Item::AIR and $slot->getCount() > 0){ if($slot->getID() > Item::AIR and $slot->getCount() > 0){
$drops[] = array($slot->getID(), $slot->getDamage(), $slot->getCount()); $drops[] = [$slot->getID(), $slot->getDamage(), $slot->getCount()];
} }
} }
} }

View File

@ -84,8 +84,8 @@ class Cactus extends Transparent{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array($this->id, 0, 1), [$this->id, 0, 1],
); ];
} }
} }

View File

@ -28,7 +28,7 @@ use pocketmine\Player;
class Carpet extends Flowable{ class Carpet extends Flowable{
public function __construct($meta = 0){ public function __construct($meta = 0){
parent::__construct(self::CARPET, $meta, "Carpet"); parent::__construct(self::CARPET, $meta, "Carpet");
$names = array( $names = [
0 => "White Carpet", 0 => "White Carpet",
1 => "Orange Carpet", 1 => "Orange Carpet",
2 => "Magenta Carpet", 2 => "Magenta Carpet",
@ -45,7 +45,7 @@ class Carpet extends Flowable{
13 => "Green Carpet", 13 => "Green Carpet",
14 => "Red Carpet", 14 => "Red Carpet",
15 => "Black Carpet", 15 => "Black Carpet",
); ];
$this->name = $names[$this->meta]; $this->name = $names[$this->meta];
$this->hardness = 0; $this->hardness = 0;
$this->isFullBlock = false; $this->isFullBlock = false;

View File

@ -88,9 +88,9 @@ class Carrot extends Flowable{
public function getDrops(Item $item){ public function getDrops(Item $item){
$drops = []; $drops = [];
if($this->meta >= 0x07){ if($this->meta >= 0x07){
$drops[] = array(Item::CARROT, 0, mt_rand(1, 4)); $drops[] = [Item::CARROT, 0, mt_rand(1, 4)];
}else{ }else{
$drops[] = array(Item::CARROT, 0, 1); $drops[] = [Item::CARROT, 0, 1];
} }
return $drops; return $drops;

View File

@ -42,12 +42,12 @@ class Chest extends Transparent{
} }
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
$faces = array( $faces = [
0 => 4, 0 => 4,
1 => 2, 1 => 2,
2 => 5, 2 => 5,
3 => 3, 3 => 3,
); ];
$chest = false; $chest = false;
$this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0]; $this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0];
@ -69,13 +69,13 @@ class Chest extends Transparent{
} }
$this->getLevel()->setBlock($block, $this, true, false, true); $this->getLevel()->setBlock($block, $this, true, false, true);
$nbt = new Compound(false, array( $nbt = new Compound(false, [
new Enum("Items", []), new Enum("Items", []),
new String("id", Tile::CHEST), new String("id", Tile::CHEST),
new Int("x", $this->x), new Int("x", $this->x),
new Int("y", $this->y), new Int("y", $this->y),
new Int("z", $this->z) new Int("z", $this->z)
)); ]);
$nbt->Items->setTagType(NBT::TAG_Compound); $nbt->Items->setTagType(NBT::TAG_Compound);
$tile = new TileChest($this->getLevel()->getChunkAt($this->x >> 4, $this->z >> 4), $nbt); $tile = new TileChest($this->getLevel()->getChunkAt($this->x >> 4, $this->z >> 4), $nbt);
@ -109,13 +109,13 @@ class Chest extends Transparent{
if($t instanceof TileChest){ if($t instanceof TileChest){
$chest = $t; $chest = $t;
}else{ }else{
$nbt = new Compound(false, array( $nbt = new Compound(false, [
new Enum("Items", []), new Enum("Items", []),
new String("id", Tile::CHEST), new String("id", Tile::CHEST),
new Int("x", $this->x), new Int("x", $this->x),
new Int("y", $this->y), new Int("y", $this->y),
new Int("z", $this->z) new Int("z", $this->z)
)); ]);
$nbt->Items->setTagType(NBT::TAG_Compound); $nbt->Items->setTagType(NBT::TAG_Compound);
$chest = new TileChest($this->getLevel()->getChunkAt($this->x >> 4, $this->z >> 4), $nbt); $chest = new TileChest($this->getLevel()->getChunkAt($this->x >> 4, $this->z >> 4), $nbt);
} }
@ -131,15 +131,15 @@ class Chest extends Transparent{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
$drops = array( $drops = [
array($this->id, 0, 1), [$this->id, 0, 1],
); ];
$t = $this->getLevel()->getTile($this); $t = $this->getLevel()->getTile($this);
if($t instanceof TileChest){ if($t instanceof TileChest){
for($s = 0; $s < $t->getRealInventory()->getSize(); ++$s){ for($s = 0; $s < $t->getRealInventory()->getSize(); ++$s){
$slot = $t->getRealInventory()->getItem($s); $slot = $t->getRealInventory()->getItem($s);
if($slot->getID() > Item::AIR and $slot->getCount() > 0){ if($slot->getID() > Item::AIR and $slot->getCount() > 0){
$drops[] = array($slot->getID(), $slot->getDamage(), $slot->getCount()); $drops[] = [$slot->getID(), $slot->getDamage(), $slot->getCount()];
} }
} }
} }

View File

@ -30,8 +30,8 @@ class Clay extends Solid{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array(Item::CLAY, 0, 4), [Item::CLAY, 0, 4],
); ];
} }
} }

View File

@ -48,9 +48,9 @@ class Coal extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 1){ if($item->isPickaxe() >= 1){
return array( return [
array(Item::COAL_BLOCK, 0, 1), [Item::COAL_BLOCK, 0, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -48,9 +48,9 @@ class CoalOre extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 1){ if($item->isPickaxe() >= 1){
return array( return [
array(Item::COAL, 0, 1), [Item::COAL, 0, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -48,9 +48,9 @@ class Cobblestone extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 1){ if($item->isPickaxe() >= 1){
return array( return [
array(Item::COBBLESTONE, 0, 1), [Item::COBBLESTONE, 0, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -29,8 +29,8 @@ class DarkOakWoodStairs extends Stair{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array($this->id, 0, 1), [$this->id, 0, 1],
); ];
} }
} }

View File

@ -42,9 +42,9 @@ class Diamond extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 4){ if($item->isPickaxe() >= 4){
return array( return [
array(Item::DIAMOND_BLOCK, 0, 1), [Item::DIAMOND_BLOCK, 0, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -42,9 +42,9 @@ class DiamondOre extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 4){ if($item->isPickaxe() >= 4){
return array( return [
array(Item::DIAMOND, 0, 1), [Item::DIAMOND, 0, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -57,12 +57,12 @@ abstract class Door extends Transparent{
return false; return false;
} }
$direction = $player instanceof Player ? $player->getDirection() : 0; $direction = $player instanceof Player ? $player->getDirection() : 0;
$face = array( $face = [
0 => 3, 0 => 3,
1 => 4, 1 => 4,
2 => 2, 2 => 2,
3 => 5, 3 => 5,
); ];
$next = $this->getSide($face[(($direction + 2) % 4)]); $next = $this->getSide($face[(($direction + 2) % 4)]);
$next2 = $this->getSide($face[$direction]); $next2 = $this->getSide($face[$direction]);
$metaUp = 0x08; $metaUp = 0x08;

View File

@ -26,7 +26,7 @@ use pocketmine\item\Item;
class DoubleSlab extends Solid{ class DoubleSlab extends Solid{
public function __construct($meta = 0){ public function __construct($meta = 0){
parent::__construct(self::DOUBLE_SLAB, $meta, "Double Slab"); parent::__construct(self::DOUBLE_SLAB, $meta, "Double Slab");
$names = array( $names = [
0 => "Stone", 0 => "Stone",
1 => "Sandstone", 1 => "Sandstone",
2 => "Wooden", 2 => "Wooden",
@ -34,7 +34,7 @@ class DoubleSlab extends Solid{
4 => "Brick", 4 => "Brick",
5 => "Stone Brick", 5 => "Stone Brick",
6 => "Quartz", 6 => "Quartz",
); ];
$this->name = "Double " . $names[$this->meta & 0x07] . " Slab"; $this->name = "Double " . $names[$this->meta & 0x07] . " Slab";
$this->hardness = 30; $this->hardness = 30;
} }
@ -58,9 +58,9 @@ class DoubleSlab extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 1){ if($item->isPickaxe() >= 1){
return array( return [
array(Item::SLAB, $this->meta & 0x07, 2), [Item::SLAB, $this->meta & 0x07, 2],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -26,14 +26,14 @@ use pocketmine\item\Item;
class DoubleWoodSlab extends Solid{ class DoubleWoodSlab extends Solid{
public function __construct($meta = 0){ public function __construct($meta = 0){
parent::__construct(self::DOUBLE_WOOD_SLAB, $meta, "Double Wooden Slab"); parent::__construct(self::DOUBLE_WOOD_SLAB, $meta, "Double Wooden Slab");
$names = array( $names = [
0 => "Oak", 0 => "Oak",
1 => "Spruce", 1 => "Spruce",
2 => "Birch", 2 => "Birch",
3 => "Jungle", 3 => "Jungle",
4 => "Acacia", 4 => "Acacia",
5 => "Dark Oak", 5 => "Dark Oak",
); ];
$this->name = "Double " . $names[$this->meta & 0x07] . " Wooden Slab"; $this->name = "Double " . $names[$this->meta & 0x07] . " Wooden Slab";
$this->hardness = 15; $this->hardness = 15;
} }
@ -56,9 +56,9 @@ class DoubleWoodSlab extends Solid{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array(Item::WOOD_SLAB, $this->meta & 0x07, 2), [Item::WOOD_SLAB, $this->meta & 0x07, 2],
); ];
} }
} }

View File

@ -42,9 +42,9 @@ class Emerald extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 4){ if($item->isPickaxe() >= 4){
return array( return [
array(Item::EMERALD_BLOCK, 0, 1), [Item::EMERALD_BLOCK, 0, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -42,9 +42,9 @@ class EmeraldOre extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 4){ if($item->isPickaxe() >= 4){
return array( return [
array(Item::EMERALD, 0, 1), [Item::EMERALD, 0, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -30,8 +30,8 @@ class Farmland extends Solid{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array(Item::DIRT, 0, 1), [Item::DIRT, 0, 1],
); ];
} }
} }

View File

@ -37,12 +37,12 @@ class FenceGate extends Transparent{
} }
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
$faces = array( $faces = [
0 => 3, 0 => 3,
1 => 0, 1 => 0,
2 => 1, 2 => 1,
3 => 2, 3 => 2,
); ];
$this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0] & 0x03; $this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0] & 0x03;
$this->getLevel()->setBlock($block, $this, true, false, true); $this->getLevel()->setBlock($block, $this, true, false, true);
@ -50,18 +50,18 @@ class FenceGate extends Transparent{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array($this->id, 0, 1), [$this->id, 0, 1],
); ];
} }
public function onActivate(Item $item, Player $player = null){ public function onActivate(Item $item, Player $player = null){
$faces = array( $faces = [
0 => 3, 0 => 3,
1 => 0, 1 => 0,
2 => 1, 2 => 1,
3 => 2, 3 => 2,
); ];
$this->meta = ($faces[$player instanceof Player ? $player->getDirection() : 0] & 0x03) | ((~$this->meta) & 0x04); $this->meta = ($faces[$player instanceof Player ? $player->getDirection() : 0] & 0x03) | ((~$this->meta) & 0x04);
if(($this->meta & 0x04) === 0x04){ if(($this->meta & 0x04) === 0x04){
$this->isFullBlock = true; $this->isFullBlock = true;

View File

@ -43,12 +43,12 @@ class Generic extends Block{
if($this->hasPhysics === true and $type === Level::BLOCK_UPDATE_NORMAL){ if($this->hasPhysics === true and $type === Level::BLOCK_UPDATE_NORMAL){
$down = $this->getSide(0); $down = $this->getSide(0);
if($down->getID() === self::AIR or ($down instanceof Liquid)){ if($down->getID() === self::AIR or ($down instanceof Liquid)){
$data = array( $data = [
"x" => $this->x + 0.5, "x" => $this->x + 0.5,
"y" => $this->y + 0.5, "y" => $this->y + 0.5,
"z" => $this->z + 0.5, "z" => $this->z + 0.5,
"Tile" => $this->id, "Tile" => $this->id,
); ];
/*$this->getLevel()->setBlock($this, new Air(), false, false, true); /*$this->getLevel()->setBlock($this, new Air(), false, false, true);
//TODO //TODO
//$e = $server->api->entity->add($this->getLevel(), ENTITY_FALLING, FALLING_SAND, $data); //$e = $server->api->entity->add($this->getLevel(), ENTITY_FALLING, FALLING_SAND, $data);

View File

@ -54,9 +54,9 @@ class GlowingRedstoneOre extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 4){ if($item->isPickaxe() >= 4){
return array( return [
array(Item::REDSTONE_DUST, 0, mt_rand(4, 5)), [Item::REDSTONE_DUST, 0, mt_rand(4, 5)],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -30,8 +30,8 @@ class Glowstone extends Transparent{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array(Item::GLOWSTONE_DUST, 0, mt_rand(2, 4)), [Item::GLOWSTONE_DUST, 0, mt_rand(2, 4)],
); ];
} }
} }

View File

@ -42,9 +42,9 @@ class Gold extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 4){ if($item->isPickaxe() >= 4){
return array( return [
array(Item::GOLD_BLOCK, 0, 1), [Item::GOLD_BLOCK, 0, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -42,9 +42,9 @@ class GoldOre extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 4){ if($item->isPickaxe() >= 4){
return array( return [
array(Item::GOLD_ORE, 0, 1), [Item::GOLD_ORE, 0, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -31,14 +31,14 @@ class Gravel extends Fallable{
public function getDrops(Item $item){ public function getDrops(Item $item){
if(mt_rand(1, 10) === 1){ if(mt_rand(1, 10) === 1){
return array( return [
array(Item::FLINT, 0, 1), [Item::FLINT, 0, 1],
); ];
} }
return array( return [
array(Item::GRAVEL, 0, 1), [Item::GRAVEL, 0, 1],
); ];
} }
} }

View File

@ -31,14 +31,14 @@ class HayBale extends Solid{
} }
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
$faces = array( $faces = [
0 => 0, 0 => 0,
1 => 0, 1 => 0,
2 => 0b1000, 2 => 0b1000,
3 => 0b1000, 3 => 0b1000,
4 => 0b0100, 4 => 0b0100,
5 => 0b0100, 5 => 0b0100,
); ];
$this->meta = ($this->meta & 0x03) | $faces[$face]; $this->meta = ($this->meta & 0x03) | $faces[$face];
$this->getLevel()->setBlock($block, $this, true, false, true); $this->getLevel()->setBlock($block, $this, true, false, true);
@ -47,9 +47,9 @@ class HayBale extends Solid{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array($this->id, 0, 1), [$this->id, 0, 1],
); ];
} }
} }

View File

@ -44,9 +44,9 @@ class Iron extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 3){ if($item->isPickaxe() >= 3){
return array( return [
array(Item::IRON_BLOCK, 0, 1), [Item::IRON_BLOCK, 0, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -49,9 +49,9 @@ class IronDoor extends Door{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 1){ if($item->isPickaxe() >= 1){
return array( return [
array(Item::IRON_DOOR, 0, 1), [Item::IRON_DOOR, 0, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -44,9 +44,9 @@ class IronOre extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 3){ if($item->isPickaxe() >= 3){
return array( return [
array(Item::IRON_ORE, 0, 1), [Item::IRON_ORE, 0, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -29,8 +29,8 @@ class JungleWoodStairs extends Stair{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array($this->id, 0, 1), [$this->id, 0, 1],
); ];
} }
} }

View File

@ -40,12 +40,12 @@ class Ladder extends Transparent{
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
if($target->isTransparent === false){ if($target->isTransparent === false){
$faces = array( $faces = [
2 => 2, 2 => 2,
3 => 3, 3 => 3,
4 => 4, 4 => 4,
5 => 5, 5 => 5,
); ];
if(isset($faces[$face])){ if(isset($faces[$face])){
$this->meta = $faces[$face]; $this->meta = $faces[$face];
$this->getLevel()->setBlock($block, $this, true, false, true); $this->getLevel()->setBlock($block, $this, true, false, true);
@ -70,8 +70,8 @@ class Ladder extends Transparent{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array($this->id, 0, 1), [$this->id, 0, 1],
); ];
} }
} }

View File

@ -44,9 +44,9 @@ class Lapis extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 3){ if($item->isPickaxe() >= 3){
return array( return [
array(Item::LAPIS_BLOCK, 0, 1), [Item::LAPIS_BLOCK, 0, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -45,9 +45,9 @@ class LapisOre extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 3){ if($item->isPickaxe() >= 3){
return array( return [
array(Item::DYE, 4, mt_rand(4, 8)), [Item::DYE, 4, mt_rand(4, 8)],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -35,12 +35,12 @@ class Leaves extends Transparent{
public function __construct($meta = 0){ public function __construct($meta = 0){
parent::__construct(self::LEAVES, $meta, "Leaves"); parent::__construct(self::LEAVES, $meta, "Leaves");
$names = array( $names = [
self::OAK => "Oak Leaves", self::OAK => "Oak Leaves",
self::SPRUCE => "Spruce Leaves", self::SPRUCE => "Spruce Leaves",
self::BIRCH => "Birch Leaves", self::BIRCH => "Birch Leaves",
self::JUNGLE => "Jungle Leaves", self::JUNGLE => "Jungle Leaves",
); ];
$this->name = $names[$this->meta & 0x03]; $this->name = $names[$this->meta & 0x03];
$this->hardness = 1; $this->hardness = 1;
} }
@ -148,13 +148,13 @@ class Leaves extends Transparent{
public function getDrops(Item $item){ public function getDrops(Item $item){
$drops = []; $drops = [];
if($item->isShears()){ if($item->isShears()){
$drops[] = array(Item::LEAVES, $this->meta & 0x03, 1); $drops[] = [Item::LEAVES, $this->meta & 0x03, 1];
}else{ }else{
if(mt_rand(1, 20) === 1){ //Saplings if(mt_rand(1, 20) === 1){ //Saplings
$drops[] = array(Item::SAPLING, $this->meta & 0x03, 1); $drops[] = [Item::SAPLING, $this->meta & 0x03, 1];
} }
if(($this->meta & 0x03) === self::OAK and mt_rand(1, 200) === 1){ //Apples if(($this->meta & 0x03) === self::OAK and mt_rand(1, 200) === 1){ //Apples
$drops[] = array(Item::APPLE, 0, 1); $drops[] = [Item::APPLE, 0, 1];
} }
} }

View File

@ -29,10 +29,10 @@ class Leaves2 extends Leaves{
public function __construct($meta = 0){ public function __construct($meta = 0){
Transparent::__construct(self::LEAVES, $meta, "Leaves"); Transparent::__construct(self::LEAVES, $meta, "Leaves");
$names = array( $names = [
self::ACACIA => "Acacia Leaves", self::ACACIA => "Acacia Leaves",
self::DARK_OAK => "Dark Oak Leaves", self::DARK_OAK => "Dark Oak Leaves",
); ];
$this->name = $names[$this->meta & 0x03]; $this->name = $names[$this->meta & 0x03];
$this->hardness = 1; $this->hardness = 1;
} }
@ -137,10 +137,10 @@ class Leaves2 extends Leaves{
public function getDrops(Item $item){ public function getDrops(Item $item){
$drops = []; $drops = [];
if($item->isShears()){ if($item->isShears()){
$drops[] = array(Item::LEAVES2, $this->meta & 0x03, 1); $drops[] = [Item::LEAVES2, $this->meta & 0x03, 1];
}else{ }else{
if(mt_rand(1, 20) === 1){ //Saplings if(mt_rand(1, 20) === 1){ //Saplings
$drops[] = array(Item::SAPLING, $this->meta & 0x03, 1); $drops[] = [Item::SAPLING, $this->meta & 0x03, 1];
} }
} }

View File

@ -30,8 +30,8 @@ class Melon extends Transparent{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array(Item::MELON_SLICE, 0, mt_rand(3, 7)), [Item::MELON_SLICE, 0, mt_rand(3, 7)],
); ];
} }
} }

View File

@ -99,8 +99,8 @@ class MelonStem extends Flowable{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array(Item::MELON_SEEDS, 0, mt_rand(0, 2)), [Item::MELON_SEEDS, 0, mt_rand(0, 2)],
); ];
} }
} }

View File

@ -49,9 +49,9 @@ class MossStone extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 1){ if($item->isPickaxe() >= 1){
return array( return [
array(Item::MOSS_STONE, $this->meta, 1), [Item::MOSS_STONE, $this->meta, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -49,9 +49,9 @@ class NetherBrick extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 1){ if($item->isPickaxe() >= 1){
return array( return [
array(Item::NETHER_BRICKS, 0, 1), [Item::NETHER_BRICKS, 0, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -49,9 +49,9 @@ class Netherrack extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 1){ if($item->isPickaxe() >= 1){
return array( return [
array(Item::NETHERRACK, 0, 1), [Item::NETHERRACK, 0, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -40,9 +40,9 @@ class Obsidian extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 5){ if($item->isPickaxe() >= 5){
return array( return [
array(Item::OBSIDIAN, 0, 1), [Item::OBSIDIAN, 0, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -32,14 +32,14 @@ class Planks extends Solid{
public function __construct($meta = 0){ public function __construct($meta = 0){
parent::__construct(self::PLANKS, $meta, "Wood Planks"); parent::__construct(self::PLANKS, $meta, "Wood Planks");
$names = array( $names = [
self::OAK => "Oak Wood Planks", self::OAK => "Oak Wood Planks",
self::SPRUCE => "Spruce Wood Planks", self::SPRUCE => "Spruce Wood Planks",
self::BIRCH => "Birch Wood Planks", self::BIRCH => "Birch Wood Planks",
self::JUNGLE => "Jungle Wood Planks", self::JUNGLE => "Jungle Wood Planks",
self::ACACIA => "Acacia Wood Planks", self::ACACIA => "Acacia Wood Planks",
self::DARK_OAK => "Jungle Wood Planks", self::DARK_OAK => "Jungle Wood Planks",
); ];
$this->name = $names[$this->meta & 0x07]; $this->name = $names[$this->meta & 0x07];
$this->hardness = 15; $this->hardness = 15;
} }

View File

@ -89,9 +89,9 @@ class Potato extends Flowable{
public function getDrops(Item $item){ public function getDrops(Item $item){
$drops = []; $drops = [];
if($this->meta >= 0x07){ if($this->meta >= 0x07){
$drops[] = array(Item::POTATO, 0, mt_rand(1, 4)); $drops[] = [Item::POTATO, 0, mt_rand(1, 4)];
}else{ }else{
$drops[] = array(Item::POTATO, 0, 1); $drops[] = [Item::POTATO, 0, 1];
} }
return $drops; return $drops;

View File

@ -100,8 +100,8 @@ class PumpkinStem extends Flowable{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array(Item::PUMPKIN_SEEDS, 0, mt_rand(0, 2)), [Item::PUMPKIN_SEEDS, 0, mt_rand(0, 2)],
); ];
} }
} }

View File

@ -26,12 +26,12 @@ use pocketmine\item\Item;
class Quartz extends Solid{ class Quartz extends Solid{
public function __construct($meta = 0){ public function __construct($meta = 0){
parent::__construct(self::QUARTZ_BLOCK, $meta, "Quartz Block"); parent::__construct(self::QUARTZ_BLOCK, $meta, "Quartz Block");
$names = array( $names = [
0 => "Quartz Block", 0 => "Quartz Block",
1 => "Chiseled Quartz Block", 1 => "Chiseled Quartz Block",
2 => "Quartz Pillar", 2 => "Quartz Pillar",
3 => "Quartz Pillar", 3 => "Quartz Pillar",
); ];
$this->name = $names[$this->meta & 0x03]; $this->name = $names[$this->meta & 0x03];
} }
@ -55,9 +55,9 @@ class Quartz extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 1){ if($item->isPickaxe() >= 1){
return array( return [
array(Item::QUARTZ_BLOCK, $this->meta & 0x03, 1), [Item::QUARTZ_BLOCK, $this->meta & 0x03, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -42,9 +42,9 @@ class RedstoneOre extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 2){ if($item->isPickaxe() >= 2){
return array( return [
array(Item::REDSTONE_DUST, 0, mt_rand(4, 5)), [Item::REDSTONE_DUST, 0, mt_rand(4, 5)],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -26,11 +26,11 @@ use pocketmine\item\Item;
class Sandstone extends Solid{ class Sandstone extends Solid{
public function __construct($meta = 0){ public function __construct($meta = 0){
parent::__construct(self::SANDSTONE, $meta, "Sandstone"); parent::__construct(self::SANDSTONE, $meta, "Sandstone");
$names = array( $names = [
0 => "Sandstone", 0 => "Sandstone",
1 => "Chiseled Sandstone", 1 => "Chiseled Sandstone",
2 => "Smooth Sandstone", 2 => "Smooth Sandstone",
); ];
$this->name = $names[$this->meta & 0x03]; $this->name = $names[$this->meta & 0x03];
$this->hardness = 4; $this->hardness = 4;
} }
@ -55,9 +55,9 @@ class Sandstone extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 1){ if($item->isPickaxe() >= 1){
return array( return [
array(Item::SANDSTONE, $this->meta & 0x03, 1), [Item::SANDSTONE, $this->meta & 0x03, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -37,14 +37,14 @@ class Sapling extends Flowable{
public function __construct($meta = Sapling::OAK){ public function __construct($meta = Sapling::OAK){
parent::__construct(self::SAPLING, $meta, "Sapling"); parent::__construct(self::SAPLING, $meta, "Sapling");
$this->isActivable = true; $this->isActivable = true;
$names = array( $names = [
0 => "Oak Sapling", 0 => "Oak Sapling",
1 => "Spruce Sapling", 1 => "Spruce Sapling",
2 => "Birch Sapling", 2 => "Birch Sapling",
3 => "Jungle Sapling", 3 => "Jungle Sapling",
4 => "Acacia Sapling", 4 => "Acacia Sapling",
5 => "Dark Oak Sapling", 5 => "Dark Oak Sapling",
); ];
$this->name = $names[$this->meta & 0x07]; $this->name = $names[$this->meta & 0x07];
$this->hardness = 0; $this->hardness = 0;
} }
@ -107,8 +107,8 @@ class Sapling extends Flowable{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array($this->id, $this->meta & 0x07, 1), [$this->id, $this->meta & 0x07, 1],
); ];
} }
} }

View File

@ -40,12 +40,12 @@ class SignPost extends Transparent{
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
if($face !== 0){ if($face !== 0){
$faces = array( $faces = [
2 => 2, 2 => 2,
3 => 3, 3 => 3,
4 => 4, 4 => 4,
5 => 5, 5 => 5,
); ];
if(!isset($faces[$face])){ if(!isset($faces[$face])){
$this->meta = floor((($player->yaw + 180) * 16 / 360) + 0.5) & 0x0F; $this->meta = floor((($player->yaw + 180) * 16 / 360) + 0.5) & 0x0F;
$this->getLevel()->setBlock($block, Block::get(Item::SIGN_POST, $this->meta), true, false, true); $this->getLevel()->setBlock($block, Block::get(Item::SIGN_POST, $this->meta), true, false, true);
@ -83,8 +83,8 @@ class SignPost extends Transparent{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array(Item::SIGN, 0, 1), [Item::SIGN, 0, 1],
); ];
} }
} }

View File

@ -27,7 +27,7 @@ use pocketmine\Player;
class Slab extends Transparent{ class Slab extends Transparent{
public function __construct($meta = 0){ public function __construct($meta = 0){
parent::__construct(self::SLAB, $meta, "Slab"); parent::__construct(self::SLAB, $meta, "Slab");
$names = array( $names = [
0 => "Stone", 0 => "Stone",
1 => "Sandstone", 1 => "Sandstone",
2 => "Wooden", 2 => "Wooden",
@ -36,7 +36,7 @@ class Slab extends Transparent{
5 => "Stone Brick", 5 => "Stone Brick",
6 => "Quartz", 6 => "Quartz",
7 => "", 7 => "",
); ];
$this->name = (($this->meta & 0x08) === 0x08 ? "Upper " : "") . $names[$this->meta & 0x07] . " Slab"; $this->name = (($this->meta & 0x08) === 0x08 ? "Upper " : "") . $names[$this->meta & 0x07] . " Slab";
if(($this->meta & 0x08) === 0x08){ if(($this->meta & 0x08) === 0x08){
$this->isFullBlock = true; $this->isFullBlock = true;
@ -116,9 +116,9 @@ class Slab extends Transparent{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 1){ if($item->isPickaxe() >= 1){
return array( return [
array($this->id, $this->meta & 0x07, 1), [$this->id, $this->meta & 0x07, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -64,9 +64,9 @@ class SnowLayer extends Flowable{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isShovel() !== false){ if($item->isShovel() !== false){
return array( return [
array(Item::SNOWBALL, 0, 1), [Item::SNOWBALL, 0, 1],
); ];
} }
return []; return [];

View File

@ -29,8 +29,8 @@ class SpruceWoodStairs extends Stair{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array($this->id, 0, 1), [$this->id, 0, 1],
); ];
} }
} }

View File

@ -26,7 +26,7 @@ use pocketmine\item\Item;
class StainedClay extends Solid{ class StainedClay extends Solid{
public function __construct($meta = 0){ public function __construct($meta = 0){
parent::__construct(self::STAINED_CLAY, $meta, "Stained Clay"); parent::__construct(self::STAINED_CLAY, $meta, "Stained Clay");
$names = array( $names = [
0 => "White Stained Clay", 0 => "White Stained Clay",
1 => "Orange Stained Clay", 1 => "Orange Stained Clay",
2 => "Magenta Stained Clay", 2 => "Magenta Stained Clay",
@ -43,7 +43,7 @@ class StainedClay extends Solid{
13 => "Green Stained Clay", 13 => "Green Stained Clay",
14 => "Red Stained Clay", 14 => "Red Stained Clay",
15 => "Black Stained Clay", 15 => "Black Stained Clay",
); ];
$this->name = $names[$this->meta]; $this->name = $names[$this->meta];
$this->hardness = 30; $this->hardness = 30;
} }

View File

@ -37,12 +37,12 @@ class Stair extends Transparent{
} }
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
$faces = array( $faces = [
0 => 0, 0 => 0,
1 => 2, 1 => 2,
2 => 1, 2 => 1,
3 => 3, 3 => 3,
); ];
$this->meta = $faces[$player->getDirection()] & 0x03; $this->meta = $faces[$player->getDirection()] & 0x03;
if(($fy > 0.5 and $face !== 1) or $face === 0){ if(($fy > 0.5 and $face !== 1) or $face === 0){
$this->meta |= 0x04; //Upside-down stairs $this->meta |= 0x04; //Upside-down stairs
@ -54,9 +54,9 @@ class Stair extends Transparent{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 1){ if($item->isPickaxe() >= 1){
return array( return [
array($this->id, 0, 1), [$this->id, 0, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -68,9 +68,9 @@ class Stone extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 1){ if($item->isPickaxe() >= 1){
return array( return [
array(Item::COBBLESTONE, 0, 1), [Item::COBBLESTONE, 0, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -26,12 +26,12 @@ use pocketmine\item\Item;
class StoneBricks extends Solid{ class StoneBricks extends Solid{
public function __construct($meta = 0){ public function __construct($meta = 0){
parent::__construct(self::STONE_BRICKS, $meta, "Stone Bricks"); parent::__construct(self::STONE_BRICKS, $meta, "Stone Bricks");
$names = array( $names = [
0 => "Stone Bricks", 0 => "Stone Bricks",
1 => "Mossy Stone Bricks", 1 => "Mossy Stone Bricks",
2 => "Cracked Stone Bricks", 2 => "Cracked Stone Bricks",
3 => "Chiseled Stone Bricks", 3 => "Chiseled Stone Bricks",
); ];
$this->name = $names[$this->meta & 0x03]; $this->name = $names[$this->meta & 0x03];
$this->hardness = 30; $this->hardness = 30;
} }
@ -56,9 +56,9 @@ class StoneBricks extends Solid{
public function getDrops(Item $item){ public function getDrops(Item $item){
if($item->isPickaxe() >= 1){ if($item->isPickaxe() >= 1){
return array( return [
array(Item::STONE_BRICKS, $this->meta & 0x03, 1), [Item::STONE_BRICKS, $this->meta & 0x03, 1],
); ];
}else{ }else{
return []; return [];
} }

View File

@ -40,8 +40,8 @@ class Stonecutter extends Solid{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array($this->id, 0, 1), [$this->id, 0, 1],
); ];
} }
} }

View File

@ -38,9 +38,9 @@ class Sugarcane extends Flowable{
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array(Item::SUGARCANE, 0, 1), [Item::SUGARCANE, 0, 1],
); ];
} }
public function onActivate(Item $item, Player $player = null){ public function onActivate(Item $item, Player $player = null){

View File

@ -36,13 +36,13 @@ class TNT extends Solid{
if(($player->gamemode & 0x01) === 0){ if(($player->gamemode & 0x01) === 0){
$item->useOn($this); $item->useOn($this);
} }
$data = array( $data = [
"x" => $this->x + 0.5, "x" => $this->x + 0.5,
"y" => $this->y + 0.5, "y" => $this->y + 0.5,
"z" => $this->z + 0.5, "z" => $this->z + 0.5,
"power" => 4, "power" => 4,
"fuse" => 20 * 4, //4 seconds "fuse" => 20 * 4, //4 seconds
); ];
$this->getLevel()->setBlock($this, new Air(), false, false, true); $this->getLevel()->setBlock($this, new Air(), false, false, true);
//TODO //TODO
//$e = Server::getInstance()->api->entity->add($this->level, ENTITY_OBJECT, OBJECT_PRIMEDTNT, $data); //$e = Server::getInstance()->api->entity->add($this->level, ENTITY_OBJECT, OBJECT_PRIMEDTNT, $data);

View File

@ -28,11 +28,11 @@ class TallGrass extends Flowable{
public function __construct($meta = 1){ public function __construct($meta = 1){
parent::__construct(self::TALL_GRASS, $meta, "Tall Grass"); parent::__construct(self::TALL_GRASS, $meta, "Tall Grass");
$this->isReplaceable = true; $this->isReplaceable = true;
$names = array( $names = [
0 => "Dead Shrub", 0 => "Dead Shrub",
1 => "Tall Grass", 1 => "Tall Grass",
2 => "Fern", 2 => "Fern",
); ];
$this->name = $names[$this->meta & 0x03]; $this->name = $names[$this->meta & 0x03];
$this->hardness = 0; $this->hardness = 0;
} }

View File

@ -39,7 +39,7 @@ class Torch extends Flowable{
public function onUpdate($type){ public function onUpdate($type){
if($type === Level::BLOCK_UPDATE_NORMAL){ if($type === Level::BLOCK_UPDATE_NORMAL){
$side = $this->getDamage(); $side = $this->getDamage();
$faces = array( $faces = [
1 => 4, 1 => 4,
2 => 5, 2 => 5,
3 => 2, 3 => 2,
@ -47,7 +47,7 @@ class Torch extends Flowable{
5 => 0, 5 => 0,
6 => 0, 6 => 0,
0 => 0, 0 => 0,
); ];
if($this->getSide($faces[$side])->isTransparent === true and !($side === 0 and $this->getSide(0)->getID() === self::FENCE)){ //Replace with common break method if($this->getSide($faces[$side])->isTransparent === true and !($side === 0 and $this->getSide(0)->getID() === self::FENCE)){ //Replace with common break method
//TODO //TODO
@ -63,13 +63,13 @@ class Torch extends Flowable{
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
if($target->isTransparent === false and $face !== 0){ if($target->isTransparent === false and $face !== 0){
$faces = array( $faces = [
1 => 5, 1 => 5,
2 => 4, 2 => 4,
3 => 3, 3 => 3,
4 => 2, 4 => 2,
5 => 1, 5 => 1,
); ];
$this->meta = $faces[$face]; $this->meta = $faces[$face];
$this->getLevel()->setBlock($block, $this, true, false, true); $this->getLevel()->setBlock($block, $this, true, false, true);
@ -85,8 +85,8 @@ class Torch extends Flowable{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array($this->id, 0, 1), [$this->id, 0, 1],
); ];
} }
} }

View File

@ -38,12 +38,12 @@ class Trapdoor extends Transparent{
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
if(($target->isTransparent === false or $target->getID() === self::SLAB) and $face !== 0 and $face !== 1){ if(($target->isTransparent === false or $target->getID() === self::SLAB) and $face !== 0 and $face !== 1){
$faces = array( $faces = [
2 => 0, 2 => 0,
3 => 1, 3 => 1,
4 => 2, 4 => 2,
5 => 3, 5 => 3,
); ];
$this->meta = $faces[$face] & 0x03; $this->meta = $faces[$face] & 0x03;
if($fy > 0.5){ if($fy > 0.5){
$this->meta |= 0x08; $this->meta |= 0x08;
@ -57,9 +57,9 @@ class Trapdoor extends Transparent{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array($this->id, 0, 1), [$this->id, 0, 1],
); ];
} }
public function onActivate(Item $item, Player $player = null){ public function onActivate(Item $item, Player $player = null){

View File

@ -86,10 +86,10 @@ class Wheat extends Flowable{
public function getDrops(Item $item){ public function getDrops(Item $item){
$drops = []; $drops = [];
if($this->meta >= 0x07){ if($this->meta >= 0x07){
$drops[] = array(Item::WHEAT, 0, 1); $drops[] = [Item::WHEAT, 0, 1];
$drops[] = array(Item::WHEAT_SEEDS, 0, mt_rand(0, 3)); $drops[] = [Item::WHEAT_SEEDS, 0, mt_rand(0, 3)];
}else{ }else{
$drops[] = array(Item::WHEAT_SEEDS, 0, 1); $drops[] = [Item::WHEAT_SEEDS, 0, 1];
} }
return $drops; return $drops;

View File

@ -34,25 +34,25 @@ class Wood extends Solid{
public function __construct($meta = 0){ public function __construct($meta = 0){
parent::__construct(self::WOOD, $meta, "Wood"); parent::__construct(self::WOOD, $meta, "Wood");
$names = array( $names = [
self::OAK => "Oak Wood", self::OAK => "Oak Wood",
self::SPRUCE => "Spruce Wood", self::SPRUCE => "Spruce Wood",
self::BIRCH => "Birch Wood", self::BIRCH => "Birch Wood",
self::JUNGLE => "Jungle Wood", self::JUNGLE => "Jungle Wood",
); ];
$this->name = $names[$this->meta & 0x03]; $this->name = $names[$this->meta & 0x03];
$this->hardness = 10; $this->hardness = 10;
} }
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
$faces = array( $faces = [
0 => 0, 0 => 0,
1 => 0, 1 => 0,
2 => 0b1000, 2 => 0b1000,
3 => 0b1000, 3 => 0b1000,
4 => 0b0100, 4 => 0b0100,
5 => 0b0100, 5 => 0b0100,
); ];
$this->meta = ($this->meta & 0x03) | $faces[$face]; $this->meta = ($this->meta & 0x03) | $faces[$face];
$this->getLevel()->setBlock($block, $this, true, false, true); $this->getLevel()->setBlock($block, $this, true, false, true);
@ -61,8 +61,8 @@ class Wood extends Solid{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array($this->id, $this->meta & 0x03, 1), [$this->id, $this->meta & 0x03, 1],
); ];
} }
} }

View File

@ -26,10 +26,10 @@ class Wood2 extends Wood{
public function __construct($meta = 0){ public function __construct($meta = 0){
Solid::__construct(self::WOOD2, $meta, "Wood"); Solid::__construct(self::WOOD2, $meta, "Wood");
$names = array( $names = [
0 => "Acacia Wood", 0 => "Acacia Wood",
1 => "Dark Oak Wood" 1 => "Dark Oak Wood"
); ];
$this->name = $names[$this->meta & 0x03]; $this->name = $names[$this->meta & 0x03];
$this->hardness = 10; $this->hardness = 10;
} }

View File

@ -31,8 +31,8 @@ class WoodDoor extends Door{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array(Item::WOODEN_DOOR, 0, 1), [Item::WOODEN_DOOR, 0, 1],
); ];
} }
} }

View File

@ -27,14 +27,14 @@ use pocketmine\Player;
class WoodSlab extends Transparent{ class WoodSlab extends Transparent{
public function __construct($meta = 0){ public function __construct($meta = 0){
parent::__construct(self::WOOD_SLAB, $meta, "Wooden Slab"); parent::__construct(self::WOOD_SLAB, $meta, "Wooden Slab");
$names = array( $names = [
0 => "Oak", 0 => "Oak",
1 => "Spruce", 1 => "Spruce",
2 => "Birch", 2 => "Birch",
3 => "Jungle", 3 => "Jungle",
4 => "Acacia", 4 => "Acacia",
5 => "Dark Oak", 5 => "Dark Oak",
); ];
$this->name = (($this->meta & 0x08) === 0x08 ? "Upper " : "") . $names[$this->meta & 0x07] . " Wooden Slab"; $this->name = (($this->meta & 0x08) === 0x08 ? "Upper " : "") . $names[$this->meta & 0x07] . " Wooden Slab";
if(($this->meta & 0x08) === 0x08){ if(($this->meta & 0x08) === 0x08){
$this->isFullBlock = true; $this->isFullBlock = true;
@ -112,8 +112,8 @@ class WoodSlab extends Transparent{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array($this->id, $this->meta & 0x07, 1), [$this->id, $this->meta & 0x07, 1],
); ];
} }
} }

View File

@ -47,8 +47,8 @@ class WoodStairs extends Stair{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array($this->id, 0, 1), [$this->id, 0, 1],
); ];
} }
} }

View File

@ -25,7 +25,7 @@ namespace pocketmine\block;
class Wool extends Solid{ class Wool extends Solid{
public function __construct($meta = 0){ public function __construct($meta = 0){
parent::__construct(self::WOOL, $meta, "Wool"); parent::__construct(self::WOOL, $meta, "Wool");
$names = array( $names = [
0 => "White Wool", 0 => "White Wool",
1 => "Orange Wool", 1 => "Orange Wool",
2 => "Magenta Wool", 2 => "Magenta Wool",
@ -42,7 +42,7 @@ class Wool extends Solid{
13 => "Green Wool", 13 => "Green Wool",
14 => "Red Wool", 14 => "Red Wool",
15 => "Black Wool", 15 => "Black Wool",
); ];
$this->name = $names[$this->meta]; $this->name = $names[$this->meta];
$this->hardness = 4; $this->hardness = 4;
} }

View File

@ -41,8 +41,8 @@ class Workbench extends Solid{
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return array( return [
array($this->id, 0, 1), [$this->id, 0, 1],
); ];
} }
} }

View File

@ -108,7 +108,7 @@ class Arrow extends Projectile{
$flags |= $this->fireTicks > 0 ? 1 : 0; $flags |= $this->fireTicks > 0 ? 1 : 0;
return [ return [
0 => array("type" => 0, "value" => $flags) 0 => ["type" => 0, "value" => $flags]
]; ];
} }

View File

@ -142,7 +142,7 @@ class DroppedItem extends Entity{
$flags |= $this->fireTicks > 0 ? 1 : 0; $flags |= $this->fireTicks > 0 ? 1 : 0;
return [ return [
0 => array("type" => 0, "value" => $flags) 0 => ["type" => 0, "value" => $flags]
]; ];
} }

View File

@ -989,7 +989,7 @@ abstract class Entity extends Position implements Metadatable{
public function setMotion(Vector3 $motion){ public function setMotion(Vector3 $motion){
if(!$this->justCreated){ if(!$this->justCreated){
Server::getInstance()->getPluginManager()->callEvent($ev = new EntityMotionEvent($this, $motion)); $this->server->getPluginManager()->callEvent($ev = new EntityMotionEvent($this, $motion));
if($ev->isCancelled()){ if($ev->isCancelled()){
return false; return false;
} }
@ -1007,6 +1007,8 @@ abstract class Entity extends Position implements Metadatable{
} }
$this->updateMovement(); $this->updateMovement();
} }
return true;
} }
public function isOnGround(){ public function isOnGround(){

View File

@ -104,23 +104,23 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
if($hotbarSlot !== -1){ if($hotbarSlot !== -1){
$item = $this->inventory->getItem($hotbarSlot); $item = $this->inventory->getItem($hotbarSlot);
if($item->getID() !== 0 and $item->getCount() > 0){ if($item->getID() !== 0 and $item->getCount() > 0){
$this->namedtag->Inventory[$slot] = new Compound(false, array( $this->namedtag->Inventory[$slot] = new Compound(false, [
new Byte("Count", $item->getCount()), new Byte("Count", $item->getCount()),
new Short("Damage", $item->getDamage()), new Short("Damage", $item->getDamage()),
new Byte("Slot", $slot), new Byte("Slot", $slot),
new Byte("TrueSlot", $hotbarSlot), new Byte("TrueSlot", $hotbarSlot),
new Short("id", $item->getID()), new Short("id", $item->getID()),
)); ]);
continue; continue;
} }
} }
$this->namedtag->Inventory[$slot] = new Compound(false, array( $this->namedtag->Inventory[$slot] = new Compound(false, [
new Byte("Count", 0), new Byte("Count", 0),
new Short("Damage", 0), new Short("Damage", 0),
new Byte("Slot", $slot), new Byte("Slot", $slot),
new Byte("TrueSlot", -1), new Byte("TrueSlot", -1),
new Short("id", 0), new Short("id", 0),
)); ]);
} }
//Normal inventory //Normal inventory
@ -128,24 +128,24 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
//$slotCount = (($this instanceof Player and ($this->gamemode & 0x01) === 1) ? Player::CREATIVE_SLOTS : Player::SURVIVAL_SLOTS) + 9; //$slotCount = (($this instanceof Player and ($this->gamemode & 0x01) === 1) ? Player::CREATIVE_SLOTS : Player::SURVIVAL_SLOTS) + 9;
for($slot = 9; $slot < $slotCount; ++$slot){ for($slot = 9; $slot < $slotCount; ++$slot){
$item = $this->inventory->getItem($slot - 9); $item = $this->inventory->getItem($slot - 9);
$this->namedtag->Inventory[$slot] = new Compound(false, array( $this->namedtag->Inventory[$slot] = new Compound(false, [
new Byte("Count", $item->getCount()), new Byte("Count", $item->getCount()),
new Short("Damage", $item->getDamage()), new Short("Damage", $item->getDamage()),
new Byte("Slot", $slot), new Byte("Slot", $slot),
new Short("id", $item->getID()), new Short("id", $item->getID()),
)); ]);
} }
//Armor //Armor
for($slot = 100; $slot < 104; ++$slot){ for($slot = 100; $slot < 104; ++$slot){
$item = $this->inventory->getItem($this->inventory->getSize() + $slot - 100); $item = $this->inventory->getItem($this->inventory->getSize() + $slot - 100);
if($item instanceof Item and $item->getID() !== Item::AIR){ if($item instanceof Item and $item->getID() !== Item::AIR){
$this->namedtag->Inventory[$slot] = new Compound(false, array( $this->namedtag->Inventory[$slot] = new Compound(false, [
new Byte("Count", $item->getCount()), new Byte("Count", $item->getCount()),
new Short("Damage", $item->getDamage()), new Short("Damage", $item->getDamage()),
new Byte("Slot", $slot), new Byte("Slot", $slot),
new Short("id", $item->getID()), new Short("id", $item->getID()),
)); ]);
} }
} }
} }
@ -200,12 +200,12 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
$flags |= $this->fireTicks > 0 ? 1 : 0; $flags |= $this->fireTicks > 0 ? 1 : 0;
//$flags |= ($this->crouched === true ? 0b10:0) << 1; //$flags |= ($this->crouched === true ? 0b10:0) << 1;
//$flags |= ($this->inAction === true ? 0b10000:0); //$flags |= ($this->inAction === true ? 0b10000:0);
$d = array( $d = [
0 => array("type" => 0, "value" => $flags), 0 => ["type" => 0, "value" => $flags],
1 => array("type" => 1, "value" => $this->airTicks), 1 => ["type" => 1, "value" => $this->airTicks],
16 => array("type" => 0, "value" => 0), 16 => ["type" => 0, "value" => 0],
17 => array("type" => 6, "value" => array(0, 0, 0)), 17 => ["type" => 6, "value" => [0, 0, 0]],
); ];
/*if($this->class === ENTITY_MOB and $this->type === MOB_SHEEP){ /*if($this->class === ENTITY_MOB and $this->type === MOB_SHEEP){
if(!isset($this->data["Sheared"])){ if(!isset($this->data["Sheared"])){

View File

@ -80,12 +80,12 @@ class Villager extends Creature implements NPC, Ageable{
$flags |= $this->fireTicks > 0 ? 1 : 0; $flags |= $this->fireTicks > 0 ? 1 : 0;
//$flags |= ($this->crouched === true ? 0b10:0) << 1; //$flags |= ($this->crouched === true ? 0b10:0) << 1;
//$flags |= ($this->inAction === true ? 0b10000:0); //$flags |= ($this->inAction === true ? 0b10000:0);
$d = array( $d = [
0 => array("type" => 0, "value" => $flags), 0 => ["type" => 0, "value" => $flags],
1 => array("type" => 1, "value" => $this->airTicks), 1 => ["type" => 1, "value" => $this->airTicks],
16 => array("type" => 0, "value" => 0), 16 => ["type" => 0, "value" => 0],
17 => array("type" => 6, "value" => array(0, 0, 0)), 17 => ["type" => 6, "value" => [0, 0, 0]],
); ];
return $d; return $d;
} }

View File

@ -71,12 +71,12 @@ class Zombie extends Monster{
$flags |= $this->fireTicks > 0 ? 1 : 0; $flags |= $this->fireTicks > 0 ? 1 : 0;
//$flags |= ($this->crouched === true ? 0b10:0) << 1; //$flags |= ($this->crouched === true ? 0b10:0) << 1;
//$flags |= ($this->inAction === true ? 0b10000:0); //$flags |= ($this->inAction === true ? 0b10000:0);
$d = array( $d = [
0 => array("type" => 0, "value" => $flags), 0 => ["type" => 0, "value" => $flags],
1 => array("type" => 1, "value" => $this->airTicks), 1 => ["type" => 1, "value" => $this->airTicks],
16 => array("type" => 0, "value" => 0), 16 => ["type" => 0, "value" => 0],
17 => array("type" => 6, "value" => array(0, 0, 0)), 17 => ["type" => 6, "value" => [0, 0, 0]],
); ];
return $d; return $d;
} }

View File

@ -69,14 +69,14 @@ class HandlerList{
} }
public function __construct(){ public function __construct(){
$this->handlerSlots = array( $this->handlerSlots = [
EventPriority::LOWEST => [], EventPriority::LOWEST => [],
EventPriority::LOW => [], EventPriority::LOW => [],
EventPriority::NORMAL => [], EventPriority::NORMAL => [],
EventPriority::HIGH => [], EventPriority::HIGH => [],
EventPriority::HIGHEST => [], EventPriority::HIGHEST => [],
EventPriority::MONITOR => [] EventPriority::MONITOR => []
); ];
self::$allLists[] = $this; self::$allLists[] = $this;
} }

View File

@ -343,7 +343,7 @@ class CraftingManager{
$this->recipes[spl_object_hash($recipe)] = $recipe; $this->recipes[spl_object_hash($recipe)] = $recipe;
$hash = ""; $hash = "";
$ingredients = $recipe->getIngredientList(); $ingredients = $recipe->getIngredientList();
usort($ingredients, array($this, "sort")); usort($ingredients, [$this, "sort"]);
foreach($ingredients as $item){ foreach($ingredients as $item){
$hash .= $item->getID() . ":" . ($item->getDamage() === null ? "?" : $item->getDamage()) . "x" . $item->getCount() . ","; $hash .= $item->getID() . ":" . ($item->getDamage() === null ? "?" : $item->getDamage()) . "x" . $item->getCount() . ",";
} }
@ -376,7 +376,7 @@ class CraftingManager{
} }
$hash = ""; $hash = "";
$input = $ts->getRecipe(); $input = $ts->getRecipe();
usort($input, array($this, "sort")); usort($input, [$this, "sort"]);
$inputCount = 0; $inputCount = 0;
foreach($input as $item){ foreach($input as $item){
$inputCount += $item->getCount(); $inputCount += $item->getCount();

View File

@ -25,7 +25,7 @@ use pocketmine\item\Item;
//TODO: remove this //TODO: remove this
abstract class Fuel{ abstract class Fuel{
public static $duration = array( public static $duration = [
Item::COAL => 80, Item::COAL => 80,
Item::COAL_BLOCK => 800, Item::COAL_BLOCK => 800,
Item::TRUNK => 15, Item::TRUNK => 15,
@ -49,6 +49,6 @@ abstract class Fuel{
Item::CHEST => 15, Item::CHEST => 15,
Item::BUCKET => 1000, Item::BUCKET => 1000,
); ];
} }

View File

@ -392,7 +392,7 @@ class Item{
public static function init(){ public static function init(){
if(count(self::$list) === 0){ if(count(self::$list) === 0){
self::$list = array( self::$list = [
self::SUGARCANE => Sugarcane::class, self::SUGARCANE => Sugarcane::class,
self::WHEAT_SEEDS => WheatSeeds::class, self::WHEAT_SEEDS => WheatSeeds::class,
self::PUMPKIN_SEEDS => PumpkinSeeds::class, self::PUMPKIN_SEEDS => PumpkinSeeds::class,
@ -447,7 +447,7 @@ class Item{
self::FLINT_STEEL => FlintSteel::class, self::FLINT_STEEL => FlintSteel::class,
self::SHEARS => Shears::class, self::SHEARS => Shears::class,
self::BOW => Bow::class, self::BOW => Bow::class,
); ];
foreach(Block::$list as $id => $class){ foreach(Block::$list as $id => $class){
self::$list[$id] = $class; self::$list[$id] = $class;
} }

View File

@ -34,50 +34,50 @@ class Painting extends Item{
public function onActivate(Level $level, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ public function onActivate(Level $level, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
if($target->isTransparent === false and $face > 1 and $block->isSolid === false){ if($target->isTransparent === false and $face > 1 and $block->isSolid === false){
$faces = array( $faces = [
2 => 1, 2 => 1,
3 => 3, 3 => 3,
4 => 0, 4 => 0,
5 => 2, 5 => 2,
); ];
$motives = array( $motives = [
// Motive Width Height // Motive Width Height
array("Kebab", 1, 1), ["Kebab", 1, 1],
array("Aztec", 1, 1), ["Aztec", 1, 1],
array("Alban", 1, 1), ["Alban", 1, 1],
array("Aztec2", 1, 1), ["Aztec2", 1, 1],
array("Bomb", 1, 1), ["Bomb", 1, 1],
array("Plant", 1, 1), ["Plant", 1, 1],
array("Wasteland", 1, 1), ["Wasteland", 1, 1],
array("Wanderer", 1, 2), ["Wanderer", 1, 2],
array("Graham", 1, 2), ["Graham", 1, 2],
array("Pool", 2, 1), ["Pool", 2, 1],
array("Courbet", 2, 1), ["Courbet", 2, 1],
array("Sunset", 2, 1), ["Sunset", 2, 1],
array("Sea", 2, 1), ["Sea", 2, 1],
array("Creebet", 2, 1), ["Creebet", 2, 1],
array("Match", 2, 2), ["Match", 2, 2],
array("Bust", 2, 2), ["Bust", 2, 2],
array("Stage", 2, 2), ["Stage", 2, 2],
array("Void", 2, 2), ["Void", 2, 2],
array("SkullAndRoses", 2, 2), ["SkullAndRoses", 2, 2],
//array("Wither", 2, 2), //array("Wither", 2, 2),
array("Fighters", 4, 2), ["Fighters", 4, 2],
array("Skeleton", 4, 3), ["Skeleton", 4, 3],
array("DonkeyKong", 4, 3), ["DonkeyKong", 4, 3],
array("Pointer", 4, 4), ["Pointer", 4, 4],
array("Pigscene", 4, 4), ["Pigscene", 4, 4],
array("Flaming Skull", 4, 4), ["Flaming Skull", 4, 4],
); ];
$motive = $motives[mt_rand(0, count($motives) - 1)]; $motive = $motives[mt_rand(0, count($motives) - 1)];
$data = array( $data = [
"x" => $target->x, "x" => $target->x,
"y" => $target->y, "y" => $target->y,
"z" => $target->z, "z" => $target->z,
"yaw" => $faces[$face] * 90, "yaw" => $faces[$face] * 90,
"Motive" => $motive[0], "Motive" => $motive[0],
); ];
//TODO //TODO
//$e = $server->api->entity->add($level, ENTITY_OBJECT, OBJECT_PAINTING, $data); //$e = $server->api->entity->add($level, ENTITY_OBJECT, OBJECT_PAINTING, $data);
//$e->spawnToAll(); //$e->spawnToAll();

View File

@ -60,7 +60,7 @@ abstract class Tool extends Item{
*/ */
public function getMaxDurability(){ public function getMaxDurability(){
$levels = array( $levels = [
2 => 33, 2 => 33,
1 => 60, 1 => 60,
3 => 132, 3 => 132,
@ -69,7 +69,7 @@ abstract class Tool extends Item{
self::FLINT_STEEL => 65, self::FLINT_STEEL => 65,
self::SHEARS => 239, self::SHEARS => 239,
self::BOW => 385, self::BOW => 385,
); ];
if(($type = $this->isPickaxe()) === false){ if(($type = $this->isPickaxe()) === false){
if(($type = $this->isAxe()) === false){ if(($type = $this->isAxe()) === false){

View File

@ -31,13 +31,13 @@ use pocketmine\network\protocol\ExplodePacket;
use pocketmine\Server; use pocketmine\Server;
class Explosion{ class Explosion{
public static $specialDrops = array( public static $specialDrops = [
Item::GRASS => Item::DIRT, Item::GRASS => Item::DIRT,
Item::STONE => Item::COBBLESTONE, Item::STONE => Item::COBBLESTONE,
Item::COAL_ORE => Item::COAL, Item::COAL_ORE => Item::COAL,
Item::DIAMOND_ORE => Item::DIAMOND, Item::DIAMOND_ORE => Item::DIAMOND,
Item::REDSTONE_ORE => Item::REDSTONE, Item::REDSTONE_ORE => Item::REDSTONE,
); ];
private $rays = 16; //Rays private $rays = 16; //Rays
public $level; public $level;
public $source; public $source;
@ -119,13 +119,13 @@ class Explosion{
foreach($this->affectedBlocks as $block){ foreach($this->affectedBlocks as $block){
if($block instanceof TNT){ if($block instanceof TNT){
$data = array( $data = [
"x" => $block->x + 0.5, "x" => $block->x + 0.5,
"y" => $block->y + 0.5, "y" => $block->y + 0.5,
"z" => $block->z + 0.5, "z" => $block->z + 0.5,
"power" => 4, "power" => 4,
"fuse" => mt_rand(10, 30), //0.5 to 1.5 seconds "fuse" => mt_rand(10, 30), //0.5 to 1.5 seconds
); ];
//TODO //TODO
//$e = $server->api->entity->add($this->level, ENTITY_OBJECT, OBJECT_PRIMEDTNT, $data); //$e = $server->api->entity->add($this->level, ENTITY_OBJECT, OBJECT_PRIMEDTNT, $data);
//$e->spawnToAll(); //$e->spawnToAll();

View File

@ -1038,16 +1038,16 @@ class Level implements ChunkManager, Metadatable{
} }
if($hand->getID() === Item::SIGN_POST or $hand->getID() === Item::WALL_SIGN){ if($hand->getID() === Item::SIGN_POST or $hand->getID() === Item::WALL_SIGN){
$tile = new Sign($this->getChunkAt($block->x >> 4, $block->z >> 4), new Compound(false, array( $tile = new Sign($this->getChunkAt($block->x >> 4, $block->z >> 4), new Compound(false, [
new String("id", Tile::SIGN), "id" => new String("id", Tile::SIGN),
new Int("x", $block->x), "x" => new Int("x", $block->x),
new Int("y", $block->y), "y" => new Int("y", $block->y),
new Int("z", $block->z), "z" => new Int("z", $block->z),
new String("Text1", ""), "Text1" => new String("Text1", ""),
new String("Text2", ""), "Text2" => new String("Text2", ""),
new String("Text3", ""), "Text3" => new String("Text3", ""),
new String("Text4", "") "Text4" => new String("Text4", "")
))); ]));
if($player instanceof Player){ if($player instanceof Player){
$tile->namedtag->Creator = new String("Creator", $player->getName()); $tile->namedtag->Creator = new String("Creator", $player->getName());
} }

View File

@ -66,7 +66,7 @@ class LevelImport{
return false; return false;
} }
$pmf = new LevelFormat($this->path . "level.pmf", array( $pmf = new LevelFormat($this->path . "level.pmf", [
"name" => $level->LevelName, "name" => $level->LevelName,
"seed" => $level->RandomSeed, "seed" => $level->RandomSeed,
"time" => $level->Time, "time" => $level->Time,
@ -77,13 +77,13 @@ class LevelImport{
"generator" => "default", "generator" => "default",
"generatorSettings" => "", "generatorSettings" => "",
"extra" => "" "extra" => ""
)); ]);
$chunks = new PocketChunkParser(); $chunks = new PocketChunkParser();
$chunks->loadFile($this->path . "chunks.dat"); $chunks->loadFile($this->path . "chunks.dat");
$chunks->loadMap(); $chunks->loadMap();
for($Z = 0; $Z < 16; ++$Z){ for($Z = 0; $Z < 16; ++$Z){
for($X = 0; $X < 16; ++$X){ for($X = 0; $X < 16; ++$X){
$chunk = array( $chunk = [
0 => "", 0 => "",
1 => "", 1 => "",
2 => "", 2 => "",
@ -92,7 +92,7 @@ class LevelImport{
5 => "", 5 => "",
6 => "", 6 => "",
7 => "" 7 => ""
); ];
$pmf->initCleanChunk($X, $Z); $pmf->initCleanChunk($X, $Z);
for($z = 0; $z < 16; ++$z){ for($z = 0; $z < 16; ++$z){

View File

@ -188,10 +188,10 @@ class LevelFormat extends PMF{
private function upgrade_From1_To2(){ private function upgrade_From1_To2(){
MainLogger::getLogger()->notice("Old PMF Level format version #1 detected, upgrading to version #2"); MainLogger::getLogger()->notice("Old PMF Level format version #1 detected, upgrading to version #2");
$nbt = new Compound("", array( $nbt = new Compound("", [
new Enum("Entities", []), new Enum("Entities", []),
new Enum("TileEntities", []) new Enum("TileEntities", [])
)); ]);
$nbt->Entities->setTagType(NBT::TAG_Compound); $nbt->Entities->setTagType(NBT::TAG_Compound);
$nbt->TileEntities->setTagType(NBT::TAG_Compound); $nbt->TileEntities->setTagType(NBT::TAG_Compound);
$nbtCodec = new NBT(NBT::BIG_ENDIAN); $nbtCodec = new NBT(NBT::BIG_ENDIAN);
@ -217,7 +217,7 @@ class LevelFormat extends PMF{
$Z = $index >> 16; $Z = $index >> 16;
$X = ($index & 0x8000) === 0x8000 ? -($index & 0x7fff) : $index & 0x7fff; $X = ($index & 0x8000) === 0x8000 ? -($index & 0x7fff) : $index & 0x7fff;
return array($X, $Z); return [$X, $Z];
} }
private function getChunkPath($X, $Z){ private function getChunkPath($X, $Z){
@ -290,10 +290,10 @@ class LevelFormat extends PMF{
$chunk = zlib_decode($chunk); $chunk = zlib_decode($chunk);
$offset = 0; $offset = 0;
$this->chunkInfo[$index] = array( $this->chunkInfo[$index] = [
0 => ord($chunk{0}), 0 => ord($chunk{0}),
1 => Binary::readInt(substr($chunk, 1, 4)), 1 => Binary::readInt(substr($chunk, 1, 4)),
); ];
$offset += 5; $offset += 5;
$len = Binary::readInt(substr($chunk, $offset, 4)); $len = Binary::readInt(substr($chunk, $offset, 4));
$offset += 4; $offset += 4;
@ -302,7 +302,7 @@ class LevelFormat extends PMF{
$this->chunkInfo[$index][2] = $nbt->getData(); $this->chunkInfo[$index][2] = $nbt->getData();
$offset += $len; $offset += $len;
$this->chunks[$index] = []; $this->chunks[$index] = [];
$this->chunkChange[$index] = array(-1 => false); $this->chunkChange[$index] = [-1 => false];
$this->chunkInfo[$index][3] = substr($chunk, $offset, 256); //Biome data $this->chunkInfo[$index][3] = substr($chunk, $offset, 256); //Biome data
$offset += 256; $offset += 256;
for($Y = 0; $Y < 8; ++$Y){ for($Y = 0; $Y < 8; ++$Y){
@ -399,7 +399,7 @@ class LevelFormat extends PMF{
public function initCleanChunk($X, $Z){ public function initCleanChunk($X, $Z){
$index = self::getIndex($X, $Z); $index = self::getIndex($X, $Z);
if(!isset($this->chunks[$index])){ if(!isset($this->chunks[$index])){
$this->chunks[$index] = array( $this->chunks[$index] = [
0 => false, 0 => false,
1 => false, 1 => false,
2 => false, 2 => false,
@ -408,8 +408,8 @@ class LevelFormat extends PMF{
5 => false, 5 => false,
6 => false, 6 => false,
7 => false, 7 => false,
); ];
$this->chunkChange[$index] = array( $this->chunkChange[$index] = [
-1 => true, -1 => true,
0 => 8192, 0 => 8192,
1 => 8192, 1 => 8192,
@ -419,19 +419,19 @@ class LevelFormat extends PMF{
5 => 8192, 5 => 8192,
6 => 8192, 6 => 8192,
7 => 8192, 7 => 8192,
); ];
$nbt = new Compound("", array( $nbt = new Compound("", [
new Enum("Entities", []), new Enum("Entities", []),
new Enum("TileEntities", []) new Enum("TileEntities", [])
)); ]);
$nbt->Entities->setTagType(NBT::TAG_Compound); $nbt->Entities->setTagType(NBT::TAG_Compound);
$nbt->TileEntities->setTagType(NBT::TAG_Compound); $nbt->TileEntities->setTagType(NBT::TAG_Compound);
$this->chunkInfo[$index] = array( $this->chunkInfo[$index] = [
0 => 0, 0 => 0,
1 => 0, 1 => 0,
2 => $nbt, 2 => $nbt,
3 => str_repeat("\x00", 256), 3 => str_repeat("\x00", 256),
); ];
} }
} }
@ -593,13 +593,13 @@ class LevelFormat extends PMF{
$Z = $z >> 4; $Z = $z >> 4;
$Y = $y >> 4; $Y = $y >> 4;
if($y < 0 or $y > 127){ if($y < 0 or $y > 127){
return array(0, 0); return [0, 0];
} }
$index = self::getIndex($X, $Z); $index = self::getIndex($X, $Z);
if(!isset($this->chunks[$index]) and $this->loadChunk($X, $Z) === false){ if(!isset($this->chunks[$index]) and $this->loadChunk($X, $Z) === false){
return array(0, 0); return [0, 0];
}elseif($this->chunks[$index][$Y] === false){ }elseif($this->chunks[$index][$Y] === false){
return array(0, 0); return [0, 0];
} }
$aX = $x - ($X << 4); $aX = $x - ($X << 4);
$aZ = $z - ($Z << 4); $aZ = $z - ($Z << 4);
@ -612,7 +612,7 @@ class LevelFormat extends PMF{
$m = $m >> 4; $m = $m >> 4;
} }
return array($b, $m); return [$b, $m];
} }
public function setBlock($x, $y, $z, $block, $meta = 0){ public function setBlock($x, $y, $z, $block, $meta = 0){

View File

@ -113,12 +113,12 @@ class PocketChunkParser{
$offset = $this->getOffset($X, $Z); $offset = $this->getOffset($X, $Z);
$len = Binary::readLInt(substr($this->raw, $offset, 4)); $len = Binary::readLInt(substr($this->raw, $offset, 4));
$offset += 4; $offset += 4;
$chunk = array( $chunk = [
0 => [], //Block 0 => [], //Block
1 => [], //Data 1 => [], //Data
2 => [], //SkyLight 2 => [], //SkyLight
3 => [], //BlockLight 3 => [], //BlockLight
); ];
foreach($chunk as $section => &$data){ foreach($chunk as $section => &$data){
$l = $section === 0 ? 128 : 64; $l = $section === 0 ? 128 : 64;
for($i = 0; $i < 256; ++$i){ for($i = 0; $i < 256; ++$i){
@ -198,7 +198,7 @@ class PocketChunkParser{
$meta = $meta >> 4; $meta = $meta >> 4;
} }
return array($block, $meta); return [$block, $meta];
} }
public function getChunkColumn($X, $Z, $x, $z, $type = 0){ public function getChunkColumn($X, $Z, $x, $z, $type = 0){

View File

@ -192,7 +192,7 @@ class Chunk extends BaseChunk{
$nbt->Entities->setTagType(NBT::TAG_Compound); $nbt->Entities->setTagType(NBT::TAG_Compound);
$writer = new NBT(NBT::BIG_ENDIAN); $writer = new NBT(NBT::BIG_ENDIAN);
$nbt->setName("Level"); $nbt->setName("Level");
$writer->setData(new Compound("", array("Level" => $nbt))); $writer->setData(new Compound("", ["Level" => $nbt]));
return $writer->writeCompressed(ZLIB_ENCODING_DEFLATE, RegionLoader::$COMPRESSION_LEVEL); return $writer->writeCompressed(ZLIB_ENCODING_DEFLATE, RegionLoader::$COMPRESSION_LEVEL);
} }

View File

@ -132,7 +132,7 @@ class RegionLoader extends \pocketmine\level\format\mcregion\RegionLoader{
$nbt->TileTicks->setTagType(NBT::TAG_Compound); $nbt->TileTicks->setTagType(NBT::TAG_Compound);
$writer = new NBT(NBT::BIG_ENDIAN); $writer = new NBT(NBT::BIG_ENDIAN);
$nbt->setName("Level"); $nbt->setName("Level");
$writer->setData(new Compound("", array("Level" => $nbt))); $writer->setData(new Compound("", ["Level" => $nbt]));
$chunkData = $writer->writeCompressed(ZLIB_ENCODING_DEFLATE, RegionLoader::$COMPRESSION_LEVEL); $chunkData = $writer->writeCompressed(ZLIB_ENCODING_DEFLATE, RegionLoader::$COMPRESSION_LEVEL);
$this->saveChunk($x, $z, $chunkData); $this->saveChunk($x, $z, $chunkData);
} }

Some files were not shown because too many files have changed in this diff Show More