Fix the fix fixing the fixes. Fixes #39, #37, #36, #29.

Item damage handled elsewhere. Change axeDamageMode in DT config for more. Apply stone axe return rate to every stack, not to entire event.
Gaelmare · Jan 22, 2021 · 0f12177 · 0f12177
1 parent 67afd83
commit 0f12177
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/main/java/org/labellum/mc/dynamictreestfc/ForgeEventHandler.java b/src/main/java/org/labellum/mc/dynamictreestfc/ForgeEventHandler.java
@@ -24,10 +24,15 @@ public static void onHarvestDrops(BlockEvent.HarvestDropsEvent event)
             ItemStack held = player.getHeldItemMainhand();
             if (OreDictionaryHelper.doesStackMatchOre(held, "axeStone"))
             {
-                event.setDropChance(((float) ConfigTFC.General.TREE.stoneAxeReturnRate));
+                for (ItemStack s: event.getDrops())
+                {
+                    if (OreDictionaryHelper.doesStackMatchOre(s,"logWood"))
+                    {
+                        s.setCount((int) (s.getCount() * ConfigTFC.General.TREE.stoneAxeReturnRate));
+                        //not consolidating partial item stacks on ground
+                    }
+                }
             }
-            if (!player.isCreative())
-                held.damageItem(event.getDrops().size(), player);
         }
     }
 }