Fixed something

3 files changed, 10 insertions, 6 deletions

diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java b/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java
index 91acf66..b0f1228 100644
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java
@@ -25,7 +25,7 @@ public class TraitAnalysing extends AbstractTrait {
     @SubscribeEvent
     public void onXpDrop(LivingExperienceDropEvent event) {
         EntityPlayer player = event.getAttackingPlayer();
-        if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier) && event.getDroppedExperience() >= 0) {
+        if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier) && event.getDroppedExperience() > 0) {
             event.setDroppedExperience(this.getUpdateXP(event.getDroppedExperience()));
         }
 
@@ -34,7 +34,7 @@ public class TraitAnalysing extends AbstractTrait {
     @SubscribeEvent
     public void onBlockBreak(BlockEvent.BreakEvent event) {
         EntityPlayer player = event.getPlayer();
-        if (!event.getWorld().isRemote && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier) && event.getExpToDrop() >= 0) {
+        if (!event.getWorld().isRemote && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier) && event.getExpToDrop() > 0) {
             event.setExpToDrop(this.getUpdateXP(event.getExpToDrop()));
         }
 
diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitBeserk.java b/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java
index 20525b6..f43df72 100644
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitBeserk.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java
@@ -17,12 +17,12 @@ import slimeknights.tconstruct.library.utils.TinkerUtil;
 import slimeknights.tconstruct.library.utils.ToolHelper;
 
 
-public class TraitBeserk extends TraitProgressiveStats {
+public class TraitBerserk extends TraitProgressiveStats {
 
     protected static int TICK_PER_STAT = 8;
 
-    public TraitBeserk() {
-        super(TraitBeserk.class.getSimpleName().toLowerCase().substring(5), TextFormatting.RED);
+    public TraitBerserk() {
+        super(TraitBerserk.class.getSimpleName().toLowerCase().substring(5), TextFormatting.RED);
         MinecraftForge.EVENT_BUS.register(this);
     }
 
diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java
index 25fddc6..d4602a5 100644
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java
@@ -15,6 +15,10 @@ import slimeknights.tconstruct.library.utils.TinkerUtil;
 
 public class TraitDiffuse extends AbstractTrait {
 
+    /**
+     *
+     */
+
     public TraitDiffuse() {
         super("diffuse", TextFormatting.DARK_GRAY);
         MinecraftForge.EVENT_BUS.register(this);
@@ -40,7 +44,7 @@ public class TraitDiffuse extends AbstractTrait {
     }
 
     private float getUpdateXP(int xp) {
-        float exp = random.nextFloat() * random.nextFloat() * random.nextFloat() * (xp + random.nextFloat() * xp);
+        float exp = random.nextFloat() * random.nextFloat() * random.nextFloat() * (1 + random.nextFloat() * xp);
         if (random.nextFloat() <= 0.25)
             return exp;
         else return 0;