diff --git a/src/engine/objects/Mine.java b/src/engine/objects/Mine.java
index f497de81..5d4819ca 100644
--- a/src/engine/objects/Mine.java
+++ b/src/engine/objects/Mine.java
@@ -118,30 +118,10 @@ public class Mine extends AbstractGameObject {
         Building mineTower = BuildingManager.getBuilding(this.buildingID);
         mineTower.setMaxHitPoints(5000 * this.capSize);
         mineTower.setCurrentHitPoints((float)5000 * this.capSize);
-        setLiveTime(this);
         //add a comment
     }
 
-    public static void setLiveTime(Mine mine){
-        if(EuroMines.size() < 7){
-            EuroMines.add(mine);
-        } else if(ChinaMines.size() < 14){
-            ChinaMines.add(mine);
-        } else{
-            AmericaMines.add(mine);
-        }
-        if(EuroMines.size() == 7){
-            SetEuroTimes();
-        }
-        if(ChinaMines.size() == 14){
-            SetChinaTimes();
-        }
-        if(AmericaMines.size() == 14){
-            SetAmericaTimes();
-        }
-    }
-
-    public static void SetEuroTimes(){
+    public static void SetTimes(){
         EuroMines.get(0).liveTime = 12;
         EuroMines.get(1).liveTime = 13;
         EuroMines.get(2).liveTime = 14;
@@ -149,8 +129,6 @@ public class Mine extends AbstractGameObject {
         EuroMines.get(4).liveTime = 15;
         EuroMines.get(5).liveTime = 15;
         EuroMines.get(6).liveTime = 16;
-    }
-    public static void SetChinaTimes(){
         ChinaMines.get(0).liveTime = 4;
         ChinaMines.get(0).liveTime = 5;
         ChinaMines.get(0).liveTime = 6;
@@ -165,8 +143,6 @@ public class Mine extends AbstractGameObject {
         ChinaMines.get(0).liveTime = 10;
         ChinaMines.get(0).liveTime = 11;
         ChinaMines.get(0).liveTime = 12;
-    }
-    public static void SetAmericaTimes(){
         ChinaMines.get(0).liveTime = 14;
         ChinaMines.get(0).liveTime = 15;
         ChinaMines.get(0).liveTime = 16;
@@ -234,8 +210,44 @@ public class Mine extends AbstractGameObject {
             for (Mine mine : serverMines) {
                 Mine.mineMap.put(mine, mine.buildingID);
                 Mine.towerMap.put(mine.buildingID, mine);
-            }
 
+            }
+            ChinaMines.add(serverMines.get(0));
+            AmericaMines.add(serverMines.get(1));
+            EuroMines.add(serverMines.get(2));
+            ChinaMines.add(serverMines.get(3));
+            AmericaMines.add(serverMines.get(4));
+            EuroMines.add(serverMines.get(5));
+            ChinaMines.add(serverMines.get(6));
+            AmericaMines.add(serverMines.get(7));
+            EuroMines.add(serverMines.get(8));
+            ChinaMines.add(serverMines.get(9));
+            AmericaMines.add(serverMines.get(10));
+            EuroMines.add(serverMines.get(11));
+            ChinaMines.add(serverMines.get(12));
+            AmericaMines.add(serverMines.get(13));
+            EuroMines.add(serverMines.get(14));
+            ChinaMines.add(serverMines.get(15));
+            AmericaMines.add(serverMines.get(16));
+            EuroMines.add(serverMines.get(17));
+            ChinaMines.add(serverMines.get(18));
+            AmericaMines.add(serverMines.get(19));
+            EuroMines.add(serverMines.get(20));
+            ChinaMines.add(serverMines.get(21));
+            AmericaMines.add(serverMines.get(22));
+            ChinaMines.add(serverMines.get(23));
+            AmericaMines.add(serverMines.get(24));
+            ChinaMines.add(serverMines.get(25));
+            AmericaMines.add(serverMines.get(26));
+            ChinaMines.add(serverMines.get(27));
+            AmericaMines.add(serverMines.get(28));
+            ChinaMines.add(serverMines.get(29));
+            AmericaMines.add(serverMines.get(30));
+            ChinaMines.add(serverMines.get(31));
+            AmericaMines.add(serverMines.get(32));
+            ChinaMines.add(serverMines.get(33));
+            AmericaMines.add(serverMines.get(34));
+            SetTimes();
         } catch (Exception e) {
             e.printStackTrace();
         }