Properly use time_from_last_punch for limiting PvP punch damage

[minetest.git] / src / servercommand.cpp

diff --git a/src/servercommand.cpp b/src/servercommand.cpp
index a090039609a1f4fcaa52d732b346704cc3bfc1c8..e2e84bacb000945e4bf2ac08a392217cc8045fea 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<<")"
 
@@ -221,7 +222,11 @@ void cmd_teleport(std::wostringstream &os,
                        <<PP(ctx->player->getPosition()/BS)<<" to "
                        <<PP(dest/BS)<<std::endl;
 
-       ctx->player->setPosition(dest);
+       //ctx->player->setPosition(dest);
+
+       // Use the ServerActiveObject interface of ServerRemotePlayer
+       ServerRemotePlayer *srp = static_cast<ServerRemotePlayer*>(ctx->player);
+       srp->setPos(dest);
        ctx->server->SendMovePlayer(ctx->player);
 
        os<< L"-!- Teleported.";
@@ -250,20 +255,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
        {
@@ -277,6 +281,58 @@ void cmd_banunban(std::wostringstream &os, ServerCommandContext *ctx)
        }
 }
 
+void cmd_setclearpassword(std::wostringstream &os,
+       ServerCommandContext *ctx)
+{
+       if((ctx->privs & PRIV_PASSWORD) == 0)
+       {
+               os<<L"-!- You don't have permission to do that";
+               return;
+       }
+
+       std::string playername;
+       std::wstring password;
+
+       if(ctx->parms[0] == L"setpassword")
+       {
+               if(ctx->parms.size() != 3)
+               {
+                       os<<L"-!- Missing parameter";
+                       return;
+               }
+
+               playername = wide_to_narrow(ctx->parms[1]);
+               password = ctx->parms[2];
+
+               actionstream<<ctx->player->getName()<<" sets password of "
+                       <<playername<<std::endl;
+       }
+       else
+       {
+               // clearpassword
+
+               if(ctx->parms.size() != 2)
+               {
+                       os<<L"-!- Missing parameter";
+                       return;
+               }
+
+               playername = wide_to_narrow(ctx->parms[1]);
+               password = L"";
+
+               actionstream<<ctx->player->getName()<<" clears password of"
+                       <<playername<<std::endl;
+       }
+
+       ctx->server->setPlayerPassword(playername, password);
+
+       std::wostringstream msg;
+       msg<<ctx->player->getName()<<L" changed your password";
+       ctx->server->notifyPlayer(playername.c_str(), msg.str());
+
+       os<<L"-!- Password change for "<<narrow_to_wide(playername)<<" successful";
+}
+
 void cmd_clearobjects(std::wostringstream &os,
        ServerCommandContext *ctx)
 {
@@ -318,9 +374,9 @@ std::wstring processServerCommand(ServerCommandContext *ctx)
        if(ctx->parms.size() == 0 || ctx->parms[0] == L"help")
        {
                os<<L"-!- Available commands: ";
-               os<<L"status privs ";
+               os<<L"me status privs";
                if(privs & PRIV_SERVER)
-                       os<<L"shutdown setting ";
+                       os<<L" shutdown setting clearobjects";
                if(privs & PRIV_SETTIME)
                        os<<L" time";
                if(privs & PRIV_TELEPORT)
@@ -329,6 +385,8 @@ std::wstring processServerCommand(ServerCommandContext *ctx)
                        os<<L" grant revoke";
                if(privs & PRIV_BAN)
                        os<<L" ban unban";
+               if(privs & PRIV_PASSWORD)
+                       os<<L" setpassword clearpassword";
        }
        else if(ctx->parms[0] == L"status")
                cmd_status(os, ctx);
@@ -346,6 +404,8 @@ std::wstring processServerCommand(ServerCommandContext *ctx)
                cmd_teleport(os, ctx);
        else if(ctx->parms[0] == L"ban" || ctx->parms[0] == L"unban")
                cmd_banunban(os, ctx);
+       else if(ctx->parms[0] == L"setpassword" || ctx->parms[0] == L"clearpassword")
+               cmd_setclearpassword(os, ctx);
        else if(ctx->parms[0] == L"me")
                cmd_me(os, ctx);
        else if(ctx->parms[0] == L"clearobjects")