From cef574015ff2e62a20cf702e9e2ae1dc478d6234 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Pueyo Date: Sat, 8 Dec 2012 17:17:41 +0100 Subject: [PATCH] Ban-IP fix + message --- classes/PocketMinecraftServer.class.php | 6 ++++++ server.php | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/classes/PocketMinecraftServer.class.php b/classes/PocketMinecraftServer.class.php index 4dd58978..8404b680 100644 --- a/classes/PocketMinecraftServer.class.php +++ b/classes/PocketMinecraftServer.class.php @@ -231,6 +231,12 @@ class PocketMinecraftServer{ switch($packet["pid"]){ case 0x02: if(in_array($packet["ip"], $this->bannedIPs)){ + $this->send(0x1c, array( + $data[0], + $this->serverID, + MAGIC, + $this->serverType. $this->name . " [You're banned]", + ), false, $packet["ip"], $packet["port"]); break; } if(!isset($this->custom["times_".$CID])){ diff --git a/server.php b/server.php index 3c668abd..45f29389 100644 --- a/server.php +++ b/server.php @@ -187,12 +187,12 @@ function serverCommands(){ case "remove": $ip = trim(implode($params)); $new = array(); - foreach(explode(file_get_contents(FILE_PATH."banned-ips.txt")) as $i){ + foreach(explode("\n", str_replace(array("\r","\t"), "", file_get_contents(FILE_PATH."banned-ips.txt"))) as $i){ if($i == $ip){ console("[INFO] IP \"$ip\" removed from ban list"); continue; } - $new[$ip] = $ip; + $new[$i] = $i; } file_put_contents(FILE_PATH."banned-ips.txt", implode("\r\n", $new)); loadConfig(); @@ -282,7 +282,7 @@ function serverCommands(){ case "remove": $user = trim(implode(" ", $params)); $new = array(); - foreach(explode(file_get_contents(FILE_PATH."white-list.txt")) as $u){ + foreach(explode("\n", str_replace(array("\r","\t"), "", file_get_contents(FILE_PATH."white-list.txt"))) as $u){ if($u == $user){ console("[INFO] Player \"$user\" removed from white-list"); continue;