|
|
@ -1660,8 +1660,8 @@ public class ClientMessagePump implements NetMsgHandler { |
|
|
|
if (toRepair == null) |
|
|
|
if (toRepair == null) |
|
|
|
return; |
|
|
|
return; |
|
|
|
|
|
|
|
|
|
|
|
if (toRepair.getItemBase().isGlass()) |
|
|
|
//if (toRepair.getItemBase().isGlass())
|
|
|
|
return; |
|
|
|
// return;
|
|
|
|
|
|
|
|
|
|
|
|
//make sure item is in player's inventory or equipment
|
|
|
|
//make sure item is in player's inventory or equipment
|
|
|
|
if (!itemMan.inventoryContains(toRepair) && !itemMan.equippedContains(toRepair)) |
|
|
|
if (!itemMan.inventoryContains(toRepair) && !itemMan.equippedContains(toRepair)) |
|
|
@ -1683,6 +1683,12 @@ public class ClientMessagePump implements NetMsgHandler { |
|
|
|
} |
|
|
|
} |
|
|
|
//TODO get cost to repair
|
|
|
|
//TODO get cost to repair
|
|
|
|
int cost = (int) ((max - dur) * 80.1); |
|
|
|
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; |
|
|
|
Building b = (!npc.isStatic()) ? npc.getBuilding() : null; |
|
|
|
|
|
|
|
|
|
|
|
if (b != null) |
|
|
|
if (b != null) |
|
|
|