fixed stop message send in discord, fixed gm change kick message

This commit is contained in:
GameHerobrine 2023-03-12 17:55:06 +03:00
parent fcd1ecb1a9
commit a1a650dc5e
3 changed files with 26 additions and 4 deletions

View file

@ -963,7 +963,7 @@ class Player{
$this->blocked = true;
$this->gamemode = $gm;
$this->sendChat("Your gamemode has been changed to " . $this->getGamemode() . ", you've to do a forced reconnect.\n");
$this->server->schedule(30, [$this, "close"], "gamemode change"); //Forces a kick
$this->server->schedule(30, [$this, "close"], "gamemode change", false, true); //Forces a kick
}
if($this->gamemode === SPECTATOR){

View file

@ -118,7 +118,6 @@ class PocketMinecraftServer{
$this->saveEnabled = true;
$this->api->level->saveAll();
$this->saveEnabled = $save;
$this->send2Discord('[INFO] Server stopped!');
}
public function startDatabase(){
@ -203,7 +202,8 @@ class PocketMinecraftServer{
}
if(($this->api instanceof ServerAPI) === true){
if(($this->api->chat instanceof ChatAPI) === true){
$this->api->chat->broadcast("Stopping server...");
$this->api->chat->send(false, "Stopping server...");
new StopMessageThread($this, "[INFO] Stopping server..."); //broadcast didnt want to send message to discord for some reason
}
}
$this->stop = true;
@ -215,7 +215,7 @@ class PocketMinecraftServer{
}
}
}
public function send2Discord($msg){
if($this->extraprops->get("discord-msg") == true and $this->extraprops->get("discord-webhook-url") !== "none"){
$url = $this->extraprops->get("discord-webhook-url");

View file

@ -0,0 +1,22 @@
<?php
class StopMessageThread extends Thread
{
private $page, $msg;
public function __construct(PocketMinecraftServer $server, $msg){
if($server->extraprops->get("discord-msg") == true and ($this->page = $server->extraprops->get("discord-webhook-url")) !== "none"){
$this->msg = $server->extraprops->get("discord-ru-smiles") ? str_replace("@", " ", str_replace("Ы", "<:ru_cool:960113011383738369>", str_replace("Ь", "<:ru_cry:960112920346390548>", str_replace("Ъ", "<:ru_happy:960112868601237504>", $msg)))) : str_replace("@", "", $msg);
$this->name = $server->extraprops->get("discord-bot-name");
$this->start();
}
}
public function run(){
Utils::curl_post($this->page, [
"username" => $this->name,
"content" => $this->msg
]);
}
}