|
4 | 4 | use pocketmine\utils\TextFormat; |
5 | 5 | use pocketmine\command\ConsoleCommandSender; |
6 | 6 | use pocketmine\scheduler\PluginTask; |
| 7 | +use pocketmine\utils\Utils; |
| 8 | +use pocketmine\Player; |
7 | 9 |
|
8 | 10 | class RunCommand extends PluginTask { |
9 | 11 |
|
@@ -71,6 +73,8 @@ public function parseJSON($string) { |
71 | 73 | if (($player = $this->getOwner()->getServer()->getPlayerExact($data[$keys[0]]['name'])) instanceof Player) { |
72 | 74 | $player->kick(); |
73 | 75 | $this->getOwner()->getLogger()->info($data[$keys[0]]['name'] . " has been kicked!"); |
| 76 | + } else { |
| 77 | + $this->getOwner()->getLogger()->info($data[$keys[0]]['name'] . " is not a valid player!"); |
74 | 78 | } |
75 | 79 | break; |
76 | 80 | case "ban": |
@@ -103,6 +107,8 @@ public function parseJSON($string) { |
103 | 107 | case "changegm": |
104 | 108 | if (($player = $this->getOwner()->getServer()->getPlayerExact($data[$keys[0]]['name'])) instanceof Player) { |
105 | 109 | $player->setGamemode($data[$keys[0]]['mode']); |
| 110 | + } else { |
| 111 | + $this->getOwner()->getLogger()->info($data[$keys[0]]['name'] . " is not a valid player!"); |
106 | 112 | } |
107 | 113 | break; |
108 | 114 | case "getCode": |
@@ -168,8 +174,9 @@ public function parseJSON($string) { |
168 | 174 | public function updateInfo($user = "") { |
169 | 175 | $data = array("type" => "data", "data" => array("players" => $this->sendPlayers($user), "bans" => $this->sendNameBans(), "ipbans" => $this->sendIPBans(), "ops" => $this->sendOps(), "plugins" => $this->sendPlugins())); |
170 | 176 | $this->getOwner()->thread->jsonStream.= json_encode($data) . "\n"; |
171 | | - $u = $this->getOwner()->getServer()->getMemoryUsage(true); |
172 | | - $usage = round(($u[0] / 1024) / 1024, 2) . "/" . round(($u[1] / 1024) / 1024, 2) . " MB @ " . $this->getOwner()->getServer()->getThreadCount() . " threads"; |
| 177 | + $u = Utils::getMemoryUsage(true); |
| 178 | + $d = Utils::getRealMemoryUsage(); |
| 179 | + $usage = round(($u[0] / 1024) / 1024, 2) . "/" . round(($d[0] / 1024) / 1024, 2) . "/" . round(($u[1] / 1024) / 1024, 2) . "/".round(($u[2] / 1024) / 1024, 2)." MB @ " . Utils::getThreadCount() . " threads"; |
173 | 180 | $title = "\x1b]0;" . $this->getOwner()->getServer()->getName() . " " . $this->getOwner()->getServer()->getPocketMineVersion() . " | Online " . count($this->getOwner()->getServer()->getOnlinePlayers()) . "/" . $this->getOwner()->getServer()->getMaxPlayers() . " | Memory " . $usage . " | U " . round($this->getOwner()->getServer()->getNetwork()->getUpload() / 1024, 2) . " D " . round($this->getOwner()->getServer()->getNetwork()->getDownload() / 1024, 2) . " kB/s | TPS " . $this->getOwner()->getServer()->getTicksPerSecond() . " | Load " . $this->getOwner()->getServer()->getTickUsage() . "%\x07"; |
174 | 181 | $this->getOwner()->thread->stuffTitle = $title; |
175 | 182 | return true; |
|
0 commit comments