diff --git a/src/API/ChatAPI.php b/src/API/ChatAPI.php index 21deac0d..539ae018 100644 --- a/src/API/ChatAPI.php +++ b/src/API/ChatAPI.php @@ -109,6 +109,7 @@ class ChatAPI{ */ public function broadcast($message){ $this->send(false, $message); + $this->server->send2Discord($message); } /** diff --git a/src/API/PlayerAPI.php b/src/API/PlayerAPI.php index 62d8e9d2..aa7ba54f 100644 --- a/src/API/PlayerAPI.php +++ b/src/API/PlayerAPI.php @@ -38,6 +38,7 @@ class PlayerAPI{ $this->server->api->console->alias("lag", "ping"); $this->server->api->console->alias("suicide", "kill"); $this->server->api->console->alias("tppos", "tp"); + $this->server->api->console->alias("who", "list"); $this->server->api->ban->cmdWhitelist("list"); $this->server->api->ban->cmdWhitelist("ping"); $this->server->api->ban->cmdWhitelist("spawn"); @@ -110,7 +111,6 @@ class PlayerAPI{ } } $this->server->api->chat->broadcast($data["player"]->username . $message); - $this->server->send2Discord($data["player"]->username . $message); return true; break; } diff --git a/src/API/ServerAPI.php b/src/API/ServerAPI.php index edb86787..15df242a 100644 --- a/src/API/ServerAPI.php +++ b/src/API/ServerAPI.php @@ -159,6 +159,7 @@ class ServerAPI{ $this->server = new PocketMinecraftServer($this->getProperty("server-name"), $this->getProperty("gamemode"), ($seed = $this->getProperty("level-seed")) != "" ? (int) $seed:false, $this->getProperty("server-port"), ($ip = $this->getProperty("server-ip")) != "" ? $ip:"0.0.0.0"); $this->server->api = $this; self::$serverRequest = $this->server; + $this->server->send2Discord("[INFO] Starting Minecraft PE server version ".CURRENT_MINECRAFT_VERSION); console("[INFO] This server is running NostalgiaCore version ".($version->isDev() ? FORMAT_YELLOW:"").MAJOR_VERSION.FORMAT_RESET." \"".CODENAME."\" (MCPE: ".CURRENT_MINECRAFT_VERSION.") (API ".CURRENT_API_VERSION.")", true, true, 0); console("[INFO] NostalgiaCore is distributed under the LGPL License", true, true, 0); diff --git a/src/Player.php b/src/Player.php index 4e088bac..55e04485 100755 --- a/src/Player.php +++ b/src/Player.php @@ -303,11 +303,10 @@ class Player{ $this->ackQueue = array(); $this->server->api->player->remove($this->CID); if($msg === true and $this->username != "" and $this->spawned !== false){ - $this->server->api->chat->broadcast($this->username." left the game"); + $this->server->api->chat->broadcast($this->username." left the game: ".$reason); } $this->spawned = false; console("[INFO] ".FORMAT_AQUA.$this->username.FORMAT_RESET."[/".$this->ip.":".$this->port."] logged out due to ".$reason); - $this->server->send2Discord($this->username . " left the game: ".$reason); $this->windows = array(); $this->armor = array(); $this->inventory = array(); diff --git a/src/PocketMinecraftServer.php b/src/PocketMinecraftServer.php index 68c545d1..d1c61f7f 100644 --- a/src/PocketMinecraftServer.php +++ b/src/PocketMinecraftServer.php @@ -725,7 +725,7 @@ class PocketMinecraftServer{ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($POST)); - $response = curl_exec($ch) + $response = curl_exec($ch); } } -} +} \ No newline at end of file