From 6e097a5056ad343271e21109f593f7cb77e4667e Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 5 Sep 2019 20:11:13 -0400 Subject: More affix work, and some other cleanups --- .../darkknight/jewelrycraft/curses/CurseDoubleDown.java | 9 +++++++-- .../darkknight/jewelrycraft/curses/CurseHumbleBundle.java | 13 ++++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/curses') diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseDoubleDown.java b/src/main/java/darkknight/jewelrycraft/curses/CurseDoubleDown.java index b39f1c9..97b4406 100755 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseDoubleDown.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseDoubleDown.java @@ -9,6 +9,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingAttackEvent; +import net.minecraftforge.event.entity.living.LivingHurtEvent; public class CurseDoubleDown extends Curse { public CurseDoubleDown(String name, int txtID, String pack) { @@ -21,7 +22,9 @@ public class CurseDoubleDown extends Curse { return; // Don't stack double down } - player.attackEntityFrom(DamageSourceList.doubleDown, event.ammount); + if (!world.isRemote) { + player.attackEntityFrom(DamageSourceList.doubleDown, event.ammount); + } } @Override @@ -30,7 +33,9 @@ public class CurseDoubleDown extends Curse { return; // Don't stack double down } - target.attackEntityFrom(DamageSourceList.doubleDown, event.ammount); + if (!world.isRemote) { + target.attackEntityFrom(DamageSourceList.doubleDown, event.ammount); + } } @Override diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java b/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java index 41219f2..2818d88 100755 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java @@ -37,18 +37,25 @@ public class CurseHumbleBundle extends Curse { @Override public void onBlockItemsDrop(EntityPlayer player, BlockEvent.HarvestDropsEvent event) { for (ItemStack item : event.drops) { - ItemStack drop = item.copy(); + if (item.isStackable()) { + item.stackSize = Math.min(item.stackSize + 1, item.getMaxStackSize()); + } else { + ItemStack drop = item.copy(); - if (drop.getItem() != Item.getItemFromBlock(event.block)) - dropItem(event.world, event.x, event.y, event.z, drop); + if (drop.getItem() != Item.getItemFromBlock(event.block)) { + dropItem(event.world, event.x, event.y, event.z, drop); + } + } } } public void dropItem(World world, double x, double y, double z, ItemStack stack) { EntityItem entityitem = new EntityItem(world, x + 0.5D, y + 0.5D, z + 0.5D, stack); + entityitem.motionX = 0; entityitem.motionZ = 0; entityitem.motionY = 0.11000000298023224D; + world.spawnEntityInWorld(entityitem); } -- cgit v1.2.3