From 571fb9019ff7faa6017a460662c4f9f1944ed827 Mon Sep 17 00:00:00 2001
From: Martin Ambrus <martin@martinambrus.com>
Date: Sat, 25 Nov 2017 01:21:28 +0100
Subject: [PATCH] fix: hero can be killed even if unit not present anywhere on
 the map

#371
---
 GameEngine/Admin/function.php | 8 ++++----
 GameEngine/Database.php       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/GameEngine/Admin/function.php b/GameEngine/Admin/function.php
index 94f7164b..1efe9805 100755
--- a/GameEngine/Admin/function.php
+++ b/GameEngine/Admin/function.php
@@ -86,10 +86,10 @@ class funct {
         if (!$killhero){
             $killhero=$database->FindHeroInOasis($get['uid']);
         }
-        if ($killhero) {
-            $database->KillMyHero($get['uid']);
-            $error="&kc=1";
-        }else $error="&e=1";
+
+        $database->KillMyHero($get['uid']);
+        $error="&kc=1";
+
         header("Location: admin.php?p=player&uid=".$get['uid'].$error);
         exit;
       case "reviveHero":
diff --git a/GameEngine/Database.php b/GameEngine/Database.php
index 5923340a..523d7816 100755
--- a/GameEngine/Database.php
+++ b/GameEngine/Database.php
@@ -7533,7 +7533,7 @@ References:
     function KillMyHero($id) {
         list( $id ) = $this->escape_input( (int) $id );
 
-        $q = "UPDATE " . TB_PREFIX . "hero set dead = 1 where uid = " . $id . " AND dead = 0";
+        $q = "UPDATE " . TB_PREFIX . "hero set dead = 1, intraining = 0, inrevive = 0 where uid = " . $id . " AND dead = 0";
 
         return mysqli_query( $this->dblink, $q );
     }