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

Merge pull request #80 from armando1980/patch-33

Browse Source 
fix lost troop when target delete by armando
This commit is contained in:
Shadow
2014-01-26 21:42:34 -08:00
parent 0b89c614bf c2d5612a1f
commit 985cd51fb9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+2 -2
View File
@@ -387,7 +387,7 @@ class Automation {
$database->addMovement(4,$movedata['to'],$movedata['from'],$movedata['ref'],$time,$time+$time2); $database->addMovement(4,$movedata['to'],$movedata['from'],$movedata['ref'],$time,$time+$time2);
$database->setMovementProc($movedata['moveid']); $database->setMovementProc($movedata['moveid']);
} }
$q = "DELETE FROM ".TB_PREFIX."movement where `from` = ".$village; $q = "DELETE FROM ".TB_PREFIX."movement where proc = 0 AND ((`to` = $village AND sort_type=4) OR (`from` = $village AND sort_type=3))";
$database->query($q); $database->query($q);
$getprisoners = $database->getPrisoners($village); $getprisoners = $database->getPrisoners($village);
foreach($getprisoners as $pris) { foreach($getprisoners as $pris) {
@@ -2980,7 +2980,7 @@ $wallimg = "<img src=\"".GP_LOCATE."img/g/g3".$targettribe."Icon.gif\" height=\"
$database->query($q); $database->query($q);
$q = "DELETE FROM ".TB_PREFIX."raidlist where towref = $wref"; $q = "DELETE FROM ".TB_PREFIX."raidlist where towref = $wref";
$database->query($q); $database->query($q);
$q = "DELETE FROM ".TB_PREFIX."movement where proc = 0 AND ((`from` = $wref AND `to` = $wref) OR (`from` = $wref AND sort_type=3))"; $q = "DELETE FROM ".TB_PREFIX."movement where proc = 0 AND ((`to` = $wref AND sort_type=4) OR (`from` = $wref AND sort_type=3))";
$database->query($q); $database->query($q);
$getmovement = $database->getMovement(3,$wref,1); $getmovement = $database->getMovement(3,$wref,1);