2021-06-11 12:02:28 +00: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
|
2022-03-01 03:25:13 +00:00
|
|
|
index ab52e655d16dc565cfb890ec8fdb07ce7f68e4cf..797275dd2dc0f7c2ef24311ebdd9659e8b2fdf2f 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2021-11-29 11:55:13 +00:00
|
|
|
@@ -109,6 +109,25 @@ public class PaperWorldConfig {
|
2021-06-11 12:02:28 +00:00
|
|
|
disableMobSpawnerSpawnEggTransformation = getBoolean("game-mechanics.disable-mob-spawner-spawn-egg-transformation", disableMobSpawnerSpawnEggTransformation);
|
|
|
|
}
|
2021-06-14 19:17:47 +00:00
|
|
|
|
2021-11-29 11:55:13 +00:00
|
|
|
+ public List<net.minecraft.world.Difficulty> zombieBreakDoors;
|
|
|
|
+ public List<net.minecraft.world.Difficulty> vindicatorBreakDoors;
|
2021-06-11 12:02:28 +00:00
|
|
|
+ private void setupEntityBreakingDoors() {
|
|
|
|
+ zombieBreakDoors = getEnumList(
|
|
|
|
+ "door-breaking-difficulty.zombie",
|
2021-11-29 11:55:13 +00:00
|
|
|
+ java.util.Arrays.stream(net.minecraft.world.Difficulty.values())
|
|
|
|
+ .filter(net.minecraft.world.entity.monster.Zombie.DOOR_BREAKING_PREDICATE)
|
2021-06-11 12:02:28 +00:00
|
|
|
+ .collect(Collectors.toList()),
|
2021-11-29 11:55:13 +00:00
|
|
|
+ net.minecraft.world.Difficulty.class
|
2021-06-11 12:02:28 +00:00
|
|
|
+ );
|
|
|
|
+ vindicatorBreakDoors = getEnumList(
|
|
|
|
+ "door-breaking-difficulty.vindicator",
|
2021-11-29 11:55:13 +00:00
|
|
|
+ java.util.Arrays.stream(net.minecraft.world.Difficulty.values())
|
|
|
|
+ .filter(net.minecraft.world.entity.monster.Vindicator.DOOR_BREAKING_PREDICATE)
|
2021-06-11 12:02:28 +00:00
|
|
|
+ .collect(Collectors.toList()),
|
2021-11-29 11:55:13 +00:00
|
|
|
+ net.minecraft.world.Difficulty.class
|
2021-06-11 12:02:28 +00:00
|
|
|
+ );
|
|
|
|
+ }
|
2021-06-14 19:17:47 +00:00
|
|
|
+
|
|
|
|
public short keepLoadedRange;
|
|
|
|
private void keepLoadedRange() {
|
|
|
|
keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
|
2021-06-11 12:02:28 +00: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
|
2022-01-01 03:05:42 +00:00
|
|
|
index 920c2101ebbdc07c7fd15903a3d641aa55f8336d..b3a00bff85ade49b476c883350ff3563e1a4b842 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
|
2022-01-01 03:05:42 +00:00
|
|
|
@@ -192,7 +192,7 @@ public class Vindicator extends AbstractIllager {
|
|
|
|
private static class VindicatorBreakDoorGoal extends BreakDoorGoal {
|
2021-06-11 12:02:28 +00: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
|
2022-03-01 03:25:13 +00:00
|
|
|
index dffb315cf21472f306bcc1d9fdcfba441a87b18f..da378373db05f7cf5e655bc76cb58945347d1f32 100644
|
2021-06-11 12:02:28 +00: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 17:58:26 +00:00
|
|
|
@@ -97,7 +97,7 @@ public class Zombie extends Monster {
|
2021-06-11 12:02:28 +00: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) {
|