Skip to content

Commit 52b5e8c

Browse files
committed
Fix Tree Feller readying on wood stripping
Fixes #5293
1 parent cb34715 commit 52b5e8c

2 files changed

Lines changed: 46 additions & 21 deletions

File tree

Changelog.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ Version 2.2.054
22
Fixed party/admin chat allowing player color code tokens without the 'mcmmo.chat.colors' permission
33
Fixed diminished returns resetting in certain situations when players reconnected
44
Fixed Folia thread-check errors when ranged attacks triggered Taming wolf assist targeting
5+
Fixed right-click wood stripping triggering Tree Feller tool readying on affected blocks
56

67
Version 2.2.053
78
!! -- This build has important fixes for anyone using Paper (or forks of Paper), please read the notes carefully.
@@ -5526,4 +5527,3 @@ Version 0.2
55265527
Version 0.1
55275528

55285529
Releasing my awesome plugin
5529-

src/main/java/com/gmail/nossr50/util/MaterialMapStore.java

Lines changed: 45 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,39 +1449,64 @@ private void fillAbilityBlackList() {
14491449

14501450
private void fillToolBlackList() {
14511451
addCommonToBlackList(toolBlackList);
1452-
// TODO: Organize later...
1453-
toolBlackList.add("stripped_cherry_log");
1454-
toolBlackList.add("stripped_cherry_wood");
1452+
1453+
toolBlackList.add("acacia_log");
14551454
toolBlackList.add("stripped_acacia_log");
1455+
toolBlackList.add("acacia_wood");
14561456
toolBlackList.add("stripped_acacia_wood");
1457+
1458+
toolBlackList.add("bamboo_block");
1459+
toolBlackList.add("stripped_bamboo_block");
1460+
1461+
toolBlackList.add("birch_log");
14571462
toolBlackList.add("stripped_birch_log");
1463+
toolBlackList.add("birch_wood");
14581464
toolBlackList.add("stripped_birch_wood");
1465+
1466+
toolBlackList.add("cherry_log");
1467+
toolBlackList.add("stripped_cherry_log");
1468+
toolBlackList.add("cherry_wood");
1469+
toolBlackList.add("stripped_cherry_wood");
1470+
1471+
toolBlackList.add("crimson_hyphae");
1472+
toolBlackList.add("stripped_crimson_hyphae");
1473+
toolBlackList.add("crimson_stem");
1474+
toolBlackList.add("stripped_crimson_stem");
1475+
1476+
toolBlackList.add("dark_oak_log");
14591477
toolBlackList.add("stripped_dark_oak_log");
1460-
toolBlackList.add("stripped_pale_oak_log");
1478+
toolBlackList.add("dark_oak_wood");
14611479
toolBlackList.add("stripped_dark_oak_wood");
1462-
toolBlackList.add("stripped_pale_oak_wood");
1480+
1481+
toolBlackList.add("jungle_log");
14631482
toolBlackList.add("stripped_jungle_log");
1483+
toolBlackList.add("jungle_wood");
14641484
toolBlackList.add("stripped_jungle_wood");
1465-
toolBlackList.add("stripped_oak_log");
1466-
toolBlackList.add("stripped_oak_wood");
1467-
toolBlackList.add("stripped_spruce_log");
1468-
toolBlackList.add("stripped_spruce_wood");
1469-
toolBlackList.add("mangrove_wood");
1485+
14701486
toolBlackList.add("mangrove_log");
14711487
toolBlackList.add("stripped_mangrove_log");
1472-
toolBlackList.add("acacia_log");
1473-
toolBlackList.add("acacia_wood");
1474-
toolBlackList.add("birch_log");
1475-
toolBlackList.add("birch_wood");
1476-
toolBlackList.add("dark_oak_log");
1477-
toolBlackList.add("pale_oak_log");
1478-
toolBlackList.add("dark_oak_wood");
1479-
toolBlackList.add("pale_oak_wood");
1480-
toolBlackList.add("jungle_log");
1481-
toolBlackList.add("jungle_wood");
1488+
toolBlackList.add("mangrove_wood");
1489+
toolBlackList.add("stripped_mangrove_wood");
1490+
14821491
toolBlackList.add("oak_log");
1492+
toolBlackList.add("stripped_oak_log");
14831493
toolBlackList.add("oak_wood");
1494+
toolBlackList.add("stripped_oak_wood");
1495+
1496+
toolBlackList.add("pale_oak_log");
1497+
toolBlackList.add("stripped_pale_oak_log");
1498+
toolBlackList.add("pale_oak_wood");
1499+
toolBlackList.add("stripped_pale_oak_wood");
1500+
14841501
toolBlackList.add("spruce_log");
1502+
toolBlackList.add("stripped_spruce_log");
1503+
toolBlackList.add("spruce_wood");
1504+
toolBlackList.add("stripped_spruce_wood");
1505+
1506+
toolBlackList.add("warped_hyphae");
1507+
toolBlackList.add("stripped_warped_hyphae");
1508+
toolBlackList.add("warped_stem");
1509+
toolBlackList.add("stripped_warped_stem");
14851510
}
14861511

14871512
public boolean isIntendedToolPickaxe(@NotNull Material material) {

0 commit comments

Comments
 (0)