combat_health_full used from json

src/engine/db/handlers/dbItemHandler.java

@@ -66,7 +66,7 @@ public class dbItemHandler extends dbHandlerBase {
             preparedStatement.setInt(2, toAdd.getTemplateID());
             preparedStatement.setInt(3, (byte) toAdd.chargesRemaining);
             preparedStatement.setInt(4, (short) toAdd.combat_health_current);
-            preparedStatement.setInt(5, (int) toAdd.template.item_health_full);
+            preparedStatement.setInt(5, (int) toAdd.template.combat_health_full);
 
             if (toAdd.getNumOfItems() < 1)
                 preparedStatement.setInt(6, 1);

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

@@ -86,7 +86,7 @@ public class RepairMsgHandler extends AbstractClientMsgHandler {
             //make sure item is damaged and not destroyed
 
             short dur = (short) toRepair.combat_health_current;
-            short max = (short) toRepair.template.item_health_full;
+            short max = (short) toRepair.template.combat_health_full;
 
             //account for durability modifications
 

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.combat_health_current / sell.template.item_health_full;
+                float damagedModifier = sell.combat_health_current / sell.template.combat_health_full;
                 cost *= damagedModifier;
 
                 float bargain = player.getBargain();

src/engine/objects/CharacterItemManager.java

@@ -2333,7 +2333,7 @@ public class CharacterItemManager {
             return;
 
         //don't damage noob gear, hair or beards.
-        if (item.template.item_health_full == 0)
+        if (item.template.combat_health_full == 0)
             return;
 
         if (!item.isCanDestroy())

src/engine/objects/Item.java

@@ -231,7 +231,7 @@ public class Item extends AbstractWorldObject {
         writer.putString(item.name); // Unknown. pad?
         writer.put((byte) 1); // End Datablock byte
 
-        writer.putFloat(item.template.item_health_full);
+        writer.putFloat(item.template.combat_health_full);
         writer.putFloat((float) item.combat_health_current);
 
         writer.put((byte) 1); // End Datablock byte