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

Formatting code

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-03-23 00:32:05 +01:00
parent af14c87572
commit 80cfa7cc84
126 changed files with 473 additions and 469 deletions

24
src/PocketMine/BanAPI.php

@ -81,7 +81,7 @@ class BanAPI{
$username = strtolower($username);
if($this->server->api->dhandle("op.check", $username) === true){
return true;
} elseif($this->ops->exists($username)){
}elseif($this->ops->exists($username)){
return true;
}
@ -121,7 +121,7 @@ class BanAPI{
if($this->server->api->handle("console.check", $data) === true or $this->isOp($data["issuer"]->getUsername())){
return;
}
} elseif($data["issuer"] === "console" or $data["issuer"] === "rcon"){
}elseif($data["issuer"] === "console" or $data["issuer"] === "rcon"){
return;
}
@ -185,12 +185,12 @@ class BanAPI{
case "kick":
if(!isset($params[0])){
$output .= "Usage: /kick <player> [reason ...]\n";
} else{
}else{
$name = strtolower(array_shift($params));
$player = Player::get($name);
if($player === false){
$output .= "Player \"" . $name . "\" does not exist\n";
} else{
}else{
$reason = implode(" ", $params);
$reason = $reason == "" ? "No reason" : $reason;
@ -198,7 +198,7 @@ class BanAPI{
$player->blocked = true;
if($issuer instanceof Player){
Player::broadcastChat($player->getUsername() . " has been kicked by " . $issuer->getUsername() . ": $reason\n");
} else{
}else{
Player::broadcastChat($player->getUsername() . " has been kicked: $reason\n");
}
}
@ -296,7 +296,7 @@ class BanAPI{
}
if($issuer instanceof Player){
Player::broadcastChat($user . " has been banned by " . $issuer->getUsername() . "\n");
} else{
}else{
Player::broadcastChat($user . " has been banned\n");
}
$this->kick($user, "Banned");
@ -368,9 +368,9 @@ class BanAPI{
public function isIPBanned($ip){
if($this->server->api->dhandle("api.ban.ip.check", $ip) === false){
return true;
} elseif($this->bannedIPs->exists($ip, true)){
}elseif($this->bannedIPs->exists($ip, true)){
return true;
} else{
}else{
return false;
}
}
@ -384,9 +384,9 @@ class BanAPI{
$username = strtolower($username);
if($this->server->api->dhandle("api.ban.check", $username) === false){
return true;
} elseif($this->banned->exists($username, true)){
}elseif($this->banned->exists($username, true)){
return true;
} else{
}else{
return false;
}
}
@ -400,9 +400,9 @@ class BanAPI{
$username = strtolower($username);
if($this->isOp($username)){
return true;
} elseif($this->server->api->dhandle("api.ban.whitelist.check", $username) === false){
}elseif($this->server->api->dhandle("api.ban.whitelist.check", $username) === false){
return true;
} elseif($this->whitelist->exists($username, true)){
}elseif($this->whitelist->exists($username, true)){
return true;
}

8
src/PocketMine/BlockAPI.php

@ -248,7 +248,7 @@ class BlockAPI{
if(!isset($params[2])){
$item->setCount($item->getMaxStackSize());
} else{
}else{
$item->setCount((int) $params[2]);
}
@ -263,7 +263,7 @@ class BlockAPI{
}
$player->addItem(clone $item);
$output .= "Giving " . $item->getCount() . " of " . $item->getName() . " (" . $item->getID() . ":" . $item->getMetadata() . ") to " . $player->getUsername() . "\n";
} else{
}else{
$output .= "Unknown player.\n";
}
@ -281,7 +281,7 @@ class BlockAPI{
$this->scheduleBlockUpdate($pos->getSide(3), $delay, $type);
$this->scheduleBlockUpdate($pos->getSide(4), $delay, $type);
$this->scheduleBlockUpdate($pos->getSide(5), $delay, $type);
} else{
}else{
$this->blockUpdate($pos->getSide(0), $type);
$this->blockUpdate($pos->getSide(1), $type);
$this->blockUpdate($pos->getSide(2), $type);
@ -294,7 +294,7 @@ class BlockAPI{
public function blockUpdate(Position $pos, $type = Level::BLOCK_UPDATE_NORMAL){
if(!($pos instanceof BLock\Block)){
$block = $pos->level->getBlock($pos);
} else{
}else{
$pos = new Position($pos->x, $pos->y, $pos->z, $pos->level);
$block = $pos->level->getBlock($pos);
}

6
src/PocketMine/ChatAPI.php

@ -65,10 +65,10 @@ class ChatAPI{
if(!($issuer instanceof Player)){
if($issuer === "rcon"){
$sender = "Rcon";
} else{
}else{
$sender = ucfirst($issuer);
}
} else{
}else{
$sender = $issuer->getUsername();
}
Player::broadcastChat("* $sender " . implode(" ", $params));
@ -80,7 +80,7 @@ class ChatAPI{
}
if(!($issuer instanceof Player)){
$sender = ucfirst($issuer);
} else{
}else{
$sender = $issuer;
}
$n = array_shift($params);

16
src/PocketMine/ConsoleAPI.php

@ -142,7 +142,7 @@ class ConsoleAPI{
$curpage = (int) ceil($current / 5);
if($curpage === $page){
$output .= "/$c " . $h . "\n";
} elseif($curpage > $page){
}elseif($curpage > $page){
break;
}
++$current;
@ -186,7 +186,7 @@ class ConsoleAPI{
}
if($issuer instanceof Player){
console("[DEBUG] " . TextFormat::AQUA . $issuer->getUsername() . TextFormat::RESET . " issued server command: " . ltrim("$alias ") . "/$cmd " . $params, true, true, 2);
} else{
}else{
console("[DEBUG] " . TextFormat::YELLOW . "*" . $issuer . TextFormat::RESET . " issued server command: " . ltrim("$alias ") . "/$cmd " . $params, true, true, 2);
}
@ -220,10 +220,10 @@ class ConsoleAPI{
foreach(Player::getAll() as $p){
$output .= $this->run($cmd . " " . substr_replace($params, $p->getUsername(), $selector[1] + $offsetshift - 1, strlen($selector[0]) + 1), $issuer, $alias);
}
} else{
}else{
$issuer->sendChat("You don't have permissions to use this command.\n");
}
} else{
}else{
$output = "";
foreach(Player::getAll() as $p){
$output .= $this->run($cmd . " " . substr_replace($params, $p->getUsername(), $selector[1] + $offsetshift - 1, strlen($selector[0]) + 1), $issuer, $alias);
@ -259,10 +259,10 @@ class ConsoleAPI{
or ($d2 = $this->server->api->dhandle("console.command", array("cmd" => $cmd, "parameters" => $params, "issuer" => $issuer, "alias" => $alias))) === false
){
$output = "You don't have permissions to use this command.\n";
} elseif($d1 !== true and (!isset($d2) or $d2 !== true)){
}elseif($d1 !== true and (!isset($d2) or $d2 !== true)){
if(isset($this->cmds[$cmd]) and is_callable($this->cmds[$cmd])){
$output = @call_user_func($this->cmds[$cmd], $cmd, $params, $issuer, $alias);
} elseif($this->server->api->dhandle("console.command.unknown", array("cmd" => $cmd, "params" => $params, "issuer" => $issuer, "alias" => $alias)) !== false){
}elseif($this->server->api->dhandle("console.command.unknown", array("cmd" => $cmd, "params" => $params, "issuer" => $issuer, "alias" => $alias)) !== false){
$output = $this->defaultCommands($cmd, $params, $issuer, $alias);
}
}
@ -289,7 +289,7 @@ class ConsoleAPI{
console("[CMD] " . $m);
}
}
} else{
}else{
$this->loop->notify();
}
}
@ -316,7 +316,7 @@ class ConsoleLoop extends \Thread{
private function readLine(){
if($this->fp){
$line = trim(fgets($this->fp));
} else{
}else{
$line = trim(readline(""));
if($line != ""){
readline_add_history($line);

4
src/PocketMine/LevelAPI.php

@ -55,11 +55,11 @@ class LevelAPI{
case "seed":
if(!isset($params[0]) and ($issuer instanceof Player)){
$output .= "Seed: " . $issuer->level->getSeed() . "\n";
} elseif(isset($params[0])){
}elseif(isset($params[0])){
if(($lv = Level::get(trim(implode(" ", $params)))) !== false){
$output .= "Seed: " . $lv->getSeed() . "\n";
}
} else{
}else{
$output .= "Seed: " . Level::getDefault()->getSeed() . "\n";
}
}

105
src/PocketMine/Player.php

@ -22,8 +22,8 @@
namespace PocketMine;
use PocketMine\Entity\RealHuman;
use PocketMine\Event;
use PocketMine\Event\EventHandler;
use PocketMine\Event;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine\Level\Position;
@ -83,8 +83,8 @@ use PocketMine\Utils\Utils;
class Player extends RealHuman{
const MAX_QUEUE = 2048;
const SURVIVAL_SLOTS = 36;
const CREATIVE_SLOTS = 112;
public static $list = array(); //????
const CREATIVE_SLOTS = 112;
public static $list = array(); //????
public $auth = false;
public $CID;
public $MTU;
@ -246,7 +246,7 @@ const CREATIVE_SLOTS = 112;
}
return;
} else{
}else{
unset($this->chunkCount[$count]);
}
}
@ -492,7 +492,7 @@ const CREATIVE_SLOTS = 112;
public function setSpawn(Vector3 $pos){
if(!($pos instanceof Position)){
$level = $this->level;
} else{
}else{
$level = $pos->level;
}
$this->spawnPosition = new Position($pos->x, $pos->y, $pos->z, $level);
@ -584,7 +584,7 @@ const CREATIVE_SLOTS = 112;
$this->awardAchievement("diamond");
break;
}
} elseif($data["entity"]->level === $this->level){
}elseif($data["entity"]->level === $this->level){
$pk = new TakeItemEntityPacket;
$pk->eid = $data["eid"];
$pk->target = $data["entity"]->getID();
@ -603,7 +603,7 @@ const CREATIVE_SLOTS = 112;
case "entity.metadata":
if($data->getID() === $this->id){
$eid = 0;
} else{
}else{
$eid = $data->getID();
}
if($data->level === $this->level){
@ -616,7 +616,7 @@ const CREATIVE_SLOTS = 112;
case "entity.event":
if($data["entity"]->getID() === $this->id){
$eid = 0;
} else{
}else{
$eid = $data["entity"]->getID();
}
if($data["entity"]->level === $this->level){
@ -641,7 +641,7 @@ const CREATIVE_SLOTS = 112;
Achievement::broadcast($this, $achievementId);
return true;
} else{
}else{
return false;
}
}
@ -665,7 +665,7 @@ const CREATIVE_SLOTS = 112;
if(($this->gamemode & 0x01) === ($gm & 0x01)){
$this->gamemode = $gm;
$this->sendChat("Your gamemode has been changed to " . $this->getGamemode() . ".\n");
} else{
}else{
$this->blocked = true;
$this->gamemode = $gm;
$this->sendChat("Your gamemode has been changed to " . $this->getGamemode() . ", you've to do a forced reconnect.\n");
@ -745,7 +745,7 @@ const CREATIVE_SLOTS = 112;
}
if($this->packetStats[1] > 2){
$this->packetLoss = $this->packetStats[1] / max(1, $this->packetStats[0] + $this->packetStats[1]);
} else{
}else{
$this->packetLoss = 0;
}
$this->packetStats = array(0, 0);
@ -824,7 +824,7 @@ const CREATIVE_SLOTS = 112;
if(isset($p->messageIndex) and $p->messageIndex !== false){
if($p->messageIndex > $this->receiveCount){
$this->receiveCount = $p->messageIndex;
} elseif($p->messageIndex !== 0){
}elseif($p->messageIndex !== 0){
if(isset($this->received[$p->messageIndex])){
continue;
}
@ -934,7 +934,7 @@ const CREATIVE_SLOTS = 112;
$pk = new LoginStatusPacket;
$pk->status = 1;
$this->directDataPacket($pk);
} else{
}else{
$pk = new LoginStatusPacket;
$pk->status = 2;
$this->directDataPacket($pk);
@ -959,7 +959,7 @@ const CREATIVE_SLOTS = 112;
$this->close($this->username . " has left the game", "Server is white-listed");
return;
} elseif($this->server->api->ban->isBanned($this->iusername) or $this->server->api->ban->isIPBanned($this->ip)){
}elseif($this->server->api->ban->isBanned($this->iusername) or $this->server->api->ban->isIPBanned($this->ip)){
$this->close($this->username . " has left the game", "You are banned");
return;
@ -1009,7 +1009,7 @@ const CREATIVE_SLOTS = 112;
if(($this->gamemode & 0x01) === 0x01){
$this->slot = 0;
$this->hotbar[0] = 0;
} else{
}else{
$this->slot = $this->hotbar[0];
}
@ -1108,7 +1108,7 @@ const CREATIVE_SLOTS = 112;
if($this->forceMovement instanceof Vector3){
if($this->forceMovement->distance($newPos) <= 0.7){
$this->forceMovement = false;
} else{
}else{
$this->setPosition($this->forceMovement);
}
}
@ -1132,7 +1132,7 @@ const CREATIVE_SLOTS = 112;
if($packet->slot === 0x28 or $packet->slot === 0){ //0 for 0.8.0 compatibility
$packet->slot = -1; //Air
} else{
}else{
$packet->slot -= 9; //Get real block slot
}
@ -1240,7 +1240,7 @@ const CREATIVE_SLOTS = 112;
$pk->meta = $block->getMetadata();
$this->dataPacket($pk);
break;
} elseif($packet->face === 0xff and $this->server->handle("player.action", $data) !== false){
}elseif($packet->face === 0xff and $this->server->handle("player.action", $data) !== false){
$this->inAction = true;
$this->startAction = microtime(true);
//$this->updateMetadata();
@ -1365,7 +1365,7 @@ const CREATIVE_SLOTS = 112;
$s = $packet->slots[$i];
if($s === 0 or $s === 255){
$s = Item::get(Item::AIR, 0, 0);
} else{
}else{
$s = Item::get($s + 256, 0, 1);
}
$slot = $this->getArmorSlot($i);
@ -1373,7 +1373,7 @@ const CREATIVE_SLOTS = 112;
if($this->setArmorSlot($i, Item::get(Item::AIR, 0, 0)) === false){
$this->sendArmor();
$this->sendInventory();
} else{
}else{
$this->addItem($slot);
$packet->slots[$i] = 255;
}
@ -1381,17 +1381,17 @@ const CREATIVE_SLOTS = 112;
if($this->setArmorSlot($i, $this->getSlot($sl)) === false){
$this->sendArmor();
$this->sendInventory();
} else{
}else{
$this->setSlot($sl, Item::get(Item::AIR, 0, 0));
}
}elseif($s->getID() !== Item::AIR and $slot->getID() !== Item::AIR and ($slot->getID() !== $s->getID() or $slot->getMetadata() !== $s->getMetadata()) and ($sl = $this->hasItem($s, false)) !== false){
if($this->setArmorSlot($i, $this->getSlot($sl)) === false){
$this->sendArmor();
$this->sendInventory();
} else{
}else{
$this->setSlot($sl, $slot);
}
} else{
}else{
$packet->slots[$i] = 255;
}
@ -1606,7 +1606,7 @@ const CREATIVE_SLOTS = 112;
$message = $packet->message;
if($message{0} === "/"){ //Command
$this->server->api->console->run(substr($message, 1), $this);
} else{
}else{
$ev = new Event\Player\PlayerChatEvent($this, $message);
if(EventHandler::callEvent($ev) !== Event\Event::DENY){
Player::groupChat(sprintf($ev->getFormat(), $ev->getPlayer()->getUsername(), $ev->getMessage()), $ev->getRecipients());
@ -1631,7 +1631,7 @@ const CREATIVE_SLOTS = 112;
$pk->case2 = 0;
Player::broadcastPacket($this->level->players, $pk);
}
} elseif($this->windows[$packet->windowid] instanceof Chest){
}elseif($this->windows[$packet->windowid] instanceof Chest){
$pk = new TileEventPacket;
$pk->x = $this->windows[$packet->windowid]->x;
$pk->y = $this->windows[$packet->windowid]->y;
@ -1655,7 +1655,7 @@ const CREATIVE_SLOTS = 112;
if($this->lastCraft <= (microtime(true) - 1)){
if(isset($this->toCraft[-1])){
$this->toCraft = array(-1 => $this->toCraft[-1]);
} else{
}else{
$this->toCraft = array();
}
$this->craftingItems = array();
@ -1668,14 +1668,14 @@ const CREATIVE_SLOTS = 112;
$use = Item::get($slot->getID(), $slot->getMetadata(), $slot->getCount() - $packet->item->getCount());
$this->craftingItems[$packet->slot] = $use;
$craft = true;
} elseif($slot->getCount() <= $packet->item->getCount() and ($slot->getID() === Item::AIR or ($slot->getID() === $packet->item->getID() and $slot->getMetadata() === $packet->item->getMetadata()))){ //Crafting final
}elseif($slot->getCount() <= $packet->item->getCount() and ($slot->getID() === Item::AIR or ($slot->getID() === $packet->item->getID() and $slot->getMetadata() === $packet->item->getMetadata()))){ //Crafting final
$craftItem = Item::get($packet->item->getID(), $packet->item->getMetadata(), $packet->item->getCount() - $slot->getCount());
if(count($this->toCraft) === 0){
$this->toCraft[-1] = 0;
}
$this->toCraft[$packet->slot] = $craftItem;
$craft = true;
} elseif(((count($this->toCraft) === 1 and isset($this->toCraft[-1])) or count($this->toCraft) === 0) and $slot->getCount() > 0 and $slot->getID() > Item::AIR and ($slot->getID() !== $packet->item->getID() or $slot->getMetadata() !== $packet->item->getMetadata())){ //Crafting final
}elseif(((count($this->toCraft) === 1 and isset($this->toCraft[-1])) or count($this->toCraft) === 0) and $slot->getCount() > 0 and $slot->getID() > Item::AIR and ($slot->getID() !== $packet->item->getID() or $slot->getMetadata() !== $packet->item->getMetadata())){ //Crafting final
$craftItem = Item::get($packet->item->getID(), $packet->item->getMetadata(), $packet->item->getCount());
if(count($this->toCraft) === 0){
$this->toCraft[-1] = 0;
@ -1694,12 +1694,12 @@ const CREATIVE_SLOTS = 112;
if($recipe === false){
$this->sendInventory();
$this->toCraft = array();
} else{
}else{
$this->toCraft = array(-1 => $this->toCraft[-1]);
}
$this->craftingItems = array();
}
} else{
}else{
$this->toCraft = array();
$this->craftingItems = array();
}
@ -1713,11 +1713,11 @@ const CREATIVE_SLOTS = 112;
$tile = $tiles[0];
$slotn = $packet->slot;
$offset = 0;
} elseif($packet->slot >= Chest::SLOTS and $packet->slot <= (Chest::SLOTS << 1)){
}elseif($packet->slot >= Chest::SLOTS and $packet->slot <= (Chest::SLOTS << 1)){
$tile = $tiles[1];
$slotn = $packet->slot - Chest::SLOTS;
$offset = Chest::SLOTS;
} else{
}else{
break;
}
@ -1748,12 +1748,12 @@ const CREATIVE_SLOTS = 112;
$this->sendInventory();
break;
}
} elseif($slot->getCount() > $item->getCount()){
}elseif($slot->getCount() > $item->getCount()){
$it = clone $item;
$it->setCount($slot->getCount() - $item->getCount());
$this->addItem($it);
}
} else{
}else{
if($this->removeItem($item) === false){
$this->sendInventory();
break;
@ -1761,7 +1761,7 @@ const CREATIVE_SLOTS = 112;
$this->addItem($slot);
}
$tile->setSlot($slotn, $item, true, $offset);
} else{
}else{
$tile = $this->windows[$packet->windowid];
if(
!($tile instanceof Chest or $tile instanceof Furnace)
@ -1810,12 +1810,12 @@ const CREATIVE_SLOTS = 112;
$this->sendInventory();
break;
}
} elseif($slot->getCount() > $item->getCount()){
}elseif($slot->getCount() > $item->getCount()){
$it = clone $item;
$it->setCount($slot->count - $item->count);
$this->addItem($it);
}
} else{
}else{
if($this->removeItem($item) === false){
$this->sendInventory();
break;
@ -1840,12 +1840,12 @@ const CREATIVE_SLOTS = 112;
if($t instanceof Sign){
if($t->namedtag->creator !== $this->username){
$t->spawnTo($this);
} else{
}else{
$nbt = new NBT(NBT::LITTLE_ENDIAN);
$nbt->read($packet->namedtag);
if($nbt->id !== Tile::SIGN){
$t->spawnTo($this);
} else{
}else{
$t->setText($nbt->Text1, $nbt->Text2, $nbt->Text3, $nbt->Text4);
}
}
@ -2022,9 +2022,9 @@ const CREATIVE_SLOTS = 112;
/**
* Gets a player, or multiple
*
* @param string $name name/partial name to search
* @param bool $alike = true, if false, will only return exact matches
* @param bool $multiple = false, if true, will return an array with all the players that match
* @param string $name name/partial name to search
* @param bool $alike = true, if false, will only return exact matches
* @param bool $multiple = false, if true, will return an array with all the players that match
*
* @return Player[]|bool|Player
*/
@ -2037,7 +2037,7 @@ const CREATIVE_SLOTS = 112;
foreach(Player::$list as $player){
if($multiple === false and $player->iusername === $name){
return $player;
} elseif(strpos($player->iusername, $name) !== false){
}elseif(strpos($player->iusername, $name) !== false){
$players[$player->CID] = $player;
}
}
@ -2045,10 +2045,10 @@ const CREATIVE_SLOTS = 112;
if($multiple === false){
if(count($players) > 0){
return array_shift($players);
} else{
}else{
return false;
}
} else{
}else{
return $players;
}
}
@ -2149,23 +2149,24 @@ const CREATIVE_SLOTS = 112;
$nbt->Achievements[$achievement] = new Byte($achievement, $status == true ? 1 : 0);
}
unlink(\PocketMine\DATA . "players/" . $iname . ".yml");
} else{
}else{
console("[NOTICE] Player data not found for \"" . $iname . "\", creating new profile");
Player::saveOffline($name, $nbt);
}
} else{
}else{
$nbt = new NBT(NBT::BIG_ENDIAN);
$nbt->readCompressed(file_get_contents(\PocketMine\DATA . "players/" . $iname . ".dat"));
$nbt = $nbt->getData();
}
return $nbt;
}
/**
* Saves a compressed NBT Coumpound tag as a player data
*
* @param string $name
* @param string $name
* @param Compound $nbtTag
*/
public static function saveOffline($name, Compound $nbtTag){
@ -2222,7 +2223,7 @@ const CREATIVE_SLOTS = 112;
$craftItem[0] = $item->getID();
if($item->getMetadata() !== $craftItem[1] and $craftItem[1] !== true){
$craftItem[1] = false;
} else{
}else{
$craftItem[1] = $item->getMetadata();
}
$craftItem[2] += $item->getCount();
@ -2234,7 +2235,7 @@ const CREATIVE_SLOTS = 112;
foreach($recipe as $slot => $item){
if(!isset($recipeItems[$item->getID()])){
$recipeItems[$item->getID()] = array($item->getID(), $item->getMetadata(), $item->getCount());
} else{
}else{
if($item->getMetadata() !== $recipeItems[$item->getID()][1]){
$recipeItems[$item->getID()][1] = false;
}
@ -2267,7 +2268,7 @@ const CREATIVE_SLOTS = 112;
$s = $this->getSlot($slot);
if($s->getCount() <= 0 or $s->getID() === Item::AIR){
$this->setSlot($slot, Item::get($item->getID(), $item->getMetadata(), $item->getCount()));
} else{
}else{
$this->setSlot($slot, Item::get($item->getID(), $item->getMetadata(), $s->getCount() + $item->getCount()));
}
@ -2424,6 +2425,4 @@ const CREATIVE_SLOTS = 112;
}
}

40
src/PocketMine/PlayerAPI.php

@ -82,7 +82,7 @@ class PlayerAPI{
break;
}
}
} else{
}else{
switch($data["cause"]){
case "cactus":
$message = " was pricked to death";
@ -140,10 +140,10 @@ class PlayerAPI{
$tg = array_shift($params);
if(count($params) === 3 and substr($tg, 0, 2) === "w:"){
$target = Level::get(substr($tg, 2));
} else{
}else{
$target = Player::get($tg);
}
} else{
}else{
$target = $issuer;
}
@ -155,19 +155,19 @@ class PlayerAPI{
if(count($params) === 3){
if($target instanceof Level){
$spawn = new Vector3(floatval(array_shift($params)), floatval(array_shift($params)), floatval(array_shift($params)));
} else{
}else{
$spawn = new Position(floatval(array_shift($params)), floatval(array_shift($params)), floatval(array_shift($params)), $issuer->level);
}
} else{
}else{
$spawn = new Position($issuer->entity->x, $issuer->entity->y, $issuer->entity->z, $issuer->entity->level);
}
$target->setSpawn($spawn);
if($target instanceof Level){
$output .= "Spawnpoint of world " . $target->getName() . " set correctly!\n";
} elseif($target !== $issuer){
}elseif($target !== $issuer){
$output .= "Spawnpoint of " . $target->getUsername() . " set correctly!\n";
} else{
}else{
$output .= "Spawnpoint set correctly!\n";
}
break;
@ -208,14 +208,14 @@ class PlayerAPI{
if(Player::get($params[1]) instanceof Player){
$player = Player::get($params[1]);
$setgm = $params[0];
} elseif(Player::get($params[0]) instanceof Player){
}elseif(Player::get($params[0]) instanceof Player){
$player = Player::get($params[0]);
$setgm = $params[1];
} else{
}else{
$output .= "Usage: /$cmd <mode> [player] or /$cmd [player] <mode>\n";
break;
}
} elseif(isset($params[0])){
}elseif(isset($params[0])){
if(!(Player::get($params[0]) instanceof Player)){
if($issuer instanceof Player){
$setgm = $params[0];
@ -237,36 +237,36 @@ class PlayerAPI{
if((!isset($params[1]) or substr($params[0], 0, 2) === "w:") and isset($params[0]) and ($issuer instanceof Player)){
$name = $issuer->getUsername();
$target = implode(" ", $params);
} elseif(isset($params[1]) and isset($params[0])){
}elseif(isset($params[1]) and isset($params[0])){
$name = array_shift($params);
$target = implode(" ", $params);
} else{
}else{
$output .= "Usage: /$cmd [target player] <destination player | w:world>\n";
break;
}
if($this->teleport($name, $target) !== false){
$output .= "\"$name\" teleported to \"$target\"\n";
} else{
}else{
$output .= "Couldn't teleport.\n";
}
} else{
}else{
if(!isset($params[3]) and isset($params[2]) and isset($params[1]) and isset($params[0]) and ($issuer instanceof Player)){
$name = $issuer->getUsername();
$x = $params[0];
$y = $params[1];
$z = $params[2];
} elseif(isset($params[3]) and isset($params[2]) and isset($params[1]) and isset($params[0])){
}elseif(isset($params[3]) and isset($params[2]) and isset($params[1]) and isset($params[0])){
$name = $params[0];
$x = $params[1];
$y = $params[2];
$z = $params[3];
} else{
}else{
$output .= "Usage: /$cmd [player] <x> <y> <z>\n";
break;
}
if($this->tppos($name, $x, $y, $z)){
$output .= "\"$name\" teleported to ($x, $y, $z)\n";
} else{
}else{
$output .= "Couldn't teleport.\n";
}
}
@ -275,13 +275,13 @@ class PlayerAPI{
case "suicide":
if(!isset($params[0]) and ($issuer instanceof Player)){
$player = $issuer;
} else{
}else{
$player = Player::get($params[0]);
}
if($player instanceof Player){
$player->harm(1000, "console", true);
$player->sendChat("Ouch. That looks like it hurt.\n");
} else{
}else{
$output .= "Usage: /$cmd [player]\n";
}
break;
@ -310,7 +310,7 @@ class PlayerAPI{
return $origin->teleport($lv->getSafeSpawn());
}
} else{
}else{
return false;
}
}

24
src/PocketMine/PocketMine.php

@ -46,18 +46,18 @@ namespace PocketMine {
$className = array_pop($path);
if(count($path) > 0){
$path = implode(DIRECTORY_SEPARATOR, array_map("strtolower", $path)) . DIRECTORY_SEPARATOR;
} else{
}else{
$path = "";
}
$fPath = \PocketMine\PATH . "src" . DIRECTORY_SEPARATOR . "PocketMine" . DIRECTORY_SEPARATOR . $path . $className . ".php";
if(file_exists($fPath)){
require_once($fPath);
}
} else{ //Try plugin
}else{ //Try plugin
$className = array_pop($path);
if(count($path) > 0){
$path = implode(DIRECTORY_SEPARATOR, array_map("strtolower", $path)) . DIRECTORY_SEPARATOR;
} else{
}else{
$path = "";
}
$fPath = \PocketMine\PATH . "plugins" . DIRECTORY_SEPARATOR . $parent . DIRECTORY_SEPARATOR . "src" . DIRECTORY_SEPARATOR . $path . $className . ".php";
@ -85,7 +85,7 @@ namespace PocketMine {
exec("date.exe /T", $date);
$j = array_map("intval", explode(substr($date[0], 2, 1), trim($date[0])));
$offset = round((mktime($i[0], $i[1], 0, $j[1], $j[0], $j[2]) - $time) / 60) * 60;
} else{
}else{
exec("date +%s", $t);
$offset = round((intval(trim($t[0])) - time()) / 60) * 60;
}
@ -94,7 +94,7 @@ namespace PocketMine {
$d = timezone_name_from_abbr("", $offset, $daylight);
@ini_set("date.timezone", $d);
date_default_timezone_set($d);
} else{
}else{
$d = @date_default_timezone_get();
if(strpos($d, "/") === false){
$d = timezone_name_from_abbr($d);
@ -118,7 +118,7 @@ namespace PocketMine {
if((strpos(strtoupper(php_uname("s")), "WIN") === false or isset($opts["enable-ansi"])) and !isset($opts["disable-ansi"])){
define("PocketMine\\ANSI", true);
} else{
}else{
define("PocketMine\\ANSI", false);
}
@ -168,7 +168,7 @@ namespace PocketMine {
case "mac":
case "linux":
default:
exec("kill -9 " . ((int) $pid) . " > /dev/null 2>&1");
exec("kill -9 " . ((int) $pid) . " > /dev/null 2>&1");
}
}
@ -182,13 +182,13 @@ namespace PocketMine {
}
$var = null;
unset($var);
} elseif(is_array($var)){
}elseif(is_array($var)){
foreach($var as $i => $v){
hard_unset($var[$i]);
}
$var = null;
unset($var);
} else{
}else{
$var = null;
unset($var);
}
@ -235,7 +235,7 @@ namespace PocketMine {
}
}
$message = Utils\TextFormat::toANSI($time . $add . $message . Utils\TextFormat::RESET);
} else{
}else{
$message = $replaced;
}
echo $message;
@ -332,7 +332,7 @@ namespace PocketMine {
if(!extension_loaded("pthreads")){
console("[ERROR] Unable to find the pthreads extension.", true, true, 0);
++$errors;
} else{
}else{
$pthreads_version = phpversion("pthreads");
if(substr_count($pthreads_version, ".") < 2){
$pthreads_version = "0.$pthreads_version";
@ -371,7 +371,7 @@ namespace PocketMine {
$gitsha1 = false;
if(file_exists(\PocketMine\PATH . ".git/refs/heads/master")){ //Found Git information!
define("PocketMine\\GIT_COMMIT", strtolower(trim(file_get_contents(\PocketMine\PATH . ".git/refs/heads/master"))));
} else{ //Unknown :(
}else{ //Unknown :(
define("PocketMine\\GIT_COMMIT", str_repeat("00", 20));
}

22
src/PocketMine/Server.php

@ -284,7 +284,7 @@ class Server{
if(is_array($this->async[$ID])){
$method = $this->async[$ID][1];
$result = $this->async[$ID][0]->$method($data, $type, $ID);
} else{
}else{
$result = $this->async[$ID]($data, $type, $ID);
}
}
@ -334,10 +334,10 @@ class Server{
if(is_array($handler)){
$method = $handler[1];
$result = $handler[0]->$method($data, $event);
} else{
}else{
$result = $handler($data, $event);
}
} else{
}else{
break;
}
}
@ -499,7 +499,7 @@ class Server{
$CID = Server::clientID($packet->ip, $packet->port);
if(isset(Player::$list[$CID])){
Player::$list[$CID]->handlePacket($packet);
} else{
}else{
switch($packet->pid()){
case RakNetInfo::UNCONNECTED_PING:
case RakNetInfo::UNCONNECTED_PING_OPEN_CONNECTIONS:
@ -539,7 +539,7 @@ class Server{
$pk->ip = $packet->ip;
$pk->port = $packet->port;
$this->send($pk);
} else{
}else{
$pk = new RakNetPacket(RakNetInfo::OPEN_CONNECTION_REPLY_1);
$pk->serverID = $this->serverID;
$pk->mtuSize = strlen($packet->buffer);
@ -582,11 +582,11 @@ class Server{
++$lastLoop;
if($lastLoop < 16){
usleep(1);
} elseif($lastLoop < 128){
}elseif($lastLoop < 128){
usleep(1000);
} elseif($lastLoop < 256){
}elseif($lastLoop < 256){
usleep(2000);
} else{
}else{
usleep(4000);
}
}
@ -603,7 +603,7 @@ class Server{
if(is_array($ev)){
$method = $ev[1];
$ev[0]->$method($data, $event);
} else{
}else{
$ev($data, $event);
}
}
@ -637,7 +637,7 @@ class Server{
$this->preparedSQL->updateAction->execute();
if(!@is_callable($this->schedule[$cid][0])){
$return = false;
} else{
}else{
++$actionCount;
$return = call_user_func($this->schedule[$cid][0], $this->schedule[$cid][1], $this->schedule[$cid][2]);
}
@ -657,7 +657,7 @@ class Server{
public function event($event, callable $func){
if(!is_callable($func)){
return false;
} elseif(isset(Deprecation::$events[$event])){
}elseif(isset(Deprecation::$events[$event])){
$sub = "";
if(Deprecation::$events[$event] !== false){
$sub = " Substitute \"" . Deprecation::$events[$event] . "\" found.";

19
src/PocketMine/ServerAPI.php

@ -30,7 +30,6 @@ use PocketMine\Network\Query\QueryHandler;
use PocketMine\Network\RCON\RCON;
use PocketMine\Network\UPnP\UPnP;
use PocketMine\Plugin\PluginManager;
use PocketMine\PMF\Plugin;
use PocketMine\Recipes\Crafting;
use PocketMine\Tile\Tile;
use PocketMine\Utils\Config;
@ -169,7 +168,7 @@ class ServerAPI{
$info = json_decode(Utils::getURL("https://api.github.com/repos/PocketMine/PocketMine-MP/commits"), true);
if($info === false or !isset($info[0])){
console("[ERROR] Github API error");
} else{
}else{
$last = new \DateTime($info[0]["commit"]["committer"]["date"]);
$last = $last->getTimestamp();
if($last >= $this->getProperty("last-update") and $this->getProperty("last-update") !== false and \PocketMine\GIT_COMMIT != $info[0]["sha"]){
@ -177,16 +176,16 @@ class ServerAPI{
console("[NOTICE] " . TextFormat::YELLOW . "Commit \"" . $info[0]["commit"]["message"] . "\" [" . substr($info[0]["sha"], 0, 10) . "] by " . $info[0]["commit"]["committer"]["name"]);
console("[NOTICE] " . TextFormat::YELLOW . "Get it at PocketMine.net or at https://github.com/PocketMine/PocketMine-MP/archive/" . $info[0]["sha"] . ".zip");
console("[NOTICE] This message will disappear after issuing the command \"/update-done\"");
} else{
}else{
$this->setProperty("last-update", time());
console("[INFO] " . TextFormat::AQUA . "This is the latest DEVELOPMENT version");
}
}
} else{
}else{
$info = json_decode(Utils::getURL("https://api.github.com/repos/PocketMine/PocketMine-MP/tags"), true);
if($info === false or !isset($info[0])){
console("[ERROR] Github API error");
} else{
}else{
$newest = new VersionString(VERSION);
$newestN = $newest->getNumber();
$update = new VersionString($info[0]["name"]);
@ -196,7 +195,7 @@ class ServerAPI{
console("[NOTICE] " . TextFormat::GREEN . "Version \"" . $info[0]["name"] . "\" #" . $updateN);
console("[NOTICE] Get it at PocketMine.net or at " . $info[0]["zipball_url"]);
console("[NOTICE] This message will disappear as soon as you update");
} else{
}else{
$this->setProperty("last-update", time());
console("[INFO] " . TextFormat::AQUA . "This is the latest STABLE version");
}
@ -222,7 +221,7 @@ class ServerAPI{
}
}
console("[INFO] Loaded ".count(PluginManager::loadPlugins(\PocketMine\DATA . "plugins/")). " plugin(s).");
console("[INFO] Loaded " . count(PluginManager::loadPlugins(\PocketMine\DATA . "plugins/")) . " plugin(s).");
}
@ -314,7 +313,7 @@ class ServerAPI{
console("[WARNING] PocketMine-MP may not work right with less than 128MB of RAM", true, true, 0);
}
@ini_set("memory_limit", $memory);
} else{
}else{
$this->setProperty("memory-limit", "128M");
}
@ -339,7 +338,7 @@ class ServerAPI{
case "last-update":
if($v === false){
$v = time();
} else{
}else{
$v = (int) $v;
}
break;
@ -464,7 +463,7 @@ class ServerAPI{
case "last-update":
if($v === false){
$v = time();
} else{
}else{
$v = (int) $v;
}
break;

8
src/PocketMine/TimeAPI.php

@ -116,11 +116,11 @@ class TimeAPI{
$time = !is_integer($time) ? $this->get(false, $time) : $time;
if($time < TimeAPI::$phases["sunset"]){
$time = "day";
} elseif($time < TimeAPI::$phases["night"]){
}elseif($time < TimeAPI::$phases["night"]){
$time = "sunset";
} elseif($time < TimeAPI::$phases["sunrise"]){
}elseif($time < TimeAPI::$phases["sunrise"]){
$time = "night";
} else{
}else{
$time = "sunrise";
}
@ -133,7 +133,7 @@ class TimeAPI{
}
if(is_string($time) and isset(TimeAPI::$phases[$time])){
$level->setTime(TimeAPI::$phases[$time]);
} else{
}else{
$level->setTime((int) $time);
}

2
src/PocketMine/block/Bed.php

@ -21,10 +21,10 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Network\Protocol\ChatPacket;
use PocketMine\ServerAPI;
use PocketMine;
class Bed extends Transparent{
public function __construct($type = 0){

2
src/PocketMine/block/Beetroot.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class Beetroot extends Flowable{
public function __construct($meta = 0){

2
src/PocketMine/block/Block.php

@ -24,10 +24,10 @@
*/
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine\Level\Position;
use PocketMine;
abstract class Block extends Position{
const AIR = 0;

2
src/PocketMine/block/BrownMushroom.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class BrownMushroom extends Flowable{
public function __construct(){

2
src/PocketMine/block/BurningFurnace.php

@ -22,13 +22,13 @@
namespace PocketMine\Block;
use PocketMine\Item\Item;
use PocketMine;
use PocketMine\NBT\NBT;
use PocketMine\NBT\Tag\Compound;
use PocketMine\NBT\Tag\Enum;
use PocketMine\NBT\Tag\Int;
use PocketMine\NBT\Tag\String;
use PocketMine\Tile\Furnace;
use PocketMine;
use PocketMine\Tile\Tile;
class BurningFurnace extends Solid{

2
src/PocketMine/block/Cactus.php

@ -21,11 +21,11 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine\Math\Vector3 as Vector3;
use PocketMine\ServerAPI;
use PocketMine;
class Cactus extends Transparent{
public function __construct($meta = 0){

2
src/PocketMine/block/Cake.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class Cake extends Transparent{
public function __construct($meta = 0){

2
src/PocketMine/block/Carpet.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class Carpet extends Flowable{
public function __construct($meta = 0){

2
src/PocketMine/block/Carrot.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class Carrot extends Flowable{
public function __construct($meta = 0){

2
src/PocketMine/block/Chest.php

@ -22,13 +22,13 @@
namespace PocketMine\Block;
use PocketMine\Item\Item;
use PocketMine;
use PocketMine\NBT\NBT;
use PocketMine\NBT\Tag\Compound;
use PocketMine\NBT\Tag\Enum;
use PocketMine\NBT\Tag\Int;
use PocketMine\NBT\Tag\String;
use PocketMine\Tile\Chest as TileChest;
use PocketMine;
use PocketMine\Tile\Tile;
class Chest extends Transparent{

2
src/PocketMine/block/CyanFlower.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class CyanFlower extends Flowable{
public function __construct(){

2
src/PocketMine/block/Dandelion.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class Dandelion extends Flowable{
public function __construct(){

2
src/PocketMine/block/Door.php

@ -21,11 +21,11 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine\Network\Protocol\LevelEventPacket;
use PocketMine\Player;
use PocketMine;
abstract class Door extends Transparent{

2
src/PocketMine/block/Fallable.php

@ -21,10 +21,10 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine\ServerAPI;
use PocketMine;
class Fallable extends Solid{

2
src/PocketMine/block/Fire.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class Fire extends Flowable{
public function __construct($meta = 0){

2
src/PocketMine/block/Generic.php

@ -21,10 +21,10 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine\ServerAPI;
use PocketMine;
class Generic extends Block{

2
src/PocketMine/block/GlowingRedstoneOre.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class GlowingRedstoneOre extends Solid{
public function __construct(){

2
src/PocketMine/block/Grass.php

@ -21,10 +21,10 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Generator\Object\TallGrass;
use PocketMine\Utils\Random;
use PocketMine;
class Grass extends Solid{
public function __construct(){

2
src/PocketMine/block/Ladder.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class Ladder extends Transparent{
public function __construct($meta = 0){

2
src/PocketMine/block/Lava.php

@ -21,11 +21,11 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine\Level\Position;
use PocketMine\ServerAPI;
use PocketMine;
class Lava extends Liquid{
public function __construct($meta = 0){

2
src/PocketMine/block/Leaves.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class Leaves extends Transparent{
const OAK = 0;

2
src/PocketMine/block/MelonStem.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class MelonStem extends Flowable{
public function __construct($meta = 0){

2
src/PocketMine/block/Potato.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class Potato extends Flowable{
public function __construct($meta = 0){

2
src/PocketMine/block/PumpkinStem.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class PumpkinStem extends Flowable{
public function __construct($meta = 0){

2
src/PocketMine/block/RedMushroom.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class RedMushroom extends Flowable{
public function __construct(){

2
src/PocketMine/block/RedstoneOre.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class RedstoneOre extends Solid{
public function __construct(){

2
src/PocketMine/block/Sapling.php

@ -21,11 +21,11 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Generator\Object\Tree;
use PocketMine\Level\Level;
use PocketMine\Utils\Random;
use PocketMine;
class Sapling extends Flowable{
const OAK = 0;

2
src/PocketMine/block/SignPost.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class SignPost extends Transparent{
public function __construct($meta = 0){

2
src/PocketMine/block/SnowLayer.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class SnowLayer extends Flowable{
public function __construct($meta = 0){

2
src/PocketMine/block/Sugarcane.php

@ -21,10 +21,10 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine\Math\Vector3 as Vector3;
use PocketMine;
class Sugarcane extends Flowable{
public function __construct($meta = 0){

2
src/PocketMine/block/TallGrass.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class TallGrass extends Flowable{
public function __construct($meta = 1){

2
src/PocketMine/block/Torch.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class Torch extends Flowable{
public function __construct($meta = 0){

2
src/PocketMine/block/Water.php

@ -22,9 +22,9 @@
namespace PocketMine\Block;
use PocketMine\Item\Item;
use PocketMine;
use PocketMine\Level\Level;
use PocketMine\Level\Position;
use PocketMine;
use PocketMine\ServerAPI;
class Water extends Liquid{

2
src/PocketMine/block/Wheat.php

@ -21,9 +21,9 @@
namespace PocketMine\Block;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Level\Level;
use PocketMine;
class Wheat extends Flowable{
public function __construct($meta = 0){

16
src/PocketMine/entity/Entity.php

@ -24,6 +24,7 @@
*/
namespace PocketMine\Entity;
use PocketMine;
use PocketMine\Event\Entity\EntityLevelChangeEvent;
use PocketMine\Event\Entity\EntityMotionEvent;
use PocketMine\Event\Entity\EntityMoveEvent;
@ -34,15 +35,14 @@ use PocketMine\Level\Position;
use PocketMine\Math\AxisAlignedBB;
use PocketMine\Math\Vector3 as Vector3;
use PocketMine\NBT\Tag\Compound;
use PocketMine\Network;
use PocketMine\Network\Protocol\MoveEntityPacket_PosRot;
use PocketMine\Network\Protocol\MovePlayerPacket;
use PocketMine\Network\Protocol\RemoveEntityPacket;
use PocketMine\Network\Protocol\SetEntityMotionPacket;
use PocketMine\Network;
use PocketMine\Player;
use PocketMine\PMF\LevelFormat;
use PocketMine\ServerAPI;
use PocketMine;
abstract class Entity extends Position{
public static $entityCount = 1;
@ -185,7 +185,7 @@ abstract class Entity extends Position{
$this->fallDistance = 0;
$this->inWater = true;
$this->extinguish();
} else{
}else{
$this->inWater = false;
}
@ -195,7 +195,7 @@ abstract class Entity extends Position{
if($this->fireTicks < 0){
$this->fireTicks = 0;
}
} else{
}else{
if(($this->fireTicks % 20) === 0){
$this->attackEntity(1, "onFire");
}
@ -230,7 +230,7 @@ abstract class Entity extends Position{
$pk->yaw = $this->yaw;
$pk->pitch = $this->pitch;
$pk->bodyYaw = $this->yaw;
} else{
}else{
$pk = new MoveEntityPacket_PosRot;
$pk->eid = $this->id;
$pk->x = $this->x;
@ -273,7 +273,7 @@ abstract class Entity extends Position{
public function getDirection(){
$rotation = ($this->yaw - 90) % 360;
if($rotation < 0) {
if($rotation < 0){
$rotation += 360.0;
}
if((0 <= $rotation and $rotation < 45) or (315 <= $rotation and $rotation < 360)){
@ -307,7 +307,7 @@ abstract class Entity extends Position{
$this->fall($this->fallDistance);
$this->fallDistance = 0;
}
} elseif($distanceThisTick < 0){
}elseif($distanceThisTick < 0){
$this->fallDistance -= $distanceThisTick;
}
}
@ -431,7 +431,7 @@ abstract class Entity extends Position{
foreach($this->hasSpawned as $player){
if(!isset($newChunk[$player->CID])){
$this->despawnFrom($player);
} else{
}else{
unset($newChunk[$player->CID]);
}
}

14
src/PocketMine/entity/Human.php

@ -21,7 +21,6 @@
namespace PocketMine\Entity;
use PocketMine;
use PocketMine\Event\Entity\EntityArmorChangeEvent;
use PocketMine\Event\Entity\EntityInventoryChangeEvent;
use PocketMine\Event\Event;
@ -30,13 +29,14 @@ use PocketMine\Item\Item;
use PocketMine\NBT\Tag\Byte;
use PocketMine\NBT\Tag\Compound;
use PocketMine\NBT\Tag\Short;
use PocketMine\Network;
use PocketMine\Network\Protocol\AddPlayerPacket;
use PocketMine\Network\Protocol\ContainerSetContentPacket;
use PocketMine\Network\Protocol\PlayerEquipmentPacket;
use PocketMine\Network\Protocol\RemovePlayerPacket;
use PocketMine\Network\Protocol\SetEntityMotionPacket;
use PocketMine\Network;
use PocketMine\Player;
use PocketMine;
class Human extends Creature implements ProjectileSource, InventorySource{
@ -224,7 +224,7 @@ class Human extends Creature implements ProjectileSource, InventorySource{
for($i = 0; $i < 4; ++$i){
if(isset($this->armor[$i]) and ($this->armor[$i] instanceof Item) and $this->armor[$i]->getID() > Item::AIR){
$slots[$i] = $this->armor[$i]->getID() !== Item::AIR ? $this->armor[$i]->getID() - 256 : 0;
} else{
}else{
$this->armor[$i] = Item::get(Item::AIR, 0, 0);
$slots[$i] = 255;
}
@ -234,7 +234,7 @@ class Human extends Creature implements ProjectileSource, InventorySource{
$pk->eid = $this->id;
$pk->slots = $slots;
$player->dataPacket($pk);
} elseif($this instanceof Player){
}elseif($this instanceof Player){
$pk = new ContainerSetContentPacket;
$pk->windowid = 0x78; //Armor window id
$pk->slots = $this->armor;
@ -300,7 +300,7 @@ class Human extends Creature implements ProjectileSource, InventorySource{
$inv[$s] = clone $item;
$inv[$s]->setCount($add);
break;
} elseif($i->equals($item)){
}elseif($i->equals($item)){
$add = min($i->getMaxStackSize() - $i->getCount(), $item->getCount());
if($add <= 0){
continue;
@ -329,7 +329,7 @@ class Human extends Creature implements ProjectileSource, InventorySource{
$i2->setCount($add);
$this->setSlot($s, $i2);
break;
} elseif($i->equals($item)){
}elseif($i->equals($item)){
$add = min($i->getMaxStackSize() - $i->getCount(), $item->getCount());
if($add <= 0){
continue;
@ -362,7 +362,7 @@ class Human extends Creature implements ProjectileSource, InventorySource{
if($item->getCount() < $i->getCount()){
$i->setCount($i->getCount() - $item->getCount());
$this->setSlot($s, $i);
} else{
}else{
$this->setSlot($s, Item::get(Item::AIR, 0, 0));
}
break;

2
src/PocketMine/entity/InventorySource.php

@ -40,7 +40,7 @@ interface InventorySource{
public function canRemoveItem(Item $item, $checkDamage = true);
/**
* @param Item $item
* @param Item $item
* @param boolean $checkDamage
*
* @return boolean hasBeenRemoved

6
src/PocketMine/event/Event.php

@ -62,7 +62,7 @@ abstract class Event{
$identifier = Utils::getCallableIdentifier($handler);
if(isset(static::$handlers[$identifier])){ //Already registered
return false;
} else{
}else{
static::$handlers[$identifier] = $handler;
if(!isset(static::$handlerPriority[(int) $priority])){
static::$handlerPriority[(int) $priority] = array();
@ -79,7 +79,7 @@ abstract class Event{
if(isset(static::$handlers[$identifier])){
if(isset(static::$handlerPriority[(int) $priority][$identifier])){
unset(static::$handlerPriority[(int) $priority][$identifier]);
} else{
}else{
for($priority = EventPriority::MONITOR; $priority <= EventPriority::LOWEST; ++$priority){
unset(static::$handlerPriority[$priority][$identifier]);
if(count(static::$handlerPriority[$priority]) === 0){
@ -90,7 +90,7 @@ abstract class Event{
unset(static::$handlers[$identifier]);
return true;
} else{
}else{
return false;
}
}

6
src/PocketMine/event/EventHandler.php

@ -41,7 +41,7 @@ abstract class EventHandler{
if($event->isForced()){
if($event instanceof CancellableEvent and $event->isCancelled()){
return Event::DENY;
} else{
}else{
return Event::ALLOW;
}
}
@ -50,9 +50,9 @@ abstract class EventHandler{
if($event instanceof CancellableEvent and $event->isCancelled()){
return Event::DENY;
} elseif($event->isAllowed()){
}elseif($event->isAllowed()){
return Event::ALLOW;
} else{
}else{
return Event::NORMAL;
}
}

2
src/PocketMine/event/block/BlockBreakEvent.php

@ -21,11 +21,11 @@
namespace PocketMine\Event\Block;
use PocketMine;
use PocketMine\Block\Block;
use PocketMine\Event\CancellableEvent;
use PocketMine\Item\Item;
use PocketMine\Player;
use PocketMine;
class BlockBreakEvent extends BlockEvent implements CancellableEvent{
public static $handlers;

2
src/PocketMine/event/block/BlockPlaceEvent.php

@ -21,11 +21,11 @@
namespace PocketMine\Event\Block;
use PocketMine;
use PocketMine\Block\Block;
use PocketMine\Event\CancellableEvent;
use PocketMine\Item\Item;
use PocketMine\Player;
use PocketMine;
/**
* Called when a player places a block

2
src/PocketMine/event/entity/EntityArmorChangeEvent.php

@ -22,9 +22,9 @@
namespace PocketMine\Event\Entity;
use PocketMine\Entity\Entity;
use PocketMine;
use PocketMine\Event\CancellableEvent;
use PocketMine\Event;
use PocketMine;
use PocketMine\Item\Item;
class EntityArmorChangeEvent extends EntityEvent implements CancellableEvent{

2
src/PocketMine/event/entity/EntityInventoryChangeEvent.php

@ -22,9 +22,9 @@
namespace PocketMine\Event\Entity;
use PocketMine\Entity\Entity;
use PocketMine;
use PocketMine\Event\CancellableEvent;
use PocketMine\Event;
use PocketMine;
use PocketMine\Item\Item;
class EntityInventoryChangeEvent extends EntityEvent implements CancellableEvent{

2
src/PocketMine/event/entity/EntityLevelChangeEvent.php

@ -22,9 +22,9 @@
namespace PocketMine\Event\Entity;
use PocketMine\Entity\Entity;
use PocketMine;
use PocketMine\Event\CancellableEvent;
use PocketMine\Event;
use PocketMine;
use PocketMine\Level\Level;
class EntityLevelChangeEvent extends EntityEvent implements CancellableEvent{

2
src/PocketMine/event/entity/EntityMotionEvent.php

@ -22,9 +22,9 @@
namespace PocketMine\Event\Entity;
use PocketMine\Entity\Entity;
use PocketMine;
use PocketMine\Event\CancellableEvent;
use PocketMine\Event;
use PocketMine;
use PocketMine\Math\Vector3 as Vector3;
class EntityMotionEvent extends EntityEvent implements CancellableEvent{

2
src/PocketMine/event/entity/EntityMoveEvent.php

@ -22,9 +22,9 @@
namespace PocketMine\Event\Entity;
use PocketMine\Entity\Entity;
use PocketMine;
use PocketMine\Event\CancellableEvent;
use PocketMine\Event;
use PocketMine;
use PocketMine\Math\Vector3 as Vector3;
class EntityMoveEvent extends EntityEvent implements CancellableEvent{

2
src/PocketMine/event/player/PlayerInteractEvent.php

@ -21,11 +21,11 @@
namespace PocketMine\Event\Player;
use PocketMine;
use PocketMine\Block\Block;
use PocketMine\Event\CancellableEvent;
use PocketMine\Item\Item;
use PocketMine\Player;
use PocketMine;
/**
* Called when a player interacts or touches a block (including air?)

4
src/PocketMine/event/player/PlayerItemHeldEvent.php

@ -21,10 +21,10 @@
namespace PocketMine\Event\Player;
use PocketMine\Event\CancellableEvent;
use PocketMine;
use PocketMine\Event;
use PocketMine\Event\CancellableEvent;
use PocketMine\Item\Item;
use PocketMine;
use PocketMine\Player;
class PlayerItemHeldEvent extends PlayerEvent implements CancellableEvent{

4
src/PocketMine/event/server/DataPacketReceiveEvent.php

@ -21,10 +21,10 @@
namespace PocketMine\Event\Server;
use PocketMine\Event;
use PocketMine\Event\CancellableEvent;
use PocketMine\Network\Protocol\DataPacket;
use PocketMine;
use PocketMine\Event;
use PocketMine\Network\Protocol\DataPacket;
use PocketMine\Player;
class DataPacketReceiveEvent extends ServerEvent implements CancellableEvent{

4
src/PocketMine/event/server/DataPacketSendEvent.php

@ -21,10 +21,10 @@
namespace PocketMine\Event\Server;
use PocketMine\Event;
use PocketMine\Event\CancellableEvent;
use PocketMine\Network\Protocol\DataPacket;
use PocketMine;
use PocketMine\Event;
use PocketMine\Network\Protocol\DataPacket;
use PocketMine\Player;
class DataPacketSendEvent extends ServerEvent implements CancellableEvent{

2
src/PocketMine/event/server/PacketReceiveEvent.php

@ -22,8 +22,8 @@
namespace PocketMine\Event\Server;
use PocketMine\Event\CancellableEvent;
use PocketMine\Event;
use PocketMine;
use PocketMine\Event;
use PocketMine\Network\Packet;
class PacketReceiveEvent extends ServerEvent implements CancellableEvent{

2
src/PocketMine/event/server/PacketSendEvent.php

@ -22,8 +22,8 @@
namespace PocketMine\Event\Server;
use PocketMine\Event\CancellableEvent;
use PocketMine\Event;
use PocketMine;
use PocketMine\Event;
use PocketMine\Network\Packet;
class PacketSendEvent extends ServerEvent implements CancellableEvent{

8
src/PocketMine/event/tile/TileInventoryChangeEvent.php

@ -21,11 +21,11 @@
namespace PocketMine\Event\Tile;
use PocketMine\Event;
use PocketMine\Item\Item;
use PocketMine;
use PocketMine\Tile\Tile;
use PocketMine\Event\CancellableEvent;
use PocketMine\Event;
use PocketMine;
use PocketMine\Item\Item;
use PocketMine\Tile\Tile;
class TileInventoryChangeEvent extends TileEvent implements CancellableEvent{
public static $handlers;

2
src/PocketMine/item/Bucket.php

@ -22,12 +22,12 @@
namespace PocketMine\Item;
use PocketMine\Block\Air;
use PocketMine;
use PocketMine\Block\Block;
use PocketMine\Block\Lava;
use PocketMine\Block\Liquid;
use PocketMine\Block\Water;
use PocketMine\Level\Level;
use PocketMine;
use PocketMine\Player;
class Bucket extends Item{

2
src/PocketMine/item/FlintSteel.php

@ -22,10 +22,10 @@
namespace PocketMine\Item;
use PocketMine\Block\Block;
use PocketMine;
use PocketMine\Block\Fire;
use PocketMine\Block\Solid;
use PocketMine\Level\Level;
use PocketMine;
use PocketMine\Player;
class FlintSteel extends Item{

18
src/PocketMine/item/Item.php

@ -25,13 +25,13 @@
namespace PocketMine\Item;
use PocketMine\Block\Block;
use PocketMine;
use PocketMine\Entity\Entity;
use PocketMine\Item\Block as ItemBlock;
use PocketMine\Level\Level;
use PocketMine\Player;
use PocketMine\Recipes\Fuel;
use PocketMine\Recipes\Smelt;
use PocketMine;
use PocketMine\Player;
class Item{
//All Block IDs are here too
@ -420,7 +420,7 @@ class Item{
$item = clone self::$list[$id];
$item->setMetadata($meta);
$item->setCount($count);
} else{
}else{
$item = new Item($id, $meta, $count);
}
@ -435,11 +435,11 @@ class Item{
}
return $blocks;
} else{
}else{
$b = explode(":", str_replace(" ", "_", trim($str)));
if(!isset($b[1])){
$meta = 0;
} else{
}else{
$meta = ((int) $b[1]) & 0xFFFF;
}
@ -448,7 +448,7 @@ class Item{
if($item->getID() === self::AIR and strtoupper($b[0]) !== "AIR"){
$item = self::get(((int) $b[0]) & 0xFFFF, $meta);
}
} else{
}else{
$item = self::get(((int) $b[0]) & 0xFFFF, $meta);
}
@ -490,7 +490,7 @@ class Item{
public function getBlock(){
if($this->block instanceof Block){
return $this->block;
} else{
}else{
return Block::get(self::AIR);
}
}
@ -543,12 +543,12 @@ class Item{
if($this->isTool() or $force === true){
if(($object instanceof Entity) and !$this->isSword()){
$this->meta += 2;
} else{
}else{
$this->meta++;
}
return true;
} elseif($this->isHoe()){
}elseif($this->isHoe()){
if(($object instanceof Block) and ($object->getID() === self::GRASS or $object->getID() === self::DIRT)){
$this->meta++;
}

4
src/PocketMine/item/Painting.php

@ -22,10 +22,10 @@
namespace PocketMine\Item;
use PocketMine\Block\Block;
use PocketMine\Level\Level;
use PocketMine\ServerAPI;
use PocketMine;
use PocketMine\Level\Level;
use PocketMine\Player;
use PocketMine\ServerAPI;
class Painting extends Item{
public function __construct($meta = 0, $count = 1){

4
src/PocketMine/item/SpawnEgg.php

@ -21,11 +21,11 @@
namespace PocketMine\Item;
use PocketMine\Entity;
use PocketMine;
use PocketMine\Block\Block;
use PocketMine\Entity;
use PocketMine\Level\Level;
use PocketMine\Player;
use PocketMine;
class SpawnEgg extends Item{
public function __construct($meta = 0, $count = 1){

8
src/PocketMine/level/Explosion.php

@ -22,13 +22,13 @@
namespace PocketMine\Level;
use PocketMine\Block\Block;
use PocketMine;
use PocketMine\Block\TNT;
use PocketMine\Item\Item;
use PocketMine\Math\Vector3 as Vector3;
use PocketMine\Network\Protocol\ExplodePacket;
use PocketMine\Player;
use PocketMine\ServerAPI;
use PocketMine;
use PocketMine\Item\Item;
class Explosion{
public static $specialDrops = array(
@ -118,11 +118,11 @@ class Explosion{
//TODO
//$e = $server->api->entity->add($this->level, ENTITY_OBJECT, OBJECT_PRIMEDTNT, $data);
//$e->spawnToAll();
} elseif(mt_rand(0, 10000) < ((1 / $this->size) * 10000)){
}elseif(mt_rand(0, 10000) < ((1 / $this->size) * 10000)){
if(isset(self::$specialDrops[$block->getID()])){
//TODO
//$server->api->entity->drop(new Position($block->x + 0.5, $block->y, $block->z + 0.5, $this->level), Item::get(self::$specialDrops[$block->getID()], 0));
} else{
}else{
//TODO
//$server->api->entity->drop(new Position($block->x + 0.5, $block->y, $block->z + 0.5, $this->level), Item::get($block->getID(), $this->level->level->getBlockDamage($block->x, $block->y, $block->z)));
}

12
src/PocketMine/level/Level.php

@ -24,7 +24,6 @@
*/
namespace PocketMine\Level;
use PocketMine;
use PocketMine\Block\Air;
use PocketMine\Block\Block;
use PocketMine\Item\Item;
@ -52,6 +51,7 @@ use PocketMine\Utils\Cache;
use PocketMine\Utils\Config;
use PocketMine\Utils\Random;
use PocketMine\Utils\Utils;
use PocketMine;
/**
* Class Level
@ -909,9 +909,9 @@ class Level{
/**
* Sets a raw minichunk
*
* @param int $X
* @param int $Z
* @param int $Y
* @param int $X
* @param int $Z
* @param int $Y
* @param string $data (must be 4096 bytes)
*
* @return bool
@ -1011,8 +1011,8 @@ class Level{
/**
* Unloads a chunk
*
* @param int $X
* @param int $Z
* @param int $X
* @param int $Z
* @param bool $force
*
* @return bool

8
src/PocketMine/level/LevelImport.php

@ -21,10 +21,10 @@
namespace PocketMine\Level;
use PocketMine\NBT\NBT;
use PocketMine;
use PocketMine\PMF\LevelFormat;
use PocketMine\Utils\Config;
use PocketMine;
use PocketMine\NBT\NBT;
class LevelImport{
private $path;
@ -41,7 +41,7 @@ class LevelImport{
$entities->save();
$tiles = new Config($this->path . "tiles.yml", Config::YAML, unserialize(file_get_contents($this->path . "tileEntities.dat")));
$tiles->save();
} elseif(file_exists($this->path . "chunks.dat") and file_exists($this->path . "level.dat")){ //Pocket
}elseif(file_exists($this->path . "chunks.dat") and file_exists($this->path . "level.dat")){ //Pocket
$nbt = new NBT(NBT::LITTLE_ENDIAN);
$nbt->read(substr(file_get_contents($this->path . "level.dat"), 8));
$level = $nbt->getData();
@ -61,7 +61,7 @@ class LevelImport{
$entities->save();
$tiles = new Config($this->path . "tiles.yml", Config::YAML, $tiles);
$tiles->save();
} else{
}else{
return false;
}

8
src/PocketMine/level/PocketChunkParser.php

@ -63,9 +63,9 @@ class PocketChunkParser{
}
@unlink($file . ".gz");
file_put_contents($file, $this->raw);
} elseif(!file_exists($file)){
}elseif(!file_exists($file)){
return false;
} else{
}else{
$this->raw = file_get_contents($file);
}
$this->file = $file;
@ -200,7 +200,7 @@ class PocketChunkParser{
$meta = ord($this->map[$X][$Z][1][$index]{$y >> 1});
if(($y & 1) === 0){
$meta = $meta & 0x0F;
} else{
}else{
$meta = $meta >> 4;
}
@ -226,7 +226,7 @@ class PocketChunkParser{
$old_meta = ord($this->map[$X][$Z][1][$index]{$y >> 1});
if(($y & 1) === 0){
$meta = ($old_meta & 0xF0) | ($meta & 0x0F);
} else{
}else{
$meta = (($meta << 4) & 0xF0) | ($old_meta & 0x0F);
}
$this->map[$X][$Z][1][$index]{$y >> 1} = chr($meta);

2
src/PocketMine/level/WorldGenerator.php

@ -21,12 +21,12 @@
namespace PocketMine\Level;
use PocketMine;
use PocketMine\Level\Generator\Generator;
use PocketMine\PMF\LevelFormat;
use PocketMine\Utils\Config;
use PocketMine\Utils\Random;
use PocketMine\Utils\Utils;
use PocketMine;
class WorldGenerator{
private $seed, $level, $path, $random, $generator, $height;

4
src/PocketMine/level/generator/Flat.php

@ -21,7 +21,6 @@
namespace PocketMine\Level\Generator;
use PocketMine;
use PocketMine\Block\CoalOre;
use PocketMine\Block\DiamondOre;
use PocketMine\Block\Dirt;
@ -35,6 +34,7 @@ use PocketMine\Level\Generator\Populator\Ore;
use PocketMine\Level\Level;
use PocketMine\Math\Vector3 as Vector3;
use PocketMine\Utils\Random;
use PocketMine;
class Flat extends Generator{
private $level, $random, $structure, $chunks, $options, $floorLevel, $preset, $populators = array();
@ -52,7 +52,7 @@ class Flat extends Generator{
$this->options = $options;
if(isset($options["preset"])){
$this->parsePreset($options["preset"]);
} else{
}else{
$this->parsePreset($this->preset);
}
if(isset($this->options["decoration"])){

2
src/PocketMine/level/generator/Generator.php

@ -24,9 +24,9 @@
*/
namespace PocketMine\Level\Generator;
use PocketMine;
use PocketMine\Level\Level;
use PocketMine\Utils\Random;
use PocketMine;
abstract class Generator{
private static $list = array();

28
src/PocketMine/level/generator/Normal.php

@ -21,6 +21,7 @@
namespace PocketMine\Level\Generator;
use PocketMine;
use PocketMine\Block\CoalOre;
use PocketMine\Block\DiamondOre;
use PocketMine\Block\Dirt;
@ -37,7 +38,6 @@ use PocketMine\Level\Generator\Populator\Tree;
use PocketMine\Level\Level;
use PocketMine\Math\Vector3 as Vector3;
use PocketMine\Utils\Random;
use PocketMine;
class Normal extends Generator{
@ -131,39 +131,39 @@ class Normal extends Generator{
$diff = $height - $y;
if($y <= 4 and ($y === 0 or $this->random->nextFloat() < 0.75)){
$chunk .= "\x07"; //bedrock
} elseif($diff > 2){
}elseif($diff > 2){
$chunk .= "\x01"; //stone
} elseif($diff > 0){
}elseif($diff > 0){
if($patches[$i] > 0.7){
$chunk .= "\x01"; //stone
} elseif($patches[$i] < -0.8){
}elseif($patches[$i] < -0.8){
$chunk .= "\x0d"; //gravel
} else{
}else{
$chunk .= "\x03"; //dirt
}
} elseif($y <= $this->waterHeight){
}elseif($y <= $this->waterHeight){
if(($this->waterHeight - $y) <= 1 and $diff === 0){
$chunk .= "\x0c"; //sand
} elseif($diff === 0){
}elseif($diff === 0){
if($patchesSmall[$i] > 0.3){
$chunk .= "\x0d"; //gravel
} elseif($patchesSmall[$i] < -0.45){
}elseif($patchesSmall[$i] < -0.45){
$chunk .= "\x0c"; //sand
} else{
}else{
$chunk .= "\x03"; //dirt
}
} else{
}else{
$chunk .= "\x09"; //still_water
}
} elseif($diff === 0){
}elseif($diff === 0){
if($patches[$i] > 0.7){
$chunk .= "\x01"; //stone
} elseif($patches[$i] < -0.8){
}elseif($patches[$i] < -0.8){
$chunk .= "\x0d"; //gravel
} else{
}else{
$chunk .= "\x02"; //grass
}
} else{
}else{
$chunk .= "\x00";
}
}

16
src/PocketMine/level/generator/noise/Simplex.php

@ -141,7 +141,7 @@ class Simplex extends Perlin{
$k2 = 1;
}
// Z X Y order
} else{ // x0<y0
}else{ // x0<y0
if($y0 < $z0){
$i1 = 0;
$j1 = 0;
@ -196,7 +196,7 @@ class Simplex extends Perlin{
$t0 = 0.6 - $x0 * $x0 - $y0 * $y0 - $z0 * $z0;
if($t0 < 0){
$n0 = 0.0;
} else{
}else{
$t0 *= $t0;
$n0 = $t0 * $t0 * self::dot3D(self::$grad3[$gi0], $x0, $y0, $z0);
}
@ -204,7 +204,7 @@ class Simplex extends Perlin{
$t1 = 0.6 - $x1 * $x1 - $y1 * $y1 - $z1 * $z1;
if($t1 < 0){
$n1 = 0.0;
} else{
}else{
$t1 *= $t1;
$n1 = $t1 * $t1 * self::dot3D(self::$grad3[$gi1], $x1, $y1, $z1);
}
@ -212,7 +212,7 @@ class Simplex extends Perlin{
$t2 = 0.6 - $x2 * $x2 - $y2 * $y2 - $z2 * $z2;
if($t2 < 0){
$n2 = 0.0;
} else{
}else{
$t2 *= $t2;
$n2 = $t2 * $t2 * self::dot3D(self::$grad3[$gi2], $x2, $y2, $z2);
}
@ -220,7 +220,7 @@ class Simplex extends Perlin{
$t3 = 0.6 - $x3 * $x3 - $y3 * $y3 - $z3 * $z3;
if($t3 < 0){
$n3 = 0.0;
} else{
}else{
$t3 *= $t3;
$n3 = $t3 * $t3 * self::dot3D(self::$grad3[$gi3], $x3, $y3, $z3);
}
@ -277,7 +277,7 @@ class Simplex extends Perlin{
$t0 = 0.5 - $x0 * $x0 - $y0 * $y0;
if($t0 < 0){
$n0 = 0.0;
} else{
}else{
$t0 *= $t0;
$n0 = $t0 * $t0 * self::dot2D(self::$grad3[$gi0], $x0, $y0); // (x,y) of grad3 used for 2D gradient
}
@ -285,7 +285,7 @@ class Simplex extends Perlin{
$t1 = 0.5 - $x1 * $x1 - $y1 * $y1;
if($t1 < 0){
$n1 = 0.0;
} else{
}else{
$t1 *= $t1;
$n1 = $t1 * $t1 * self::dot2D(self::$grad3[$gi1], $x1, $y1);
}
@ -293,7 +293,7 @@ class Simplex extends Perlin{
$t2 = 0.5 - $x2 * $x2 - $y2 * $y2;
if($t2 < 0){
$n2 = 0.0;
} else{
}else{
$t2 *= $t2;
$n2 = $t2 * $t2 * self::dot2D(self::$grad3[$gi2], $x2, $y2);
}

2
src/PocketMine/level/generator/object/BigTree.php

@ -21,9 +21,9 @@
namespace PocketMine\Level\Generator\Object;
use PocketMine;
use PocketMine\Level\Level;
use PocketMine\Math\Vector3 as Vector3;
use PocketMine;
class BigTree extends Tree{
private $trunkHeightMultiplier = 0.618;

2
src/PocketMine/level/generator/object/Ore.php

@ -21,11 +21,11 @@
namespace PocketMine\Level\Generator\Object;
use PocketMine;
use PocketMine\Level\Level;
use PocketMine\Math\Vector3 as Vector3;
use PocketMine\Math\VectorMath;
use PocketMine\Utils\Random;
use PocketMine;
class Ore{
private $random;

4
src/PocketMine/level/generator/object/PineTree.php

@ -21,13 +21,13 @@
namespace PocketMine\Level\Generator\Object;
use PocketMine;
use PocketMine\Block\Dirt;
use PocketMine\Block\Leaves;
use PocketMine\Block\Wood;
use PocketMine\Level\Level;
use PocketMine\Math\Vector3 as Vector3;
use PocketMine\Utils\Random;
use PocketMine;
class PineTree extends Tree{
var $type = 1;
@ -84,7 +84,7 @@ class PineTree extends Tree{
if(++$leavesMaxRadius > $this->leavesAbsoluteMaxRadius){
$leavesMaxRadius = $this->leavesAbsoluteMaxRadius;
}
} else{
}else{
++$leavesRadius;
}
}

2
src/PocketMine/level/generator/object/Pond.php

@ -21,11 +21,11 @@
namespace PocketMine\Level\Generator\Object;
use PocketMine;
use PocketMine\Block\Block;
use PocketMine\Level\Level;
use PocketMine\Math\Vector3 as Vector3;
use PocketMine\Utils\Random;
use PocketMine;
class Pond{
private $random;

2
src/PocketMine/level/generator/object/SmallTree.php

@ -21,13 +21,13 @@
namespace PocketMine\Level\Generator\Object;
use PocketMine;
use PocketMine\Block\Dirt;
use PocketMine\Block\Leaves;
use PocketMine\Block\Wood;
use PocketMine\Level\Level;
use PocketMine\Math\Vector3 as Vector3;
use PocketMine\Utils\Random;
use PocketMine;
class SmallTree extends Tree{
public $type = 0;

4
src/PocketMine/level/generator/object/SpruceTree.php

@ -21,13 +21,13 @@
namespace PocketMine\Level\Generator\Object;
use PocketMine;
use PocketMine\Block\Dirt;
use PocketMine\Block\Leaves;
use PocketMine\Block\Wood;
use PocketMine\Level\Level;
use PocketMine\Math\Vector3 as Vector3;
use PocketMine\Utils\Random;
use PocketMine;
class SpruceTree extends Tree{
var $type = 1;
@ -76,7 +76,7 @@ class SpruceTree extends Tree{
}
if($leavesRadius > 0 and $yy === ($pos->y + $this->leavesBottomY + 1)){
--$leavesRadius;
} elseif($leavesRadius < $this->leavesMaxRadius){
}elseif($leavesRadius < $this->leavesMaxRadius){
++$leavesRadius;
}
}

4
src/PocketMine/level/generator/object/Tree.php

@ -21,11 +21,11 @@
namespace PocketMine\Level\Generator\Object;
use PocketMine;
use PocketMine\Block\Sapling;
use PocketMine\Level\Level;
use PocketMine\Math\Vector3 as Vector3;
use PocketMine\Utils\Random;
use PocketMine;
class Tree{
public $overridable = array(
@ -42,7 +42,7 @@ class Tree{
case Sapling::SPRUCE:
if($random->nextRange(0, 1) === 1){
$tree = new SpruceTree();
} else{
}else{
$tree = new PineTree();
}
break;

2
src/PocketMine/level/generator/populator/Mineshaft.php

@ -21,9 +21,9 @@
namespace PocketMine\Level\Generator\Populator;
use PocketMine;
use PocketMine\Level\Level;
use PocketMine\Utils\Random;
use PocketMine;
class Mineshaft extends Populator{
private static $DISTANCE = 256;

2
src/PocketMine/level/generator/populator/Ore.php

@ -21,11 +21,11 @@
namespace PocketMine\Level\Generator\Populator;
use PocketMine;
use PocketMine\Level\Generator\Object\Ore as ObjectOre;
use PocketMine\Level\Level;
use PocketMine\Math\Vector3 as Vector3;
use PocketMine\Utils\Random;
use PocketMine;
class Ore extends Populator{
private $oreTypes = array();

2
src/PocketMine/level/generator/populator/Pond.php

@ -21,11 +21,11 @@
namespace PocketMine\Level\Generator\Populator;
use PocketMine;
use PocketMine\Block\Water;
use PocketMine\Level\Level;
use PocketMine\Math\Vector3 as Vector3;
use PocketMine\Utils\Random;
use PocketMine;
class Pond extends Populator{
private $waterOdd = 4;

2
src/PocketMine/level/generator/populator/Populator.php

@ -24,9 +24,9 @@
*/
namespace PocketMine\Level\Generator\Populator;
use PocketMine;
use PocketMine\Level\Level;
use PocketMine\Utils\Random;
use PocketMine;
abstract class Populator{
public abstract function populate(Level $level, $chunkX, $chunkZ, Random $random);

4
src/PocketMine/level/generator/populator/TallGrass.php

@ -21,12 +21,12 @@
namespace PocketMine\Level\Generator\Populator;
use PocketMine;
use PocketMine\Block\Block;
use PocketMine\Block\TallGrass as BlockTallGrass;
use PocketMine\Level\Level;
use PocketMine\Math\Vector3 as Vector3;
use PocketMine\Utils\Random;
use PocketMine;
class TallGrass extends Populator{
/**
@ -73,7 +73,7 @@ class TallGrass extends Populator{
if(--$y <= 0){
return -1;
}
} else{
}else{
break;
}
}

6
src/PocketMine/level/generator/populator/Tree.php

@ -21,13 +21,13 @@
namespace PocketMine\Level\Generator\Populator;
use PocketMine;
use PocketMine\Block\Block;
use PocketMine\Block\Sapling;
use PocketMine\Level\Generator\Object\Tree as ObjectTree;
use PocketMine\Level\Level;
use PocketMine\Math\Vector3 as Vector3;
use PocketMine\Utils\Random;
use PocketMine;
class Tree extends Populator{
private $level;
@ -54,7 +54,7 @@ class Tree extends Populator{
}
if($random->nextFloat() > 0.75){
$meta = Sapling::BIRCH;
} else{
}else{
$meta = Sapling::OAK;
}
ObjectTree::growTree($this->level, new Vector3($x, $y, $z), $random, $meta);
@ -68,7 +68,7 @@ class Tree extends Populator{
if(--$y <= 0){
return -1;
}
} else{
}else{
break;
}
}

6
src/PocketMine/math/AxisAlignedBB.php

@ -55,19 +55,19 @@ class AxisAlignedBB{
$vec = clone $this;
if($x < 0){
$vec->minX += $x;
} elseif($x > 0){
}elseif($x > 0){
$vec->maxX += $x;
}
if($y < 0){
$vec->minY += $y;
} elseif($y > 0){
}elseif($y > 0){
$vec->maxY += $y;
}
if($z < 0){
$vec->minZ += $z;
} elseif($z > 0){
}elseif($z > 0){
$vec->maxZ += $z;
}

8
src/PocketMine/math/Vector2.php

@ -50,7 +50,7 @@ class Vector2{
public function add($x = 0, $y = 0){
if(($x instanceof Vector2) === true){
return $this->add($x->x, $x->y);
} else{
}else{
$this->x += $x;
$this->y += $y;
@ -61,7 +61,7 @@ class Vector2{
public function subtract($x = 0, $y = 0){
if(($x instanceof Vector2) === true){
return $this->add(-$x->x, -$x->y);
} else{
}else{
return $this->add(-$x, -$y);
}
}
@ -93,7 +93,7 @@ class Vector2{
public function distance($x = 0, $y = 0){
if(($x instanceof Vector2) === true){
return sqrt($this->distanceSquared($x->x, $x->y));
} else{
}else{
return sqrt($this->distanceSquared($x, $y));
}
}
@ -101,7 +101,7 @@ class Vector2{
public function distanceSquared($x = 0, $y = 0){
if(($x instanceof Vector2) === true){
return $this->distanceSquared($x->x, $x->y);
} else{
}else{
return pow($this->x - $x, 2) + pow($this->y - $y, 2);
}
}

6
src/PocketMine/math/Vector3.php

@ -81,7 +81,7 @@ class Vector3{
public function add($x = 0, $y = 0, $z = 0){
if(($x instanceof Vector3) === true){
return $this->add($x->x, $x->y, $x->z);
} else{
}else{
return new Vector3($this->x + $x, $this->y + $y, $this->z + $z);
}
}
@ -89,7 +89,7 @@ class Vector3{
public function subtract($x = 0, $y = 0, $z = 0){
if(($x instanceof Vector3) === true){
return $this->add(-$x->x, -$x->y, -$x->z);
} else{
}else{
return $this->add(-$x, -$y, -$z);
}
}
@ -148,7 +148,7 @@ class Vector3{
public function maxPlainDistance($x = 0, $z = 0){
if(($x instanceof Vector3) === true){
return $this->maxPlainDistance($x->x, $x->z);
} else{
}else{
return max(abs($this->x - $x), abs($this->z - $z));
}
}

7
src/PocketMine/nbt/NBT.php

@ -24,7 +24,6 @@
*/
namespace PocketMine\NBT;
use PocketMine;
use PocketMine\NBT\Tag\Byte;
use PocketMine\NBT\Tag\Byte_Array;
use PocketMine\NBT\Tag\Compound;
@ -40,6 +39,7 @@ use PocketMine\NBT\Tag\Short;
use PocketMine\NBT\Tag\String;
use PocketMine\NBT\Tag\Tag;
use PocketMine\Utils\Utils;
use PocketMine;
/**
* Named Binary Tag encoder/decoder
@ -73,7 +73,7 @@ class NBT{
$this->offset = strlen($this->buffer) - 1;
return "";
} elseif($len === true){
}elseif($len === true){
return substr($this->buffer, $this->offset);
}
@ -115,7 +115,7 @@ class NBT{
$this->writeTag($this->data);
return $this->buffer;
} else{
}else{
return false;
}
}
@ -124,6 +124,7 @@ class NBT{
if(($write = $this->write()) !== false){
return \gzencode($write, 9);
}
return false;
}

3
src/PocketMine/nbt/tag/Compound.php

@ -45,6 +45,7 @@ class Compound extends NamedTag implements \ArrayAccess{
return $this->{$offset}->getValue();
}
}
return null;
}
@ -71,7 +72,7 @@ class Compound extends NamedTag implements \ArrayAccess{
if($tag instanceof NamedTag and $tag->getName() !== ""){
$this->{$tag->getName()} = $tag;
}
} while(!($tag instanceof End) and !$nbt->feof());
}while(!($tag instanceof End) and !$nbt->feof());
}
public function write(NBT $nbt){

1
src/PocketMine/nbt/tag/Enum.php

@ -48,6 +48,7 @@ class Enum extends NamedTag implements \ArrayAccess{
return $this->{$offset}->getValue();
}
}
return null;
}

4
src/PocketMine/nbt/tag/NamedTag.php

@ -28,8 +28,8 @@ abstract class NamedTag extends Tag{
protected $name;
/**
* @param string $name
* @param bool|float|double|int|byte|short|array|Compound|Enum|string $value
* @param string $name
* @param bool|float|double|int|byte|short|array|Compound|Enum|string $value
*/
public function __construct($name = "", $value = false){
$this->name = $name;

8
src/PocketMine/network/Handler.php

@ -24,6 +24,7 @@
*/
namespace PocketMine\Network;
use PocketMine;
use PocketMine\Event\Event;
use PocketMine\Event\EventHandler;
use PocketMine\Event\Server\PacketReceiveEvent;
@ -33,7 +34,6 @@ use PocketMine\Network\Query\QueryPacket;
use PocketMine\Network\RakNet\Info;
use PocketMine\Network\RakNet\Packet;
use PocketMine\ServerAPI;
use PocketMine;
class Handler{
public $bandwidth;
@ -77,7 +77,7 @@ class Handler{
}
return $packet;
} elseif($pid === 0xfe and $buffer{1} === "\xfd" and ServerAPI::request()->api->query instanceof QueryHandler){
}elseif($pid === 0xfe and $buffer{1} === "\xfd" and ServerAPI::request()->api->query instanceof QueryHandler){
$packet = new QueryPacket;
$packet->ip = $source;
$packet->port = $port;
@ -86,7 +86,7 @@ class Handler{
return false;
}
ServerAPI::request()->api->query->handle($packet);
} else{
}else{
$packet = new Packet($pid);
$packet->ip = $source;
$packet->port = $port;
@ -102,7 +102,7 @@ class Handler{
public function writePacket(Packet $packet){
if(EventHandler::callEvent(new PacketSendEvent($packet)) === Event::DENY){
return 0;
} elseif($packet instanceof Packet){
}elseif($packet instanceof Packet){
$packet->encode();
}
$write = $this->socket->write($packet->buffer, $packet->ip, $packet->port);

4
src/PocketMine/network/UDPSocket.php

@ -34,14 +34,14 @@ class UDPSocket{
if($listen !== true){
$this->connected = true;
$this->unblock();
} else{
}else{
if(socket_bind($this->sock, $serverip, $port) === true){
socket_set_option($this->sock, SOL_SOCKET, SO_REUSEADDR, 0);
@socket_set_option($this->sock, SOL_SOCKET, SO_SNDBUF, 1024 * 1024 * 2); //2MB
@socket_set_option($this->sock, SOL_SOCKET, SO_RCVBUF, 1024 * 1024); //1MB
$this->unblock();
$this->connected = true;
} else{
}else{
$this->connected = false;
}
}

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