Improve glass

[oweals/minetest.git] / src / servercommand.cpp

diff --git a/src/servercommand.cpp b/src/servercommand.cpp
index a090039609a1f4fcaa52d732b346704cc3bfc1c8..3c6868e36d8392818e09999b477ced1b15676fc5 100644 (file)
--- a/src/servercommand.cpp
+++ b/src/servercommand.cpp
@@ -19,6 +19,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "servercommand.h"
 #include "utility.h"
 #include "settings.h"
+#include "main.h" // For g_settings
 
 #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
 
@@ -250,20 +251,19 @@ void cmd_banunban(std::wostringstream &os, ServerCommandContext *ctx)
                        os<<L"-!- No such player";
                        return;
                }
-
-               con::Peer *peer = ctx->server->getPeerNoEx(player->peer_id);
-               if(peer == NULL)
-               {
+               
+               try{
+                       Address address = ctx->server->getPeerAddress(player->peer_id);
+                       std::string ip_string = address.serializeString();
+                       ctx->server->setIpBanned(ip_string, player->getName());
+                       os<<L"-!- Banned "<<narrow_to_wide(ip_string)<<L"|"
+                                       <<narrow_to_wide(player->getName());
+
+                       actionstream<<ctx->player->getName()<<" bans "
+                                       <<player->getName()<<" / "<<ip_string<<std::endl;
+               } catch(con::PeerNotFoundException){
                        dstream<<__FUNCTION_NAME<<": peer was not found"<<std::endl;
-                       return;
                }
-               std::string ip_string = peer->address.serializeString();
-               ctx->server->setIpBanned(ip_string, player->getName());
-               os<<L"-!- Banned "<<narrow_to_wide(ip_string)<<L"|"
-                               <<narrow_to_wide(player->getName());
-
-               actionstream<<ctx->player->getName()<<" bans "
-                               <<player->getName()<<" / "<<ip_string<<std::endl;
        }
        else
        {