From 0ef6a00aa79f022e5bd56b3f77e6861bbecf6d94 Mon Sep 17 00:00:00 2001
From: OnyxDarkKnight <sor1n.iliutza16@gmail.com>
Date: Thu, 13 Aug 2015 21:12:11 +0100
Subject: Added a new structure, a new curse, achievements, challenges, curses
 entry in the guide; reworked liquids to be tile entities, cleaned the
 structures code, potion code and... you know what? I improved and changed so
 much stuff that I literally forgot what I did...

---
 .../darkknight/jewelrycraft/effects/EffectObsidian.java  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java')

diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java b/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java
index cf409b2..0a7f268 100644
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java
@@ -53,22 +53,23 @@ public class EffectObsidian extends ModifierEffects
     }
     
     @Override
-    public void onPlayerAttacked(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount)
+    public boolean onPlayerAttackedCacellable(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount)
     {
         NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
         if (jewelry instanceof ItemEarrings && (source == DamageSource.anvil || source.damageType.equals("arrow"))){
             if (playerInfo.hasKey("protected")) playerInfo.setInteger("protected", playerInfo.getInteger("protected") + 1);
             else playerInfo.setInteger("protected", 1);
             // Positive && Negative earrings
-            if (playerInfo.getInteger("protected") < 200) playerInfo.setBoolean("negateDamage", true);
+            if (playerInfo.getInteger("protected") < 2000) return true;
             else player.attackEntityFrom(DamageSourceList.weak, player.getHealth() * 3F);
         }
         if (jewelry instanceof ItemBracelet && source == DamageSource.fall){
             if (playerInfo.hasKey("falls")) playerInfo.setInteger("falls", playerInfo.getInteger("falls") + 1);
             else playerInfo.setInteger("falls", 1);
             // Positive bracelet
-            if (playerInfo.getInteger("falls") < 300) playerInfo.setBoolean("negateDamage", true);
+            if (playerInfo.getInteger("falls") < 3000) return true;
         }
+        return false;
     }
     
     public void onPlayerDead(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry)
@@ -79,21 +80,22 @@ public class EffectObsidian extends ModifierEffects
         playerInfo.setInteger("protected", 0);
     }
     
-    public void onEntityAttacked(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount)
+    public boolean onEntityAttackedCacellable(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount)
     {
         NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
         NBTTagCompound enemyData = target.getEntityData();
         // Positive ring
-        if (jewelry instanceof ItemRing && playerInfo.getInteger("strikes") < 200 && !player.worldObj.isRemote){
+        if (jewelry instanceof ItemRing && playerInfo.getInteger("strikes") < 2000 && !player.worldObj.isRemote){
             if (enemyData.getInteger("reAttacked") == 0){
                 if (playerInfo.hasKey("strikes")) playerInfo.setInteger("strikes", playerInfo.getInteger("strikes") + 1);
                 else playerInfo.setInteger("strikes", 1);
                 // Negative ring
                 enemyData.setInteger("reAttacked", enemyData.getInteger("reAttacked") + 1);
-                target.attackEntityFrom(DamageSource.causePlayerDamage(player), amount * 2F);
-                playerInfo.setBoolean("weakDamage", true);
+                target.attackEntityFrom(DamageSource.causePlayerDamage(player), amount * 1.5F);
+                return true;
             }
             if (enemyData.getInteger("reAttacked") == 1) enemyData.setInteger("reAttacked", 0);
         }
+        return false;
     }
 }
-- 
cgit v1.2.3