xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-06-28 00:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

General fixes

Browse Source 
+Fixed a bug that didn't permit to show to the defender "None of your
soldiers returned." under certain circumnstances
+Fixed a bug that showed a wrong report icon if the defender had 0
defences and all attacker's units were trapped/killed during the battle
+Fixed a bug that counted a wrong percentage bonus for the horse
drinking trough
This commit is contained in:
iopietro
2018-06-01 16:24:36 +02:00
parent b12f4d4497
commit b717c0cdf4
3 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Message.php
+11 -16
View File
@@ -316,7 +316,7 @@ class Message {
}
/**
* Not all notices have a corresponding .tpl file but with this function it's like they had it
* Not all notices have a corresponding .tpl file but with this method it's like they have it
*
* @param int $type The type of the report (notice)
* @return int Returns the new report type
@@ -333,19 +333,19 @@ class Message {
case 7:
case 18:
case 20:
case 21: return 1;
case 21: return 1; //General attacking reports
case 11:
case 12:
case 13:
case 14: return 10;
case 14: return 10; //Merchants reports
case 16:
case 17: return 15;
case 17: return 15; //Reinforcements attacked
case 19: return 3;
case 19: return 3; //No troops have returned
case 23: return 22;
case 23: return 22; //Festive reports
}
return $type;
@@ -397,10 +397,9 @@ class Message {
// Vulnerability closed by Shadow
$q = "SELECT Count(*) as Total FROM ".TB_PREFIX."mdata WHERE owner='".$session->uid."' AND time > ".(time() - 60);
$res = mysqli_fetch_array(mysqli_query($database->dblink,$q) or die(mysqli_error($database->dblink). " query ".$q), MYSQLI_ASSOC);
$flood = $res['Total'];
if($flood > 5)
return; //flood
$res = mysqli_fetch_array(mysqli_query($database->dblink,$q), MYSQLI_ASSOC);
if($res['Total'] > 5) return; //flooding prevention
// Vulnerability closed by Shadow
@@ -413,9 +412,7 @@ class Message {
$text = $this->wordCensor($text);
}
if($topic == "") {
$topic = "No subject";
}
if($topic == "") $topic = "No subject";
if(!preg_match('/\[message\]/',$text) && !preg_match('/\[\/message\]/',$text)){
$text = "[message]".$text."[/message]";
@@ -495,9 +492,7 @@ class Message {
if ($security_check) {
$q = "SELECT Count(*) as Total FROM ".TB_PREFIX."mdata WHERE owner='".$session->uid."' AND time > ".(time() - 60);
$res = mysqli_fetch_array(mysqli_query($database->dblink,$q), MYSQLI_ASSOC);
$flood = $res['Total'];
if($flood > 5) return; //flood
if($res['Total'] > 5) return; //flooding prevention
}
// Vulnerability closed by Shadow