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

Merge pull request #152 from hdmaniak2/fix-celebration-resource-bug

Browse Source 
Fix celebration resource check using OR instead of AND
This commit is contained in:
Catalin Novgorodschi
2026-04-02 09:30:33 +03:00
committed by GitHub
parent 602797a273 b8144ac6ee
commit a3f5c6f28a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
celebration.php
+2 -2
View File
@@ -20,7 +20,7 @@ if(isset($_GET['newdid'])){
}
if($village->resarray['f'.$_GET['id'].'t'] == 24 and $village->currentcel == 0){
if(!empty($_GET['type']) && $_GET['type'] == 1){
if(6400 < $village->awood || 6650 < $village->aclay || 5940 < $village->airon || 1340 < $village->acrop){
if(6400 <= $village->awood && 6650 <= $village->aclay && 5940 <= $village->airon && 1340 <= $village->acrop){
$endtime = ($sc[$village->resarray['f'.$_GET['id']]]/ SPEED) + time();
$wood = 6400;
$clay = 6650;
@@ -31,7 +31,7 @@ if($village->resarray['f'.$_GET['id'].'t'] == 24 and $village->currentcel == 0){
}
}
elseif(!empty($_GET['type']) && $_GET['type'] == 2){
if(29700 < $village->awood || 33250 < $village->aclay || 32000 < $village->airon || 6700 < $village->acrop){
if(29700 <= $village->awood && 33250 <= $village->aclay && 32000 <= $village->airon && 6700 <= $village->acrop){
$endtime = ($gc[$village->resarray['f'.$_GET['id']]]/ SPEED) + time();
$wood= 29700;
$clay= 33250;