mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-06-12 22:45:28 +00:00
Formatting
This commit is contained in:
parent
befe1c606f
commit
22b5255421
@ -359,6 +359,7 @@ class Player extends RealHuman implements CommandSender{
|
|||||||
$this->server->getScheduler()->scheduleDelayedTask(new CallbackTask(array($this, "getNextChunk"), array(false, true)), MAX_CHUNK_RATE);
|
$this->server->getScheduler()->scheduleDelayedTask(new CallbackTask(array($this, "getNextChunk"), array(false, true)), MAX_CHUNK_RATE);
|
||||||
++$this->chunkScheduled;
|
++$this->chunkScheduled;
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}else{
|
}else{
|
||||||
unset($this->chunkCount[$count]);
|
unset($this->chunkCount[$count]);
|
||||||
|
@ -40,10 +40,10 @@ use PocketMine\Item\Item;
|
|||||||
use PocketMine\Level\Generator\Generator;
|
use PocketMine\Level\Generator\Generator;
|
||||||
use PocketMine\Level\Level;
|
use PocketMine\Level\Level;
|
||||||
use PocketMine\Network\Packet;
|
use PocketMine\Network\Packet;
|
||||||
use PocketMine\Network\RakNet\Info as RakNetInfo;
|
|
||||||
use PocketMine\Network\RakNet\Packet as RakNetPacket;
|
|
||||||
use PocketMine\Network\Query\QueryHandler;
|
use PocketMine\Network\Query\QueryHandler;
|
||||||
use PocketMine\Network\Query\QueryPacket;
|
use PocketMine\Network\Query\QueryPacket;
|
||||||
|
use PocketMine\Network\RakNet\Info as RakNetInfo;
|
||||||
|
use PocketMine\Network\RakNet\Packet as RakNetPacket;
|
||||||
use PocketMine\Network\ThreadedHandler;
|
use PocketMine\Network\ThreadedHandler;
|
||||||
use PocketMine\Network\UPnP\UPnP;
|
use PocketMine\Network\UPnP\UPnP;
|
||||||
use PocketMine\Permission\BanList;
|
use PocketMine\Permission\BanList;
|
||||||
|
@ -34,7 +34,6 @@ use PocketMine\Command\Defaults\StopCommand;
|
|||||||
use PocketMine\Command\Defaults\TellCommand;
|
use PocketMine\Command\Defaults\TellCommand;
|
||||||
use PocketMine\Command\Defaults\VanillaCommand;
|
use PocketMine\Command\Defaults\VanillaCommand;
|
||||||
use PocketMine\Command\Defaults\VersionCommand;
|
use PocketMine\Command\Defaults\VersionCommand;
|
||||||
use PocketMine\Permission\BanList;
|
|
||||||
use PocketMine\Server;
|
use PocketMine\Server;
|
||||||
|
|
||||||
class SimpleCommandMap implements CommandMap{
|
class SimpleCommandMap implements CommandMap{
|
||||||
|
@ -45,6 +45,7 @@ class BanCommand extends VanillaCommand{
|
|||||||
|
|
||||||
if(count($args) === 0){
|
if(count($args) === 0){
|
||||||
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
|
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -58,6 +59,7 @@ class BanCommand extends VanillaCommand{
|
|||||||
}
|
}
|
||||||
|
|
||||||
Command::broadcastCommandMessage($sender, "Banned player " . $name);
|
Command::broadcastCommandMessage($sender, "Banned player " . $name);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -45,6 +45,7 @@ class BanIpCommand extends VanillaCommand{
|
|||||||
|
|
||||||
if(count($args) === 0){
|
if(count($args) === 0){
|
||||||
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
|
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -58,11 +59,13 @@ class BanIpCommand extends VanillaCommand{
|
|||||||
$this->processIPBan($player->getIP(), $sender, $reason);
|
$this->processIPBan($player->getIP(), $sender, $reason);
|
||||||
}else{
|
}else{
|
||||||
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
|
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Command::broadcastCommandMessage($sender, "Banned player " . $name);
|
Command::broadcastCommandMessage($sender, "Banned player " . $name);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -21,11 +21,8 @@
|
|||||||
|
|
||||||
namespace PocketMine\Command\Defaults;
|
namespace PocketMine\Command\Defaults;
|
||||||
|
|
||||||
use PocketMine\Command\Command;
|
|
||||||
use PocketMine\Command\CommandSender;
|
use PocketMine\Command\CommandSender;
|
||||||
use PocketMine\Player;
|
|
||||||
use PocketMine\Server;
|
use PocketMine\Server;
|
||||||
use PocketMine\Utils\TextFormat;
|
|
||||||
|
|
||||||
class BanListCommand extends VanillaCommand{
|
class BanListCommand extends VanillaCommand{
|
||||||
|
|
||||||
@ -60,6 +57,7 @@ class BanListCommand extends VanillaCommand{
|
|||||||
|
|
||||||
$sender->sendMessage("There are " . count($list) . " total banned players:");
|
$sender->sendMessage("There are " . count($list) . " total banned players:");
|
||||||
$sender->sendMessage(substr($message, 0, -2));
|
$sender->sendMessage(substr($message, 0, -2));
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -22,7 +22,6 @@
|
|||||||
namespace PocketMine\Command\Defaults;
|
namespace PocketMine\Command\Defaults;
|
||||||
|
|
||||||
use PocketMine\Command\CommandSender;
|
use PocketMine\Command\CommandSender;
|
||||||
use PocketMine\Player;
|
|
||||||
use PocketMine\Server;
|
use PocketMine\Server;
|
||||||
use PocketMine\Utils\TextFormat;
|
use PocketMine\Utils\TextFormat;
|
||||||
|
|
||||||
@ -44,6 +43,7 @@ class DefaultGamemodeCommand extends VanillaCommand{
|
|||||||
|
|
||||||
if(count($args) === 0){
|
if(count($args) === 0){
|
||||||
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
|
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -55,6 +55,7 @@ class DefaultGamemodeCommand extends VanillaCommand{
|
|||||||
}else{
|
}else{
|
||||||
$sender->sendMessage("Unknown game mode");
|
$sender->sendMessage("Unknown game mode");
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -23,7 +23,6 @@ namespace PocketMine\Command\Defaults;
|
|||||||
|
|
||||||
use PocketMine\Command\Command;
|
use PocketMine\Command\Command;
|
||||||
use PocketMine\Command\CommandSender;
|
use PocketMine\Command\CommandSender;
|
||||||
use PocketMine\Player;
|
|
||||||
use PocketMine\Server;
|
use PocketMine\Server;
|
||||||
use PocketMine\Utils\TextFormat;
|
use PocketMine\Utils\TextFormat;
|
||||||
|
|
||||||
@ -45,12 +44,14 @@ class PardonCommand extends VanillaCommand{
|
|||||||
|
|
||||||
if(count($args) !== 1){
|
if(count($args) !== 1){
|
||||||
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
|
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
Server::getInstance()->getNameBans()->remove($args[0]);
|
Server::getInstance()->getNameBans()->remove($args[0]);
|
||||||
|
|
||||||
Command::broadcastCommandMessage($sender, "Pardoned " . $name);
|
Command::broadcastCommandMessage($sender, "Pardoned " . $name);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -23,7 +23,6 @@ namespace PocketMine\Command\Defaults;
|
|||||||
|
|
||||||
use PocketMine\Command\Command;
|
use PocketMine\Command\Command;
|
||||||
use PocketMine\Command\CommandSender;
|
use PocketMine\Command\CommandSender;
|
||||||
use PocketMine\Player;
|
|
||||||
use PocketMine\Server;
|
use PocketMine\Server;
|
||||||
use PocketMine\Utils\TextFormat;
|
use PocketMine\Utils\TextFormat;
|
||||||
|
|
||||||
@ -45,6 +44,7 @@ class PardonIpCommand extends VanillaCommand{
|
|||||||
|
|
||||||
if(count($args) !== 1){
|
if(count($args) !== 1){
|
||||||
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
|
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -23,7 +23,6 @@ namespace PocketMine\Event\Player;
|
|||||||
|
|
||||||
use PocketMine\Event\Cancellable;
|
use PocketMine\Event\Cancellable;
|
||||||
use PocketMine\Player;
|
use PocketMine\Player;
|
||||||
use PocketMine\Server;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called when a player runs a command or chats, early in the process
|
* Called when a player runs a command or chats, early in the process
|
||||||
|
@ -21,9 +21,6 @@
|
|||||||
|
|
||||||
namespace PocketMine\Event\Player;
|
namespace PocketMine\Event\Player;
|
||||||
|
|
||||||
use PocketMine\Block\Block;
|
|
||||||
use PocketMine\Event\Cancellable;
|
|
||||||
use PocketMine\Item\Item;
|
|
||||||
use PocketMine\Level\Position;
|
use PocketMine\Level\Position;
|
||||||
use PocketMine\Player;
|
use PocketMine\Player;
|
||||||
|
|
||||||
|
@ -23,8 +23,6 @@ namespace PocketMine\Event\Server;
|
|||||||
|
|
||||||
use PocketMine\Command\CommandSender;
|
use PocketMine\Command\CommandSender;
|
||||||
use PocketMine\Event\Cancellable;
|
use PocketMine\Event\Cancellable;
|
||||||
use PocketMine\Player;
|
|
||||||
use PocketMine\Server;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called when the console runs a command, early in the process
|
* Called when the console runs a command, early in the process
|
||||||
|
@ -27,7 +27,6 @@ namespace PocketMine\Network;
|
|||||||
use PocketMine\Network\Query\QueryPacket;
|
use PocketMine\Network\Query\QueryPacket;
|
||||||
use PocketMine\Network\RakNet\Info;
|
use PocketMine\Network\RakNet\Info;
|
||||||
use PocketMine\Network\RakNet\Packet as RakNetPacket;
|
use PocketMine\Network\RakNet\Packet as RakNetPacket;
|
||||||
use PocketMine\Server;
|
|
||||||
|
|
||||||
class ThreadedHandler extends \Thread{
|
class ThreadedHandler extends \Thread{
|
||||||
protected $bandwidthUp;
|
protected $bandwidthUp;
|
||||||
@ -101,6 +100,7 @@ class ThreadedHandler extends \Thread{
|
|||||||
*/
|
*/
|
||||||
public function writePacket(Packet $packet){
|
public function writePacket(Packet $packet){
|
||||||
$this->queue[] = $packet;
|
$this->queue[] = $packet;
|
||||||
|
|
||||||
return strlen($packet->buffer);
|
return strlen($packet->buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -70,6 +70,7 @@ class BanEntry{
|
|||||||
|
|
||||||
public function hasExpired(){
|
public function hasExpired(){
|
||||||
$now = new \DateTime();
|
$now = new \DateTime();
|
||||||
|
|
||||||
return $this->expirationDate === null ? false : $this->expirationDate < $now;
|
return $this->expirationDate === null ? false : $this->expirationDate < $now;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -92,6 +93,7 @@ class BanEntry{
|
|||||||
$str .= $this->getExpires() === null ? "Forever" : $this->getExpires()->format(self::$format);
|
$str .= $this->getExpires() === null ? "Forever" : $this->getExpires()->format(self::$format);
|
||||||
$str .= "|";
|
$str .= "|";
|
||||||
$str .= $this->getReason();
|
$str .= $this->getReason();
|
||||||
|
|
||||||
return $str;
|
return $str;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -117,6 +119,7 @@ class BanEntry{
|
|||||||
}
|
}
|
||||||
if(count($str) > 0){
|
if(count($str) > 0){
|
||||||
$entry->setReason(trim(array_shift($str)));
|
$entry->setReason(trim(array_shift($str)));
|
||||||
|
|
||||||
return $entry;
|
return $entry;
|
||||||
}else{
|
}else{
|
||||||
return $entry;
|
return $entry;
|
||||||
|
@ -60,6 +60,7 @@ class BanList{
|
|||||||
*/
|
*/
|
||||||
public function getEntries(){
|
public function getEntries(){
|
||||||
$this->removeExpired();
|
$this->removeExpired();
|
||||||
|
|
||||||
return $this->list;
|
return $this->list;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -74,6 +75,7 @@ class BanList{
|
|||||||
return false;
|
return false;
|
||||||
}else{
|
}else{
|
||||||
$this->removeExpired();
|
$this->removeExpired();
|
||||||
|
|
||||||
return isset($this->list[$name]);
|
return isset($this->list[$name]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -102,6 +104,7 @@ class BanList{
|
|||||||
|
|
||||||
$this->list[$entry->getName()] = $entry;
|
$this->list[$entry->getName()] = $entry;
|
||||||
$this->save();
|
$this->save();
|
||||||
|
|
||||||
return $entry;
|
return $entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user