Variable renamed to conform with json

src/engine/net/client/handlers/RepairMsgHandler.java

@@ -85,7 +85,7 @@ public class RepairMsgHandler extends AbstractClientMsgHandler {
 
             //make sure item is damaged and not destroyed
 
-            short dur = (short) toRepair.durabilityCurrent;
+            short dur = (short) toRepair.combat_health_current;
             short max = (short) toRepair.template.item_health_full;
 
             //account for durability modifications
@@ -95,7 +95,7 @@ public class RepairMsgHandler extends AbstractClientMsgHandler {
 
             if (dur >= max || dur < 1) {
                 //redundancy message to clear item from window in client
-                toRepair.setDurabilityCurrent(max);
+                toRepair.setCombat_health_current(max);
                 repairMsg.setupRepairAck(max - dur);
                 dispatch = Dispatch.borrow(player, repairMsg);
                 DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
@@ -142,7 +142,7 @@ public class RepairMsgHandler extends AbstractClientMsgHandler {
 
             //repair the item
 
-            toRepair.setDurabilityCurrent(max);
+            toRepair.setCombat_health_current(max);
 
             //send repair msg
 

src/engine/net/client/handlers/VendorSellMsgHandler.java

@@ -108,7 +108,7 @@ public class VendorSellMsgHandler extends AbstractClientMsgHandler {
                 cost = sell.template.item_value;
 
                 //apply damaged value reduction
-                float damagedModifier = sell.durabilityCurrent / sell.template.item_health_full;
+                float damagedModifier = sell.combat_health_current / sell.template.item_health_full;
                 cost *= damagedModifier;
 
                 float bargain = player.getBargain();