Skip to content

Commit 1aee8ae

Browse files
committed
More fixes for PM 1.5 - Not backwards compatible
1 parent 4561ea9 commit 1aee8ae

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

plugin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: PocketDockConsole
22
prefix: PDC
33
main: PocketDockConsole\Main
4-
version: 0.0.12
4+
version: 0.0.13
55
api: [1.12.0]
66

77
load: POSTWORLD

src/PocketDockConsole/RunCommand.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
use pocketmine\utils\TextFormat;
55
use pocketmine\command\ConsoleCommandSender;
66
use pocketmine\scheduler\PluginTask;
7+
use pocketmine\utils\Utils;
8+
use pocketmine\Player;
79

810
class RunCommand extends PluginTask {
911

@@ -71,6 +73,8 @@ public function parseJSON($string) {
7173
if (($player = $this->getOwner()->getServer()->getPlayerExact($data[$keys[0]]['name'])) instanceof Player) {
7274
$player->kick();
7375
$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!");
7478
}
7579
break;
7680
case "ban":
@@ -103,6 +107,8 @@ public function parseJSON($string) {
103107
case "changegm":
104108
if (($player = $this->getOwner()->getServer()->getPlayerExact($data[$keys[0]]['name'])) instanceof Player) {
105109
$player->setGamemode($data[$keys[0]]['mode']);
110+
} else {
111+
$this->getOwner()->getLogger()->info($data[$keys[0]]['name'] . " is not a valid player!");
106112
}
107113
break;
108114
case "getCode":
@@ -168,8 +174,9 @@ public function parseJSON($string) {
168174
public function updateInfo($user = "") {
169175
$data = array("type" => "data", "data" => array("players" => $this->sendPlayers($user), "bans" => $this->sendNameBans(), "ipbans" => $this->sendIPBans(), "ops" => $this->sendOps(), "plugins" => $this->sendPlugins()));
170176
$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";
173180
$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";
174181
$this->getOwner()->thread->stuffTitle = $title;
175182
return true;

0 commit comments

Comments
 (0)