Explorar o código

Fix issue where Tree Feller affected player-placed blocks. Fixes #507

GJ %!s(int64=12) %!d(string=hai) anos
pai
achega
bbbd12d461

+ 1 - 0
Changelog.txt

@@ -21,6 +21,7 @@ Version 1.3.13-dev
  + Added wooden button to the list of items that shouldn't trigger abilities
  + Added a new feature to fishing. Players will have +10% chance of finding enchanted items when fishing while it's raining
  + Added displaying bonus perks on skill commands
+ = Fixed issue with Tree Feller dropping player-placed blocks
  = Fixed issue with missing default cases from several switch/case statements
  = Fixed issue with Mining using actual skill level rather than max skill level
  = Fixed some issues with static access

+ 7 - 5
src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java

@@ -240,11 +240,13 @@ public class WoodCutting {
             return;
         }
 
-        if (type.equals(Material.LOG) || type.equals(Material.LEAVES)) {
-            toBeFelled.add(currentBlock);
-        }
-        else if (Config.getInstance().getBlockModsEnabled() && (ModChecks.isCustomLogBlock(currentBlock) || ModChecks.isCustomLeafBlock(currentBlock))) {
-            toBeFelled.add(currentBlock);
+        if (!mcMMO.placeStore.isTrue(currentBlock)) {
+            if ((type.equals(Material.LOG) || type.equals(Material.LEAVES))) {
+                toBeFelled.add(currentBlock);
+            }
+            else if (Config.getInstance().getBlockModsEnabled() && (ModChecks.isCustomLogBlock(currentBlock) || ModChecks.isCustomLeafBlock(currentBlock))) {
+                toBeFelled.add(currentBlock);
+            }
         }
 
         Block xPositive = currentBlock.getRelative(1, 0, 0);