mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-18 19:55:33 +00:00
Code Issues Projects Releases Wiki Activity

Fixed kick messages

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-06-27 23:26:35 +02:00
parent 401d7342dd
commit cc36f8f997
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pocketmine/Player.php
View File

@ -622,7 +622,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$this->spawnToAll(); $this->spawnToAll();
$this->server->getPluginManager()->callEvent($ev = new PlayerJoinEvent($this, $this->getName() . " joined the game")); $this->server->getPluginManager()->callEvent($ev = new PlayerJoinEvent($this, TextFormat::YELLOW . $this->getName() . " joined the game"));
if(strlen(trim($ev->getJoinMessage())) > 0){ if(strlen(trim($ev->getJoinMessage())) > 0){
$this->server->broadcastMessage($ev->getJoinMessage()); $this->server->broadcastMessage($ev->getJoinMessage());
} }
@ -1117,17 +1117,17 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$this->server->getPluginManager()->callEvent($ev = new PlayerPreLoginEvent($this, "Plugin reason")); $this->server->getPluginManager()->callEvent($ev = new PlayerPreLoginEvent($this, "Plugin reason"));
if($ev->isCancelled()){ if($ev->isCancelled()){
$this->close($ev->getKickMessage(), "Plugin reason"); $this->close("", $ev->getKickMessage());
return; return;
} }
if(!$this->server->isWhitelisted(strtolower($this->getName()))){ if(!$this->server->isWhitelisted(strtolower($this->getName()))){
$this->close($this->username . " has left the game", "Server is white-listed"); $this->close(TextFormat::YELLOW . $this->username . " has left the game", "Server is white-listed");
return; return;
}elseif($this->server->getNameBans()->isBanned(strtolower($this->getName())) or $this->server->getIPBans()->isBanned($this->getAddress())){ }elseif($this->server->getNameBans()->isBanned(strtolower($this->getName())) or $this->server->getIPBans()->isBanned($this->getAddress())){
$this->close($this->username . " has left the game", "You are banned"); $this->close(TextFormat::YELLOW . $this->username . " has left the game", "You are banned");
return; return;
} }
@ -1142,7 +1142,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
foreach($this->server->getOnlinePlayers() as $p){ foreach($this->server->getOnlinePlayers() as $p){
if($p !== $this and strtolower($p->getName()) === strtolower($this->getName())){ if($p !== $this and strtolower($p->getName()) === strtolower($this->getName())){
if($p->kick("logged in from another location") === false){ if($p->kick("logged in from another location") === false){
$this->close($this->getName() . " has left the game", "Already logged in"); $this->close(TextFormat::YELLOW . $this->getName() . " has left the game", "Logged in from another location");
return; return;
}else{ }else{
@ -1173,7 +1173,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
} }
if(!($nbt instanceof Compound)){ if(!($nbt instanceof Compound)){
$this->close($this->username . " has left the game", "invalid data"); $this->close(TextFormat::YELLOW . $this->username . " has left the game", "Invalid data");
return; return;
} }
@ -1192,7 +1192,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$this->server->getPluginManager()->callEvent($ev = new PlayerLoginEvent($this, "Plugin reason")); $this->server->getPluginManager()->callEvent($ev = new PlayerLoginEvent($this, "Plugin reason"));
if($ev->isCancelled()){ if($ev->isCancelled()){
$this->close($ev->getKickMessage(), "Plugin reason"); $this->close(TextFormat::YELLOW . $this->username . " has left the game", $ev->getKickMessage());
return; return;
} }

2
src/pocketmine/Server.php
View File

@ -1635,7 +1635,7 @@ class Server{
$this->pluginManager->disablePlugins(); $this->pluginManager->disablePlugins();
foreach($this->players as $player){ foreach($this->players as $player){
$player->close($player->getName() . " has left the game", $this->getProperty("settings.shutdown-message", "Server closed")); $player->close(TextFormat::YELLOW . $player->getName() . " has left the game", $this->getProperty("settings.shutdown-message", "Server closed"));
} }
foreach($this->getLevels() as $level){ foreach($this->getLevels() as $level){

3
src/pocketmine/level/Level.php
View File

@ -62,6 +62,7 @@ use pocketmine\tile\Spawnable;
use pocketmine\tile\Tile; use pocketmine\tile\Tile;
use pocketmine\utils\Cache; use pocketmine\utils\Cache;
use pocketmine\utils\ReversePriorityQueue; use pocketmine\utils\ReversePriorityQueue;
use pocketmine\utils\TextFormat;
use raklib\Binary; use raklib\Binary;
@ -237,7 +238,7 @@ class Level implements ChunkManager, Metadatable{
$defaultLevel = $this->server->getDefaultLevel(); $defaultLevel = $this->server->getDefaultLevel();
foreach($this->getPlayers() as $player){ foreach($this->getPlayers() as $player){
if($this === $defaultLevel or $defaultLevel === null){ if($this === $defaultLevel or $defaultLevel === null){
$player->close($player->getName() . " has left the game", "forced default level unload"); $player->close(TextFormat::YELLOW . $player->getName() . " has left the game", "Forced default level unload");
}elseif($defaultLevel instanceof Level){ }elseif($defaultLevel instanceof Level){
$player->teleport($this->server->getDefaultLevel()->getSafeSpawn()); $player->teleport($this->server->getDefaultLevel()->getSafeSpawn());
} }

3
src/pocketmine/network/RakLibInterface.php
View File

@ -77,6 +77,7 @@ use pocketmine\network\protocol\UpdateBlockPacket;
use pocketmine\network\protocol\UseItemPacket; use pocketmine\network\protocol\UseItemPacket;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\Server; use pocketmine\Server;
use pocketmine\utils\TextFormat;
use raklib\protocol\EncapsulatedPacket; use raklib\protocol\EncapsulatedPacket;
use raklib\RakLib; use raklib\RakLib;
use raklib\server\RakLibServer; use raklib\server\RakLibServer;
@ -118,7 +119,7 @@ class RakLibInterface implements ServerInstance, SourceInterface{
$this->identifers->detach($player); $this->identifers->detach($player);
unset($this->players[$identifier]); unset($this->players[$identifier]);
unset($this->identifiersACK[$identifier]); unset($this->identifiersACK[$identifier]);
$player->close($player->getName() . " has left the game", $reason); $player->close(TextFormat::YELLOW . $player->getName() . " has left the game", $reason);
} }
} }