Fixed queue related issues (#314)

jkroepke · Aug 11, 2017 · bda0e53 · bda0e53
1 parent eede25b
commit bda0e53
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/includes/pages/game/ShowBuildingsPage.class.php b/includes/pages/game/ShowBuildingsPage.class.php
@@ -36,9 +36,10 @@ private function CancelBuildingFromQueue()
 		}
 
 		$Element             	= $CurrentQueue[0][0];
+        $BuildLevel          	= $CurrentQueue[0][1];
 		$BuildMode          	= $CurrentQueue[0][4];
 
-		$costResources			= BuildFunctions::getElementPrice($USER, $PLANET, $Element, $BuildMode == 'destroy');
+		$costResources			= BuildFunctions::getElementPrice($USER, $PLANET, $Element, $BuildMode == 'destroy', $BuildLevel);
 
 		if(isset($costResources[901])) { $PLANET[$resource[901]]	+= $costResources[901]; }
 		if(isset($costResources[902])) { $PLANET[$resource[902]]	+= $costResources[902]; }
@@ -55,7 +56,7 @@ private function CancelBuildingFromQueue()
 				if($Element == $ListIDArray[0])
 					continue;
 
-				$BuildEndTime       += BuildFunctions::getBuildingTime($USER, $PLANET, $ListIDArray[0], NULL, $ListIDArray[4] == 'destroy');
+				$BuildEndTime       += BuildFunctions::getBuildingTime($USER, $PLANET, $ListIDArray[0], $costResources, $ListIDArray[4] == 'destroy');
 				$ListIDArray[3]		= $BuildEndTime;
 				$NewQueueArray[]	= $ListIDArray;					
 			}
@@ -104,7 +105,7 @@ private function RemoveBuildingFromQueue($QueueID)
 				if($Element == $ListIDArray[0] || empty($ListIDArray[0]))
 					continue;
 
-				$BuildEndTime       += BuildFunctions::getBuildingTime($USER, $PLANET, $ListIDArray[0]);
+				$BuildEndTime       += BuildFunctions::getBuildingTime($USER, $PLANET, $ListIDArray[0], NULL, $ListIDArray[4] == 'destroy', $ListIDArray[2]);
 				$ListIDArray[3]		= $BuildEndTime;
 				$NewQueueArray[]	= $ListIDArray;				
 			}

diff --git a/includes/pages/game/ShowResearchPage.class.php b/includes/pages/game/ShowResearchPage.class.php
@@ -58,7 +58,7 @@ private function CancelBuildingFromQueue()
 		$db = Database::get();
 
 		$elementId		= $USER['b_tech_id'];
-		$costResources	= BuildFunctions::getElementPrice($USER, $PLANET, $elementId);
+		$costResources	= BuildFunctions::getElementPrice($USER, $PLANET, $elementId, false, $PLANET[$elementId] + 1);
 
 		if($PLANET['id'] == $USER['b_tech_planet'])
 		{
@@ -121,7 +121,7 @@ private function CancelBuildingFromQueue()
 					$CPLANET		= $PLANET;
 
 				$CPLANET[$resource[31].'_inter']	= $this->ecoObj->getNetworkLevel($USER, $CPLANET);
-				$BuildEndTime       				+= BuildFunctions::getBuildingTime($USER, $CPLANET, NULL, $ListIDArray[0]);
+				$BuildEndTime       				+= BuildFunctions::getBuildingTime($USER, $CPLANET, $ListIDArray[0], NULL, false, $ListIDArray[1]);
 				$ListIDArray[3]						= $BuildEndTime;
 				$NewCurrentQueue[]					= $ListIDArray;				
 			}