From 73360b86cd92a04567fb663e55ee3227aa3de749 Mon Sep 17 00:00:00 2001
From: placki <f4meatball@gmail.com>
Date: Thu, 27 Oct 2011 23:17:44 +0200
Subject: [PATCH] "die" server command added

---
 src/server.cpp        | 4 ++++
 src/server.h          | 1 +
 src/servercommand.cpp | 8 ++++++++
 3 files changed, 13 insertions(+)

diff --git a/src/server.cpp b/src/server.cpp
index f2ba398..2239341 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -4272,6 +4272,10 @@ void Server::SendBlocks(float dtime)
 /*
 	Something random
 */
+void Server::KillPlayer(Player *player)
+{	// to consider: in creative or if hp is disabled: just respawn, so inventory is not lost
+	HandlePlayerHP(player,32767);
+}
 
 void Server::HandlePlayerHP(Player *player, s16 damage)
 {
diff --git a/src/server.h b/src/server.h
index cc49b22..b6f6bfe 100644
--- a/src/server.h
+++ b/src/server.h
@@ -432,6 +432,7 @@ public:
 	void BroadcastPlayerClan(u16 clan, const std::string& name); //j
 	void SendClanDeleted(u16 peer_id,u16 clan); //j
 	void BroadcastClanDeleted(u16 clan); //j
+	void KillPlayer(Player *player); //p
 	
 	u64 getPlayerAuthPrivs(const std::string &name)
 	{
diff --git a/src/servercommand.cpp b/src/servercommand.cpp
index 016a043..8a81438 100644
--- a/src/servercommand.cpp
+++ b/src/servercommand.cpp
@@ -339,6 +339,12 @@ void cmd_clanNew(std::wostringstream &os,
 	else os<< L"-!- Error - clan '"<<ctx->parms[1]<<"' NOT added.";
 }
 
+void cmd_die(std::wostringstream &os,
+	ServerCommandContext *ctx)
+{
+	ctx->server->KillPlayer(ctx->player);
+}
+
 //j
 void cmd_clanDelete(std::wostringstream &os,
 	ServerCommandContext *ctx)
@@ -502,6 +508,8 @@ std::wstring processServerCommand(ServerCommandContext *ctx)
 		cmd_me(os, ctx);
 	else if(ctx->parms[0] == L"clearobjects")
 		cmd_clearobjects(os, ctx);
+	else if(ctx->parms[0] == L"die")
+		cmd_die(os, ctx);
 	else if(ctx->parms[0] == L"clan-new")
 	{
 		cmd_clanNew(os, ctx);