Skip to content
This repository was archived by the owner on Apr 13, 2025. It is now read-only.

Commit 36a18d5

Browse files
committed
fix(mobs/ravager): add missing blocks to griefable list
1 parent 4f48185 commit 36a18d5

2 files changed

Lines changed: 37 additions & 14 deletions

File tree

purpur-server/src/main/java/org/purpurmc/purpur/PurpurConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ public static void init(File configFile) {
7474
commands = new HashMap<>();
7575
commands.put("purpur", new PurpurCommand("purpur"));
7676

77-
version = getInt("config-version", 40);
78-
set("config-version", 40);
77+
version = getInt("config-version", 41);
78+
set("config-version", 41);
7979

8080
readConfig(PurpurConfig.class, null);
8181

purpur-server/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import java.util.ArrayList;
44
import java.util.HashMap;
5+
import java.util.HashSet;
6+
import java.util.Set;
57
import java.util.function.Predicate;
68
import java.util.logging.Level;
79
import net.minecraft.core.registries.BuiltInRegistries;
@@ -2513,18 +2515,39 @@ private void ravagerSettings() {
25132515
ravagerScale = Mth.clamp(getDouble("mobs.ravager.attributes.scale", ravagerScale), 0.0625D, 16.0D);
25142516
ravagerBypassMobGriefing = getBoolean("mobs.ravager.bypass-mob-griefing", ravagerBypassMobGriefing);
25152517
ravagerTakeDamageFromWater = getBoolean("mobs.ravager.takes-damage-from-water", ravagerTakeDamageFromWater);
2516-
getList("mobs.ravager.griefable-blocks", new ArrayList<String>(){{
2517-
add("minecraft:oak_leaves");
2518-
add("minecraft:spruce_leaves");
2519-
add("minecraft:birch_leaves");
2520-
add("minecraft:jungle_leaves");
2521-
add("minecraft:acacia_leaves");
2522-
add("minecraft:dark_oak_leaves");
2523-
add("minecraft:beetroots");
2524-
add("minecraft:carrots");
2525-
add("minecraft:potatoes");
2526-
add("minecraft:wheat");
2527-
}}).forEach(key -> {
2518+
List<String> defaultRavagerGriefableBlocks = List.of(
2519+
"minecraft:oak_leaves",
2520+
"minecraft:spruce_leaves",
2521+
"minecraft:birch_leaves",
2522+
"minecraft:jungle_leaves",
2523+
"minecraft:acacia_leaves",
2524+
"minecraft:cherry_leaves",
2525+
"minecraft:dark_oak_leaves",
2526+
"minecraft:pale_oak_leaves",
2527+
"minecraft:mangrove_leaves",
2528+
"minecraft:azalea_leaves",
2529+
"minecraft:flowering_azalea_leaves",
2530+
"minecraft:wheat",
2531+
"minecraft:carrots",
2532+
"minecraft:potatoes",
2533+
"minecraft:torchflower_crop",
2534+
"minecraft:pitcher_crop",
2535+
"minecraft:beetroots"
2536+
);
2537+
if (PurpurConfig.version < 41) {
2538+
Set<String> set = new HashSet<>();
2539+
getList("mobs.ravager.griefable-blocks", defaultRavagerGriefableBlocks)
2540+
.forEach(key -> set.add(key.toString()));
2541+
set.add("minecraft:cherry_leaves");
2542+
set.add("minecraft:pale_oak_leaves");
2543+
set.add("minecraft:mangrove_leaves");
2544+
set.add("minecraft:azalea_leaves");
2545+
set.add("minecraft:flowering_azalea_leaves");
2546+
set.add("minecraft:torchflower_crop");
2547+
set.add("minecraft:pitcher_crop");
2548+
set("mobs.ravager.griefable-blocks", new ArrayList<>(set));
2549+
}
2550+
getList("mobs.ravager.griefable-blocks", defaultRavagerGriefableBlocks).forEach(key -> {
25282551
Block block = BuiltInRegistries.BLOCK.getValue(ResourceLocation.parse(key.toString()));
25292552
if (!block.defaultBlockState().isAir()) {
25302553
ravagerGriefableBlocks.add(block);

0 commit comments

Comments
 (0)