diff --git a/src/engine/net/client/ClientMessagePump.java b/src/engine/net/client/ClientMessagePump.java index d72b0c47..35cb514a 100644 --- a/src/engine/net/client/ClientMessagePump.java +++ b/src/engine/net/client/ClientMessagePump.java @@ -1631,8 +1631,8 @@ public class ClientMessagePump implements NetMsgHandler { if (toRepair == null) return; - if (toRepair.getItemBase().isGlass()) - return; + //if (toRepair.getItemBase().isGlass()) + // return; //make sure item is in player's inventory or equipment if (!itemMan.inventoryContains(toRepair) && !itemMan.equippedContains(toRepair)) @@ -1654,6 +1654,12 @@ public class ClientMessagePump implements NetMsgHandler { } //TODO get cost to repair int cost = (int) ((max - dur) * 80.1); + + //glass costs 3x as much to repair + if (toRepair.getItemBase().isGlass()){ + cost *= 3; + } + Building b = (!npc.isStatic()) ? npc.getBuilding() : null; if (b != null) diff --git a/src/engine/workthreads/HourlyJobThread.java b/src/engine/workthreads/HourlyJobThread.java index 866c1000..22930324 100644 --- a/src/engine/workthreads/HourlyJobThread.java +++ b/src/engine/workthreads/HourlyJobThread.java @@ -94,12 +94,11 @@ public class HourlyJobThread implements Runnable { // This will reset at 1am after the last mine // window closes. - if (LocalDateTime.now().getHour() == MINE_LATE_WINDOW + 1) { + if (LocalDateTime.now().getHour() == 3) { for (Mine mine : Mine.getMines()) { - - if (mine.wasClaimed == true) - mine.wasClaimed = false; + mine.wasClaimed = false; + mine.hasProduced = false; } }