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

fix ally in ndata for attacked oasis

Browse Source
This commit is contained in:
unknown
2012-04-09 23:40:12 +03:00
parent cfb5bd0550
commit 7c2b31b56c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+3 -3
View File
@@ -536,7 +536,7 @@ private function loyaltyRegeneration() {
$to = $database->getMInfo($data['to']); $to = $database->getMInfo($data['to']);
$from = $database->getMInfo($data['from']); $from = $database->getMInfo($data['from']);
$database->addNotice($to['owner'],$to['wref'],$tragetally,$sort_type,''.addslashes($from['name']).' send resources to '.addslashes($to['name']).'',''.$from['owner'].','.$from['wref'].','.$data['wood'].','.$data['clay'].','.$data['iron'].','.$data['crop'].'',$data['endtime']); $database->addNotice($to['owner'],$to['wref'],$targetally,$sort_type,''.addslashes($from['name']).' send resources to '.addslashes($to['name']).'',''.$from['owner'].','.$from['wref'].','.$data['wood'].','.$data['clay'].','.$data['iron'].','.$data['crop'].'',$data['endtime']);
if($from['owner'] != $to['owner']) { if($from['owner'] != $to['owner']) {
$database->addNotice($from['owner'],$to['wref'],$ownally,$sort_type,''.addslashes($from['name']).' send resources to '.addslashes($to['name']).'',''.$from['owner'].','.$from['wref'].','.$data['wood'].','.$data['clay'].','.$data['iron'].','.$data['crop'].'',$data['endtime']); $database->addNotice($from['owner'],$to['wref'],$ownally,$sort_type,''.addslashes($from['name']).' send resources to '.addslashes($to['name']).'',''.$from['owner'].','.$from['wref'].','.$data['wood'].','.$data['clay'].','.$data['iron'].','.$data['crop'].'',$data['endtime']);
} }
@@ -780,12 +780,12 @@ private function loyaltyRegeneration() {
--------------------------------*/ --------------------------------*/
}else{ }else{
$Attacker['id'] = $database->getUserField($database->getVillageField($data['from'],"owner"),"id",0); $Attacker['id'] = $database->getUserField($database->getVillageField($data['from'],"owner"),"id",0);
$Defender['id'] = 2; $Defender['id'] = $database->getUserField($database->getOasisField($data['to'],"owner"),"id",0);
$owntribe = $database->getUserField($database->getVillageField($data['from'],"owner"),"tribe",0); $owntribe = $database->getUserField($database->getVillageField($data['from'],"owner"),"tribe",0);
$targettribe = 4; $targettribe = 4;
$ownally = $database->getUserField($database->getVillageField($data['from'],"owner"),"alliance",0); $ownally = $database->getUserField($database->getVillageField($data['from'],"owner"),"alliance",0);
$targetally = 0; $targetally = $database->getUserField($database->getOasisField($data['to'],"owner"),"alliance",0);
$to = $database->getOMInfo($data['to']); $to = $database->getOMInfo($data['to']);
$from = $database->getMInfo($data['from']); $from = $database->getMInfo($data['from']);
$toF = $database->getOasisV($data['to']); $toF = $database->getOasisV($data['to']);