Paper/patches/server/0575-Configurable-door-breaking-difficulty.patch

63 lines
3.5 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sun, 3 Jan 2021 22:27:43 -0800
Subject: [PATCH] Configurable door breaking difficulty
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index b289f6eb973d1ddf6cf913a0e995f899b9ecd041..e8b3ce26f289b961e2763be3b033c611bdfe583b 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
2021-11-29 12:55:13 +01:00
@@ -109,6 +109,25 @@ public class PaperWorldConfig {
2021-06-11 14:02:28 +02:00
disableMobSpawnerSpawnEggTransformation = getBoolean("game-mechanics.disable-mob-spawner-spawn-egg-transformation", disableMobSpawnerSpawnEggTransformation);
}
2021-11-29 12:55:13 +01:00
+ public List<net.minecraft.world.Difficulty> zombieBreakDoors;
+ public List<net.minecraft.world.Difficulty> vindicatorBreakDoors;
2021-06-11 14:02:28 +02:00
+ private void setupEntityBreakingDoors() {
+ zombieBreakDoors = getEnumList(
+ "door-breaking-difficulty.zombie",
2021-11-29 12:55:13 +01:00
+ java.util.Arrays.stream(net.minecraft.world.Difficulty.values())
+ .filter(net.minecraft.world.entity.monster.Zombie.DOOR_BREAKING_PREDICATE)
2021-06-11 14:02:28 +02:00
+ .collect(Collectors.toList()),
2021-11-29 12:55:13 +01:00
+ net.minecraft.world.Difficulty.class
2021-06-11 14:02:28 +02:00
+ );
+ vindicatorBreakDoors = getEnumList(
+ "door-breaking-difficulty.vindicator",
2021-11-29 12:55:13 +01:00
+ java.util.Arrays.stream(net.minecraft.world.Difficulty.values())
+ .filter(net.minecraft.world.entity.monster.Vindicator.DOOR_BREAKING_PREDICATE)
2021-06-11 14:02:28 +02:00
+ .collect(Collectors.toList()),
2021-11-29 12:55:13 +01:00
+ net.minecraft.world.Difficulty.class
2021-06-11 14:02:28 +02:00
+ );
+ }
+
public short keepLoadedRange;
private void keepLoadedRange() {
keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
2021-11-24 18:58:26 +01:00
index ddf77350b1762be523eeed760669bc33f634109f..85294ab8eaa654be9358f489cec7e1ae665fc34b 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
@@ -195,7 +195,7 @@ public class Vindicator extends AbstractIllager {
2021-06-11 14:02:28 +02:00
static class VindicatorBreakDoorGoal extends BreakDoorGoal {
2021-06-11 14:02:28 +02:00
public VindicatorBreakDoorGoal(Mob mob) {
- super(mob, 6, Vindicator.DOOR_BREAKING_PREDICATE);
+ super(mob, 6, com.google.common.base.Predicates.in(mob.level.paperConfig.vindicatorBreakDoors)); // Paper
this.setFlags(EnumSet.of(Goal.Flag.MOVE));
}
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
2021-11-24 18:58:26 +01:00
index 64222cced10e87438ee3ada26aead0284649be78..e72e9b748b3f3e34baddf01366c703efba50c67c 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
2021-11-24 18:58:26 +01:00
@@ -97,7 +97,7 @@ public class Zombie extends Monster {
2021-06-11 14:02:28 +02:00
public Zombie(EntityType<? extends Zombie> type, Level world) {
super(type, world);
- this.breakDoorGoal = new BreakDoorGoal(this, Zombie.DOOR_BREAKING_PREDICATE);
+ this.breakDoorGoal = new BreakDoorGoal(this, com.google.common.base.Predicates.in(world.paperConfig.zombieBreakDoors)); // Paper
}
public Zombie(Level world) {