xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-09-17 15:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: hero can be killed even if unit not present anywhere on the map

Browse Source 
#371
This commit is contained in:
Martin Ambrus
2017-11-25 01:21:28 +01:00
parent b9cdba81fb
commit 571fb9019f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Admin/function.php
+4 -4
View File
@@ -86,10 +86,10 @@ class funct {
if (!$killhero){ if (!$killhero){
$killhero=$database->FindHeroInOasis($get['uid']); $killhero=$database->FindHeroInOasis($get['uid']);
} }
if ($killhero) {
$database->KillMyHero($get['uid']); $database->KillMyHero($get['uid']);
$error="&kc=1"; $error="&kc=1";
}else $error="&e=1";
header("Location: admin.php?p=player&uid=".$get['uid'].$error); header("Location: admin.php?p=player&uid=".$get['uid'].$error);
exit; exit;
case "reviveHero": case "reviveHero":
GameEngine/Database.php
+1 -1
View File
@@ -7533,7 +7533,7 @@ References:
function KillMyHero($id) { function KillMyHero($id) {
list( $id ) = $this->escape_input( (int) $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 ); return mysqli_query( $this->dblink, $q );
} }