From b539f986f84fc1ec91b4c4ddca1e7fb7fbc7b249 Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Thu, 28 Jul 2016 11:50:50 +0200 Subject: Fixed a lot of minor issues. Added configuration for ore values and ore generation. --- src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java | 3 +-- src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/sosnitzka/taiga/traits') diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java b/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java index 29ad56a..dd327ce 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java @@ -34,7 +34,7 @@ public class TraitGarishly extends AbstractTrait { EntityPlayer player = (EntityPlayer) event.getSource().getEntity(); if (event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { - int r = random.nextInt(5); + int r = random.nextInt(6); ItemStack i = null; switch (r) { case 0: @@ -56,7 +56,6 @@ public class TraitGarishly extends AbstractTrait { i = new ItemStack(lignite, random.nextInt(3)); break; } - assert i != null; event.getDrops().add(0, new EntityItem(w, event.getEntity().posX, event.getEntity().posY, event.getEntity().posZ, i)); } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java b/src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java index 48f0c09..b18d361 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java @@ -18,7 +18,6 @@ import slimeknights.tconstruct.library.utils.ToolHelper; public class TraitNatureBound extends AbstractTrait { - private static int chance = 20; public TraitNatureBound() { super("naturebound", TextFormatting.GREEN); @@ -34,6 +33,7 @@ public class TraitNatureBound extends AbstractTrait { @Override public void onUpdate(ItemStack tool, World world, Entity entity, int itemSlot, boolean isSelected) { // *20 because 20 ticks in a second + int chance = 20; if (!world.isRemote && entity instanceof EntityLivingBase && random.nextInt(30 * chance) == 0) { ToolHelper.healTool(tool, random.nextInt(9) + 1, (EntityLivingBase) entity); } -- cgit v1.2.3