Merge pull request #39 from ataranlen/1.76-dev

Fix an issue with Quarry upgrades not going through.
ataranlen · Feb 24, 2016 · 24deb16 · 24deb16
2 parents 72d8d77 + 26ef842
commit 24deb16
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 5 deletions.
diff --git a/civcraft/bin/com/avrgaming/civcraft/components/ConsumeLevelComponent.class b/civcraft/bin/com/avrgaming/civcraft/components/ConsumeLevelComponent.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/config/ConfigTownUpgrade.class b/civcraft/bin/com/avrgaming/civcraft/config/ConfigTownUpgrade.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/threading/tasks/QuarryAsyncTask.class b/civcraft/bin/com/avrgaming/civcraft/threading/tasks/QuarryAsyncTask.class
diff --git a/civcraft/bin/plugin.yml b/civcraft/bin/plugin.yml
@@ -1,7 +1,7 @@
 name: CivCraft
 main: com.avrgaming.civcraft.main.CivCraft
 softdepends: [TitleAPI]
-version: 1.76
+version: 1.76.1
 
 commands:
     town:

diff --git a/civcraft/data/structures.yml b/civcraft/data/structures.yml
@@ -579,7 +579,7 @@ structures:
           value: '25.0'
 
   - id: s_capitol
-    template: capitol #XXX misspelt =( but its easier to leave it that way.
+    template: capitol
     template_y_shift: 0
     displayName: Capitol
     require_tech:

diff --git a/civcraft/src/com/avrgaming/civcraft/config/ConfigTownUpgrade.java b/civcraft/src/com/avrgaming/civcraft/config/ConfigTownUpgrade.java
@@ -262,9 +262,9 @@ public void processAction(Town town) throws CivException {
 			}
 			break;
 		case "set_quarry_level":
-			if (town.saved_trommel_level < Integer.valueOf(args[1].trim()))
+			if (town.saved_quarry_level < Integer.valueOf(args[1].trim()))
 			{
-				town.saved_trommel_level = Integer.valueOf(args[1].trim());
+				town.saved_quarry_level = Integer.valueOf(args[1].trim());
 			}
 			boolean didUpgradeQuarry = false;
 			for (Structure structure : town.getStructures()) {

diff --git a/civcraft/src/plugin.yml b/civcraft/src/plugin.yml
@@ -1,7 +1,7 @@
 name: CivCraft
 main: com.avrgaming.civcraft.main.CivCraft
 softdepends: [TitleAPI]
-version: 1.76
+version: 1.76.1
 
 commands:
     town: