summaryrefslogtreecommitdiff
path: root/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java
diff options
context:
space:
mode:
authorOnyx <sor1n.iliutza16@gmail.com>2015-12-01 20:55:30 +0000
committerOnyx <sor1n.iliutza16@gmail.com>2015-12-01 20:55:30 +0000
commit01c8701b68986ccfa83e902515716838d6829311 (patch)
treeb21aa78f4df6ca9bac90e2726221114a41f2294a /src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java
parent35da479288f75d6686c64a00e1dc77e7e7fd50e1 (diff)
- Fixed all of the bugs mentioned on github
- Added new config options - Rabbits paw now increases the chance of spawning hearts, rather than itself spawning some - Hearts now have a much lower chance to spawn by default - You can no longer increase your health past 20 hearts (aka double the default health) - The guide now also shows the total number of pages on each tab - A new luck stat has been added to the Curse API - Cleaned up the code a bit (removed unused methods, imports etc) - The displayer's info now has a purple solid color background; the text also has a much closer shadow and now shrinks in height as well as in width when too big - I have modified the potion list to use Mithion's code, credits have been given
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java')
-rw-r--r--src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java
index 0ea08c7..33a765b 100644
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java
@@ -2,6 +2,11 @@ package darkknight.jewelrycraft.effects;
import java.util.Iterator;
import java.util.List;
+import darkknight.jewelrycraft.api.ModifierEffects;
+import darkknight.jewelrycraft.item.ItemBracelet;
+import darkknight.jewelrycraft.item.ItemEarrings;
+import darkknight.jewelrycraft.item.ItemNecklace;
+import darkknight.jewelrycraft.item.ItemRing;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityTNTPrimed;
import net.minecraft.entity.monster.EntityEnderman;
@@ -10,19 +15,10 @@ import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.DamageSource;
-import darkknight.jewelrycraft.api.ModifierEffects;
-import darkknight.jewelrycraft.item.ItemBracelet;
-import darkknight.jewelrycraft.item.ItemEarrings;
-import darkknight.jewelrycraft.item.ItemNecklace;
-import darkknight.jewelrycraft.item.ItemRing;
-import darkknight.jewelrycraft.util.JewelryNBT;
-import darkknight.jewelrycraft.util.PlayerUtils;
-import darkknight.jewelrycraft.util.Variables;
public class EffectEnderPearl extends ModifierEffects
{
@@ -34,7 +30,6 @@ public class EffectEnderPearl extends ModifierEffects
@Override
public void action(ItemStack item, EntityPlayer player, Item jewelry)
{
- NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
if (jewelry instanceof ItemEarrings){
AxisAlignedBB axisalignedbb = player.boundingBox.expand(2.0D, 2.0D, 2.0D);
List list = player.worldObj.getEntitiesWithinAABB(EntityArrow.class, axisalignedbb);
@@ -62,7 +57,6 @@ public class EffectEnderPearl extends ModifierEffects
@Override
public void onPlayerAttacked(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount)
{
- NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
// Positive Necklace
if (jewelry instanceof ItemNecklace && source.getEntity() != null) source.getEntity().attackEntityFrom(source, amount);
// Positive bracelet
@@ -75,8 +69,6 @@ public class EffectEnderPearl extends ModifierEffects
public void onEntityAttacked(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount)
{
- NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
- NBTTagCompound enemyData = target.getEntityData();
if (jewelry instanceof ItemRing){
// Negative ring
if (target instanceof EntityEnderman) player.addPotionEffect(new PotionEffect(Potion.weakness.id, 400, 2, true));