mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-19 23:37:45 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Shoghi Cervantes
2014-08-21 17:26:41 +02:00
parent e1ef86074e
commit db7222976e
105 changed files with 932 additions and 896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pocketmine/command/defaults/GamemodeCommand.php
View File

@@ -53,6 +53,7 @@ class GamemodeCommand extends VanillaCommand{
if($gameMode === -1){
$sender->sendMessage("Unknown game mode");
return true;
}

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

@@ -53,14 +53,11 @@ class KickCommand extends VanillaCommand{
if(($player = $sender->getServer()->getPlayer($name)) instanceof Player){
$player->kick($reason);
if(strlen($reason) >= 1)
{
Command::broadcastCommandMessage($sender, "Kicked " . $player->getName() . " from the game: '{$reason}'");
}
else
{
Command::broadcastCommandMessage($sender, "Kicked " . $player->getName() . " from the game.");
}
if(strlen($reason) >= 1){
Command::broadcastCommandMessage($sender, "Kicked " . $player->getName() . " from the game: '{$reason}'");
}else{
Command::broadcastCommandMessage($sender, "Kicked " . $player->getName() . " from the game.");
}
}else{
$sender->sendMessage($name . " not found.");
}

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

@@ -50,12 +50,14 @@ class SpawnpointCommand extends VanillaCommand{
$target = $sender;
}else{
$sender->sendMessage(TextFormat::RED . "Please provide a player!");
return true;
}
}else{
$target = $sender->getServer()->getPlayer($args[0]);
if($target === null){
$sender->sendMessage(TextFormat::RED . "Can't find player " . $args[0]);
return true;
}
}

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

@@ -58,12 +58,14 @@ class TeleportCommand extends VanillaCommand{
$target = $sender;
}else{
$sender->sendMessage(TextFormat::RED . "Please provide a player!");
return true;
}
if(count($args) === 1){
$target = $sender->getServer()->getPlayer($args[0]);
if($target === null){
$sender->sendMessage(TextFormat::RED . "Can't find player " . $args[0]);
return true;
}
}
@@ -71,6 +73,7 @@ class TeleportCommand extends VanillaCommand{
$target = $sender->getServer()->getPlayer($args[0]);
if($target === null){
$sender->sendMessage(TextFormat::RED . "Can't find player " . $args[0]);
return true;
}
if(count($args) === 2){
@@ -78,6 +81,7 @@ class TeleportCommand extends VanillaCommand{
$target = $sender->getServer()->getPlayer($args[1]);
if($target === null){
$sender->sendMessage(TextFormat::RED . "Can't find player " . $args[1]);
return true;
}
}

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

@@ -53,8 +53,8 @@ class TellCommand extends VanillaCommand{
$player = $sender->getServer()->getPlayer($name);
if($player instanceof Player){
$sender->sendMessage("[me -> " . $player->getName() . "] " . implode(" ",$args));
$player->sendMessage("[" . $sender->getName() . " -> me] " . implode(" ",$args));
$sender->sendMessage("[me -> " . $player->getName() . "] " . implode(" ", $args));
$player->sendMessage("[" . $sender->getName() . " -> me] " . implode(" ", $args));
}else{
$sender->sendMessage("There's no player by that name online.");
}

3
src/pocketmine/command/defaults/TimeCommand.php
View File

@@ -39,12 +39,14 @@ class TimeCommand extends VanillaCommand{
public function execute(CommandSender $sender, $currentAlias, array $args){
if(count($args) < 2){
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
return false;
}
if($args[0] === "set"){
if(!$sender->hasPermission("pocketmine.command.time.set")){
$sender->sendMessage(TextFormat::RED . "You don't have permission to set the time");
return true;
}
@@ -65,6 +67,7 @@ class TimeCommand extends VanillaCommand{
}elseif($args[0] === "add"){
if(!$sender->hasPermission("pocketmine.command.time.add")){
$sender->sendMessage(TextFormat::RED . "You don't have permission to add the time");
return true;
}

21
src/pocketmine/command/defaults/TimingsCommand.php
View File

@@ -22,12 +22,8 @@
namespace pocketmine\command\defaults;
use pocketmine\command\CommandSender;
use pocketmine\event\HandlerList;
use pocketmine\event\TimingsHandler;
use pocketmine\Player;
use pocketmine\plugin\TimedRegisteredListener;
use pocketmine\utils\TextFormat;
use pocketmine\utils\Utils;
class TimingsCommand extends VanillaCommand{
@@ -49,6 +45,7 @@ class TimingsCommand extends VanillaCommand{
if(count($args) !== 1){
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
return true;
}
@@ -58,6 +55,7 @@ class TimingsCommand extends VanillaCommand{
$sender->getServer()->getPluginManager()->setUseTimings(true);
TimingsHandler::reload();
$sender->sendMessage("Enabled Timings & Reset");
return true;
}elseif($mode === "off"){
$sender->getServer()->getPluginManager()->setUseTimings(false);
@@ -66,6 +64,7 @@ class TimingsCommand extends VanillaCommand{
if(!$sender->getServer()->getPluginManager()->useTimings()){
$sender->sendMessage("Please enable timings by typing /timings on");
return true;
}
@@ -74,13 +73,6 @@ class TimingsCommand extends VanillaCommand{
if($mode === "reset"){
TimingsHandler::reload();
$sender->sendMessage("Timings reset");
/*foreach(HandlerList::getHandlerLists() as $handlerList){
foreach($handlerList->getRegisteredListeners() as $listener){
if($listener instanceof TimedRegisteredListener){
$listener->reset();
}
}
}*/
}elseif($mode === "merged" or $mode === "report" or $paste){
$sampleTime = microtime(true) - self::$timingStart;
@@ -96,7 +88,7 @@ class TimingsCommand extends VanillaCommand{
TimingsHandler::printTimings($fileTimings);
fwrite($fileTimings, "Sample time ". round($sampleTime * 1000000000) ." (". $sampleTime ."s)" . PHP_EOL);
fwrite($fileTimings, "Sample time " . round($sampleTime * 1000000000) . " (" . $sampleTime . "s)" . PHP_EOL);
if($paste){
fseek($fileTimings, 0);
@@ -119,20 +111,21 @@ class TimingsCommand extends VanillaCommand{
curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data, JSON_UNESCAPED_SLASHES));
curl_setopt($ch, CURLOPT_AUTOREFERER, true);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($ch, CURLOPT_HTTPHEADER, ["Content-Type: application/json", "User-Agent: PocketMine-MP ".$sender->getServer()->getPocketMineVersion()]);
curl_setopt($ch, CURLOPT_HTTPHEADER, ["Content-Type: application/json", "User-Agent: PocketMine-MP " . $sender->getServer()->getPocketMineVersion()]);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
$ret = curl_exec($ch);
$data = json_decode($ret);
curl_close($ch);
if($data === false or $data === null or !isset($data->html_url)){
$sender->sendMessage("An error happened while pasting the report");
return true;
}
$timings = $data->html_url;
}
fclose($fileTimings);
$sender->sendMessage("Timings written to ". $timings);
$sender->sendMessage("Timings written to " . $timings);
$sender->sendMessage("Paste contents of file into form at http://aikar.co/timings.php to read results.");
}