Project cleanup pre merge.

src/engine/objects/Boon.java

@@ -18,47 +18,42 @@ import java.util.ArrayList;
 import java.util.HashMap;
 
 
+public class Boon {
 
-public class Boon  {
-
-	private ShrineType shrineType;
-	private int amount;
-	private int itemBaseID;
-	public static HashMap<Integer,ArrayList<Boon>> GetBoonsForItemBase = new HashMap<>();
+    public static HashMap<Integer, ArrayList<Boon>> GetBoonsForItemBase = new HashMap<>();
+    private ShrineType shrineType;
+    private int amount;
+    private int itemBaseID;
 
 
-	/**
-	 * ResultSet Constructor
-	 */
-	public Boon(ResultSet rs) throws SQLException {
+    /**
+     * ResultSet Constructor
+     */
+    public Boon(ResultSet rs) throws SQLException {
 
-		this.shrineType = ShrineType.valueOf(rs.getString("shrineType"));
-		this.itemBaseID = rs.getInt("itemBaseID");
-		this.amount = rs.getInt("amount");
-	}
+        this.shrineType = ShrineType.valueOf(rs.getString("shrineType"));
+        this.itemBaseID = rs.getInt("itemBaseID");
+        this.amount = rs.getInt("amount");
+    }
 
-	public int getAmount() {
-		return this.amount;
-	}
+    public static void HandleBoonListsForItemBase(int itemBaseID) {
+        ArrayList<Boon> boons = null;
+        boons = DbManager.BoonQueries.GET_BOON_AMOUNTS_FOR_ITEMBASE(itemBaseID);
+        if (boons != null)
+            GetBoonsForItemBase.put(itemBaseID, boons);
+    }
 
-	
+    public int getAmount() {
+        return this.amount;
+    }
 
-	public int getItemBaseID() {
-		return itemBaseID;
-	}
+    public int getItemBaseID() {
+        return itemBaseID;
+    }
+
+    public ShrineType getShrineType() {
+        return shrineType;
+    }
 
 
-	public ShrineType getShrineType() {
-		return shrineType;
-	}
-	
-	
-	public static void HandleBoonListsForItemBase(int itemBaseID){
-		ArrayList<Boon> boons = null;
-		boons = DbManager.BoonQueries.GET_BOON_AMOUNTS_FOR_ITEMBASE(itemBaseID);
-		if (boons != null)
-			GetBoonsForItemBase.put(itemBaseID, boons);
-	}
-
-	
 }