Merge pull request #34 from bearU369/bugfix/harvest

Bugfix to #30
Retera · Apr 15, 2023 · 7804df3 · 7804df3
2 parents e141a69 + f218cee
commit 7804df3
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/.../etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityHarvest.java b/.../etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityHarvest.java
@@ -125,6 +125,10 @@ protected void innerCheckCanTarget(final CSimulation game, final CUnit unit, fin
 			final CUnit targetUnit = (CUnit) target;
 			for (final CAbility ability : targetUnit.getAbilities()) {
 				if (ability instanceof CAbilityGoldMinable) {
+					if(this.goldCapacity <= 0){
+						receiver.mustTargetResources();
+						return;
+					}
 					receiver.targetOk(target);
 					return;
 				}
@@ -140,6 +144,10 @@ else if ((this.carriedResourceType != null) && (ability instanceof CAbilityRetur
 		}
 		else if (target instanceof CDestructable) {
 			if (target.canBeTargetedBy(game, unit, this.treeAttack.getTargetsAllowed())) {
+				if(this.lumberCapacity <= 0){
+					receiver.mustTargetResources();
+					return;
+				}
 				receiver.targetOk(target);
 			}
 			else {