Trying to fix integrity

build.gradle

@@ -19,7 +19,7 @@ repositories {
 apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'org.spongepowered.mixin'
 
-version = '2.1.1'
+version = '2.1.2'
 group = 'msifeed.misca'
 archivesBaseName = 'misca'
 

run/config/misca/shared.json

@@ -49,7 +49,7 @@
   "charstate": {
     "globalMiningSpeedModifier": 0.5,
     "integrityRestPerSec": 1.6E-5,
-    "integrityCostPerDamage": 0.1,
+    "integrityCostPerDamage": 1.0,
     "sanityRestPerFood": 1.0,
     "sanityRestPerSpeechChar": 0.001,
     "sanityRestModPerPsySkill": 0.15,

src/main/java/msifeed/misca/charstate/Charstate.java

@@ -15,9 +15,9 @@
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.capabilities.CapabilityManager;
 import net.minecraftforge.event.entity.EntityEvent;
+import net.minecraftforge.event.entity.living.LivingDamageEvent;
 import net.minecraftforge.event.entity.living.LivingEntityUseItemEvent;
 import net.minecraftforge.event.entity.living.LivingEvent;
-import net.minecraftforge.event.entity.living.LivingHurtEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
@@ -92,11 +92,10 @@ public void onPlayerTick(LivingEvent.LivingUpdateEvent event) {
     }
 
     @SubscribeEvent(priority = EventPriority.LOWEST)
-    public void onPlayerHurt(LivingHurtEvent event) {
+    public void onPlayerDamaged(LivingDamageEvent event) {
         if (event.isCanceled() || event.getAmount() < 1) return;
-        if (!(event.getEntity() instanceof EntityPlayer)) return;
         if (event.getEntity().world.isRemote) return;
-        if (event.getSource().canHarmInCreative()) return;
+        if (!(event.getEntity() instanceof EntityPlayer)) return;
 
         final EntityPlayer player = (EntityPlayer) event.getEntityLiving();
         integrityHandler.handleDamage(player, event.getAmount());