Add hoe tilling options

This commit is contained in:
William Blake Galbreath
2021-07-02 21:09:45 -05:00
parent c0244ecd2e
commit 1a325f68dc
181 changed files with 845 additions and 620 deletions

View File

@@ -122,17 +122,22 @@ index 862553e98a7237d39a26036c615b9cbd001bd3bf..d11b463548b847382a22fdf50496b186
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..5bc7d1d72847fc200a5bcd19f083e45805546aeb
index 0000000000000000000000000000000000000000..1d76057b1b2dc9f0fc8e3fe5a5f6bfee23128007
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,130 @@
@@ -0,0 +1,157 @@
+package net.pl3x.purpur;
+
+import co.aikar.timings.TimingsManager;
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.entity.EntityDimensions;
+import net.minecraft.world.entity.EntityType;
+import net.pl3x.purpur.command.PurpurCommand;
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.InvalidConfigurationException;
+import org.bukkit.configuration.file.YamlConfiguration;
+
@@ -146,6 +151,7 @@ index 0000000000000000000000000000000000000000..5bc7d1d72847fc200a5bcd19f083e458
+import java.util.Map;
+import java.util.logging.Level;
+
+@SuppressWarnings("unused")
+public class PurpurConfig {
+ private static final String HEADER = "This is the main configuration file for Purpur.\n"
+ + "As you can see, there's tons to configure. Some options may impact gameplay, so use\n"
@@ -231,6 +237,11 @@ index 0000000000000000000000000000000000000000..5bc7d1d72847fc200a5bcd19f083e458
+ config.set(path, val);
+ }
+
+ private static String getString(String path, String def) {
+ config.addDefault(path, def);
+ return config.getString(path, config.getString(path));
+ }
+
+ private static boolean getBoolean(String path, boolean def) {
+ config.addDefault(path, def);
+ return config.getBoolean(path, config.getBoolean(path));
@@ -251,23 +262,39 @@ index 0000000000000000000000000000000000000000..5bc7d1d72847fc200a5bcd19f083e458
+ return config.getList(path, config.getList(path));
+ }
+
+ private static String getString(String path, String def) {
+ config.addDefault(path, def);
+ return config.getString(path, config.getString(path));
+ static Map<String, Object> getMap(String path, Map<String, Object> def) {
+ if (def != null && config.getConfigurationSection(path) == null) {
+ config.addDefault(path, def);
+ return def;
+ }
+ return toMap(config.getConfigurationSection(path));
+ }
+
+ private static Map<String, Object> toMap(ConfigurationSection section) {
+ ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
+ if (section != null) {
+ for (String key : section.getKeys(false)) {
+ Object obj = section.get(key);
+ if (obj != null) {
+ builder.put(key, obj instanceof ConfigurationSection val ? toMap(val) : obj);
+ }
+ }
+ }
+ return builder.build();
+ }
+}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..3cd897d4049323aeda85c89a73a3f50bd7b94d58
index 0000000000000000000000000000000000000000..cde76bbcd50993de8b36f8a8fa168bed16708ec0
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -0,0 +1,85 @@
@@ -0,0 +1,92 @@
+package net.pl3x.purpur;
+
+import com.tuinity.tuinity.config.TuinityConfig;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.Difficulty;
+import net.minecraft.world.item.DyeColor;
+import net.minecraft.world.item.Item;
@@ -275,6 +302,7 @@ index 0000000000000000000000000000000000000000..3cd897d4049323aeda85c89a73a3f50b
+import net.minecraft.world.level.Explosion;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.pl3x.purpur.tool.Tilling;
+import org.apache.commons.lang.BooleanUtils;
+import org.bukkit.World;
+import org.bukkit.configuration.ConfigurationSection;
@@ -287,9 +315,9 @@ index 0000000000000000000000000000000000000000..3cd897d4049323aeda85c89a73a3f50b
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.logging.Level;
+
+import static net.pl3x.purpur.PurpurConfig.log;
+
+@SuppressWarnings("unused")
+public class PurpurWorldConfig {
+
+ private final ServerLevel level;
@@ -322,6 +350,11 @@ index 0000000000000000000000000000000000000000..3cd897d4049323aeda85c89a73a3f50b
+ return section != null ? section : PurpurConfig.config.getConfigurationSection("world-settings.default." + path);
+ }
+
+ private String getString(String path, String def) {
+ PurpurConfig.config.addDefault("world-settings.default." + path, def);
+ return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
+ }
+
+ private boolean getBoolean(String path, boolean def) {
+ PurpurConfig.config.addDefault("world-settings.default." + path, def);
+ return PurpurConfig.config.getBoolean("world-settings." + worldName + "." + path, PurpurConfig.config.getBoolean("world-settings.default." + path));
@@ -342,9 +375,10 @@ index 0000000000000000000000000000000000000000..3cd897d4049323aeda85c89a73a3f50b
+ return PurpurConfig.config.getList("world-settings." + worldName + "." + path, PurpurConfig.config.getList("world-settings.default." + path));
+ }
+
+ private String getString(String path, String def) {
+ PurpurConfig.config.addDefault("world-settings.default." + path, def);
+ return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
+ private Map<String, Object> getMap(String path, Map<String, Object> def) {
+ final Map<String, Object> fallback = PurpurConfig.getMap("world-settings.default." + path, def);
+ final Map<String, Object> value = PurpurConfig.getMap("world-settings." + worldName + "." + path, null);
+ return value.isEmpty() ? fallback : value;
+ }
+}
diff --git a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java

View File

@@ -4390,7 +4390,7 @@ index af579b2b6f6e18da70e67ce74431a57d9a1236dd..d01a8fe6dd5c84ea5b7370a90c0d5713
this.level.getProfiler().pop();
PiglinBruteAi.updateActivity(this);
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 43bb055f0f9ecb82c25e0f47258f45ce4182a75d..277fac3c160283454da18e003900b5193f82b23a 100644
index dce94c04d20af637860559c1f27412d151e1b5af..32ae046d573d5625fdb44b690d1e7e229f8aff08 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -155,6 +155,23 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -4526,12 +4526,12 @@ index 69f439851fe1ff07d827eaed274940a5783d5f6c..07853aff3d42ce50799406ee1c14389b
Projectile(EntityType<? extends Projectile> type, Level world) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 5bc7d1d72847fc200a5bcd19f083e45805546aeb..46e792b67e15e31848a43d7fa2640ebb55cbe2b9 100644
index 1d76057b1b2dc9f0fc8e3fe5a5f6bfee23128007..f7c46b8173d30192853c875675a1ed0f59170b34 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -127,4 +127,9 @@ public class PurpurConfig {
config.addDefault(path, def);
return config.getString(path, config.getString(path));
@@ -154,4 +154,9 @@ public class PurpurConfig {
}
return builder.build();
}
+
+ public static String cannotRideMob = "<red>You cannot mount that mob";
@@ -4540,12 +4540,12 @@ index 5bc7d1d72847fc200a5bcd19f083e45805546aeb..46e792b67e15e31848a43d7fa2640ebb
+ }
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3cd897d4049323aeda85c89a73a3f50bd7b94d58..69f63641f5a2ae3e1579d3171bcb1c5e5b39b969 100644
index cde76bbcd50993de8b36f8a8fa168bed16708ec0..0c11be83f0da7d05efbd2e277c5f5ae2251a1540 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -82,4 +82,532 @@ public class PurpurWorldConfig {
PurpurConfig.config.addDefault("world-settings.default." + path, def);
return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
@@ -89,4 +89,532 @@ public class PurpurWorldConfig {
final Map<String, Object> value = PurpurConfig.getMap("world-settings." + worldName + "." + path, null);
return value.isEmpty() ? fallback : value;
}
+
+ public boolean babiesAreRidable = true;

View File

@@ -491,7 +491,7 @@ index c0d85eb70dbe1d85d07b47a41a43d19506586399..9092eac3e7e15845d14175cad8030f4e
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
index 919410ce27e7e42e297c2caba7d3d7c1b623aede..790f0940156b9c6d4aa1869a4ab50292faa246c5 100644
index d91b6951dc25097e6f84296406634e48e1f13404..a580afaa886c04df3caf9037b9b9cf17b92cee7b 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
@@ -125,6 +125,32 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@@ -589,7 +589,7 @@ index c7b0d6a987644e0b589c143b0b6b68053be04f37..6c6d2ac7551ae24dec88bd9e6bce7aea
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
index 0671185c358398fe0c4c1dbf4ede2f3e8c4794fb..397d9846ad645f98163a0bfae7a69ceaa6d5c3a4 100644
index d336e2c63b39b22f9f3a7a84ee059c2d9d71239c..d664be25c2c2c527a44fa939e68e84d60effc144 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
@@ -107,6 +107,21 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
@@ -1390,7 +1390,7 @@ index d01a8fe6dd5c84ea5b7370a90c0d57130b27e447..9e66f8f2a92cb7b32cdb2cf749ca2737
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 277fac3c160283454da18e003900b5193f82b23a..07686c678cd47defd9e0b742a71fd13e83142870 100644
index 32ae046d573d5625fdb44b690d1e7e229f8aff08..b7b25813aa00a49fd83edfbade27fa03d7fcd7c5 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -170,6 +170,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -1422,10 +1422,10 @@ index d6c31596e21041a124a263054ccb6447829eccdd..d2588a91b55aebdecf8e1644498111cc
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 69f63641f5a2ae3e1579d3171bcb1c5e5b39b969..36cbaefea53a60c4a7176bf699c03e7cac338976 100644
index 0c11be83f0da7d05efbd2e277c5f5ae2251a1540..4da9ee5050eb708427e304ad0fd71ca3ab557b3e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -93,257 +93,573 @@ public class PurpurWorldConfig {
@@ -100,257 +100,573 @@ public class PurpurWorldConfig {
}
public boolean axolotlRidable = false;
@@ -1999,7 +1999,7 @@ index 69f63641f5a2ae3e1579d3171bcb1c5e5b39b969..36cbaefea53a60c4a7176bf699c03e7c
}
public boolean phantomRidable = false;
@@ -352,6 +668,7 @@ public class PurpurWorldConfig {
@@ -359,6 +675,7 @@ public class PurpurWorldConfig {
public float phantomFlameDamage = 1.0F;
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
@@ -2007,7 +2007,7 @@ index 69f63641f5a2ae3e1579d3171bcb1c5e5b39b969..36cbaefea53a60c4a7176bf699c03e7c
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -359,255 +676,559 @@ public class PurpurWorldConfig {
@@ -366,255 +683,559 @@ public class PurpurWorldConfig {
phantomFlameDamage = (float) getDouble("mobs.phantom.flames.damage", phantomFlameDamage);
phantomFlameFireTime = getInt("mobs.phantom.flames.fire-time", phantomFlameFireTime);
phantomAllowGriefing = getBoolean("mobs.phantom.allow-griefing", phantomAllowGriefing);

View File

@@ -55,10 +55,10 @@ index 9d920565ff65a84b1b9a2a4777fd8bc8f07e0153..33263af33b4355e5079fadfcfae77d03
String hostName = "BrokenHost";
try {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 46e792b67e15e31848a43d7fa2640ebb55cbe2b9..056f2a94912a549f63744e2afa7d34735a962120 100644
index f7c46b8173d30192853c875675a1ed0f59170b34..d2d602eda6f2899f809c31aa1082540e1c7855b9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -132,4 +132,10 @@ public class PurpurConfig {
@@ -159,4 +159,10 @@ public class PurpurConfig {
private static void messages() {
cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
}

View File

@@ -142,10 +142,10 @@ index f494063ead9c6303fb3ca880aba2a877ae8d83ab..3b027111ed933856ae86ad5f62aac744
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 056f2a94912a549f63744e2afa7d34735a962120..be910f7950edcbfcd5c6192ff294166c470149e9 100644
index d2d602eda6f2899f809c31aa1082540e1c7855b9..727d33bd76a3d10f2bbfb07c18fe74860a34f2f7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -138,4 +138,23 @@ public class PurpurConfig {
@@ -165,4 +165,23 @@ public class PurpurConfig {
timingsUrl = getString("settings.timings.url", timingsUrl);
if (!co.aikar.timings.TimingsManager.hiddenConfigs.contains("server-ip")) co.aikar.timings.TimingsManager.hiddenConfigs.add("server-ip");
}

View File

@@ -177,10 +177,10 @@ index 6a4e44dd8935018d1b5283761dfb8e855be62987..afe70b0d5bd98d05bbb7afc756108f09
if (range < 0.0D || d < range * range) {
return true;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index be910f7950edcbfcd5c6192ff294166c470149e9..64a9288888cd5c008d48d919eb2927670eb35696 100644
index 727d33bd76a3d10f2bbfb07c18fe74860a34f2f7..58486dcc2b17e64e09f428b5fd0b771646ac09b0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -129,8 +129,16 @@ public class PurpurConfig {
@@ -156,8 +156,16 @@ public class PurpurConfig {
}
public static String cannotRideMob = "<red>You cannot mount that mob";
@@ -198,11 +198,11 @@ index be910f7950edcbfcd5c6192ff294166c470149e9..64a9288888cd5c008d48d919eb292767
public static String timingsUrl = "https://timings.pl3x.net";
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 36cbaefea53a60c4a7176bf699c03e7cac338976..1b3ab9fd6a6d094d559e18a1d119e651c411a11e 100644
index 4da9ee5050eb708427e304ad0fd71ca3ab557b3e..12e3804b2abd61b32a810162bef5e087a7c1d3c6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -83,6 +83,17 @@ public class PurpurWorldConfig {
return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
@@ -90,6 +90,17 @@ public class PurpurWorldConfig {
return value.isEmpty() ? fallback : value;
}
+ public boolean idleTimeoutKick = true;

View File

@@ -18,10 +18,10 @@ index 06177ec182d79cd101da9cd43a841656d27d6d8b..0e0f7d48337f261481731917aabf45d8
public SystemReport fillSystemReport(SystemReport systemreport) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 64a9288888cd5c008d48d919eb2927670eb35696..bd8885362ddcad76d055612309257e310ba06718 100644
index 58486dcc2b17e64e09f428b5fd0b771646ac09b0..0982cfdbe748dbb7c41624efc770ed0cd1c798fa 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -141,6 +141,11 @@ public class PurpurConfig {
@@ -168,6 +168,11 @@ public class PurpurConfig {
afkTabListSuffix = getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix);
}

View File

@@ -25,10 +25,10 @@ index 0e0f7d48337f261481731917aabf45d8445121a0..34e364afff8cfe060244e5dd7cc0c340
}
// Tuinity - replace logic
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index bd8885362ddcad76d055612309257e310ba06718..615aa4230ae9eaa2f744dd039390637aaae01a91 100644
index 0982cfdbe748dbb7c41624efc770ed0cd1c798fa..2744735f6a15f6fd20c2b93b9c5c0422923bec01 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -152,6 +152,11 @@ public class PurpurConfig {
@@ -179,6 +179,11 @@ public class PurpurConfig {
if (!co.aikar.timings.TimingsManager.hiddenConfigs.contains("server-ip")) co.aikar.timings.TimingsManager.hiddenConfigs.add("server-ip");
}

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 7e94441f543c1961c298d1f8699fac16f11440eb..2b70903b618d00e711f2078fb7cdd92d0d749125 100644
index cf7945ec299ebbef1d5bb0319f0795b47987bb1a..bc7c87bf1d2f4e6eac9b094bfe111d289bea83f6 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -333,6 +333,7 @@ public class ServerPlayer extends Player {
@@ -77,7 +77,7 @@ index af0c7bbce7641f5aa659abb440a6cd6f57019ede..71030d9e156ce28f1ef9e3ed6845f022
this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
// Paper end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 5a344f68176bc9dcc31a1d75ada2afa5f1f3b8ce..62ba8ce35dc5827607c99163c6005ea0c4b7ee16 100644
index ec98fb6d4a407d5be8faf64db0d73e935e16623d..3961f1908876206b86126a672b691bfc571ea2f0 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -991,6 +991,8 @@ public abstract class PlayerList {
@@ -90,10 +90,10 @@ index 5a344f68176bc9dcc31a1d75ada2afa5f1f3b8ce..62ba8ce35dc5827607c99163c6005ea0
return entityplayer1;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1b3ab9fd6a6d094d559e18a1d119e651c411a11e..2d42f36e9f1ce6bf064588d84ed7ae52563f0e7a 100644
index 12e3804b2abd61b32a810162bef5e087a7c1d3c6..f3f40ac229cbb48f536423b90b176f501ff0b907 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -87,11 +87,15 @@ public class PurpurWorldConfig {
@@ -94,11 +94,15 @@ public class PurpurWorldConfig {
public boolean idleTimeoutTickNearbyEntities = true;
public boolean idleTimeoutCountAsSleeping = false;
public boolean idleTimeoutUpdateTabList = false;

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable villager brain ticks
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 07686c678cd47defd9e0b742a71fd13e83142870..bd6a707962ac4d3961e1ce74570909e29ce4f4dd 100644
index b7b25813aa00a49fd83edfbade27fa03d7fcd7c5..ed96780ededea9ae98bc0fb60d250587e6bc9854 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -141,6 +141,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -36,10 +36,10 @@ index 07686c678cd47defd9e0b742a71fd13e83142870..bd6a707962ac4d3961e1ce74570909e2
this.level.getProfiler().pop();
if (this.assignProfessionWhenSpawned) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2d42f36e9f1ce6bf064588d84ed7ae52563f0e7a..65ca6e4a1c99555842804e5e21415d5f3193d526 100644
index f3f40ac229cbb48f536423b90b176f501ff0b907..c6e5a08c7770255463ae6c3f50af5d1a2a544251 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1059,6 +1059,8 @@ public class PurpurWorldConfig {
@@ -1066,6 +1066,8 @@ public class PurpurWorldConfig {
public boolean villagerRidable = false;
public boolean villagerRidableInWater = false;
public double villagerMaxHealth = 20.0D;
@@ -48,7 +48,7 @@ index 2d42f36e9f1ce6bf064588d84ed7ae52563f0e7a..65ca6e4a1c99555842804e5e21415d5f
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1068,6 +1070,8 @@ public class PurpurWorldConfig {
@@ -1075,6 +1077,8 @@ public class PurpurWorldConfig {
set("mobs.villager.attributes.max_health", oldValue);
}
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);

View File

@@ -56,10 +56,10 @@ index 71030d9e156ce28f1ef9e3ed6845f022a62dfdaf..db8a8e81054e91161d43515fb19ab010
if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
int i = (int) (Util.getMillis() - this.keepAliveTime);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 615aa4230ae9eaa2f744dd039390637aaae01a91..21e6157f85bb8b793a3e8d5e15e2045a1a6a057a 100644
index 2744735f6a15f6fd20c2b93b9c5c0422923bec01..772fe2509cf2e421b2e9279e6b159e95cf8fc4ae 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -157,6 +157,11 @@ public class PurpurConfig {
@@ -184,6 +184,11 @@ public class PurpurConfig {
laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
}

View File

@@ -138,10 +138,10 @@ index b1e04d41de80971a7a1616beb0860226ecc25045..295ae3877b955978105b756055c21e63
return i;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 65ca6e4a1c99555842804e5e21415d5f3193d526..342bfb84a98292f50373fc3dd288fe37b9ba2eea 100644
index c6e5a08c7770255463ae6c3f50af5d1a2a544251..84d5bf71d6eff746df8b5acdd876609411e31d30 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -98,6 +98,31 @@ public class PurpurWorldConfig {
@@ -105,6 +105,31 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}

View File

@@ -50,10 +50,10 @@ index fdb3ab919a78221605257ae82bfd026346ce2ffb..e98fc3c235f9160f1928a8afb0d7991a
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 342bfb84a98292f50373fc3dd288fe37b9ba2eea..302539a1ecf0ffe6dcae52bdd48565def3c637c1 100644
index 84d5bf71d6eff746df8b5acdd876609411e31d30..aa511364fc48aa78b38a730ed8f0c3fb5453759c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1054,7 +1054,10 @@ public class PurpurWorldConfig {
@@ -1061,7 +1061,10 @@ public class PurpurWorldConfig {
public boolean turtleRidable = false;
public boolean turtleRidableInWater = false;
public double turtleMaxHealth = 30.0D;
@@ -65,7 +65,7 @@ index 342bfb84a98292f50373fc3dd288fe37b9ba2eea..302539a1ecf0ffe6dcae52bdd48565de
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1063,6 +1066,9 @@ public class PurpurWorldConfig {
@@ -1070,6 +1073,9 @@ public class PurpurWorldConfig {
set("mobs.turtle.attributes.max_health", oldValue);
}
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);

View File

@@ -17,10 +17,10 @@ index 7d6dc0a8ee35274052b122bbc446bc54750de0a6..c46df052a5a39d92688f51377ee1f7b5
}
// CraftBukkit end
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 21e6157f85bb8b793a3e8d5e15e2045a1a6a057a..8bfecd58ad2f1e6657414c9620fcd85c7f012ae4 100644
index 772fe2509cf2e421b2e9279e6b159e95cf8fc4ae..e425f660e93db4186a9d0ef3f43137667d5ecd4f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -180,4 +180,11 @@ public class PurpurConfig {
@@ -207,4 +207,11 @@ public class PurpurConfig {
org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
}

View File

@@ -120,10 +120,10 @@ index a8ffdc8810152d77668aad7bad15a00c4d194d4c..91e28c414545d2bbb4e2f22c516d0f68
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 302539a1ecf0ffe6dcae52bdd48565def3c637c1..20b2888e9cca71931bacb27f7c1c3a25d2b4680f 100644
index aa511364fc48aa78b38a730ed8f0c3fb5453759c..57f361750cbec0558fd39c1bb9bbc6878918bfbf 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -443,6 +443,10 @@ public class PurpurWorldConfig {
@@ -450,6 +450,10 @@ public class PurpurWorldConfig {
public double giantMovementSpeed = 0.5D;
public double giantAttackDamage = 50.0D;
public double giantMaxHealth = 100.0D;
@@ -134,7 +134,7 @@ index 302539a1ecf0ffe6dcae52bdd48565def3c637c1..20b2888e9cca71931bacb27f7c1c3a25
private void giantSettings() {
giantRidable = getBoolean("mobs.giant.ridable", giantRidable);
giantRidableInWater = getBoolean("mobs.giant.ridable-in-water", giantRidableInWater);
@@ -458,6 +462,10 @@ public class PurpurWorldConfig {
@@ -465,6 +469,10 @@ public class PurpurWorldConfig {
set("mobs.giant.attributes.max_health", oldValue);
}
giantMaxHealth = getDouble("mobs.giant.attributes.max_health", giantMaxHealth);

View File

@@ -42,10 +42,10 @@ index 004bdf930769974ed02c68b8939af8e96bad88a7..39402063a73fbdbefdbcd7b4f7ea675c
LightningBolt entitylightning = (LightningBolt) EntityType.LIGHTNING_BOLT.create((net.minecraft.world.level.Level) this);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 20b2888e9cca71931bacb27f7c1c3a25d2b4680f..a9f3ab3a505535581e75df5d3184f0d54e229983 100644
index 57f361750cbec0558fd39c1bb9bbc6878918bfbf..5ccc74cc292d72e1d90ae3841c826c02a2c37447 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1241,6 +1241,7 @@ public class PurpurWorldConfig {
@@ -1248,6 +1248,7 @@ public class PurpurWorldConfig {
public double zombieHorseJumpStrengthMax = 1.0D;
public double zombieHorseMovementSpeedMin = 0.2D;
public double zombieHorseMovementSpeedMax = 0.2D;
@@ -53,7 +53,7 @@ index 20b2888e9cca71931bacb27f7c1c3a25d2b4680f..a9f3ab3a505535581e75df5d3184f0d5
private void zombieHorseSettings() {
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
@@ -1256,6 +1257,7 @@ public class PurpurWorldConfig {
@@ -1263,6 +1264,7 @@ public class PurpurWorldConfig {
zombieHorseJumpStrengthMax = getDouble("mobs.zombie_horse.attributes.jump_strength.max", zombieHorseJumpStrengthMax);
zombieHorseMovementSpeedMin = getDouble("mobs.zombie_horse.attributes.movement_speed.min", zombieHorseMovementSpeedMin);
zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);

View File

@@ -24,10 +24,10 @@ index b71a6af3c2d1ca2a946b23efb11b0e794840cf25..b2b3630a90c685b0a692efb9bf8bb111
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a9f3ab3a505535581e75df5d3184f0d54e229983..a5d1b872a557a13f58f27d0289027d48a97f9da2 100644
index 5ccc74cc292d72e1d90ae3841c826c02a2c37447..d40a83d760641feb2fe4e23a51ace710325a2c9d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -265,6 +265,7 @@ public class PurpurWorldConfig {
@@ -272,6 +272,7 @@ public class PurpurWorldConfig {
public boolean creeperRidable = false;
public boolean creeperRidableInWater = false;
public double creeperMaxHealth = 20.0D;
@@ -35,7 +35,7 @@ index a9f3ab3a505535581e75df5d3184f0d54e229983..a5d1b872a557a13f58f27d0289027d48
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -274,6 +275,7 @@ public class PurpurWorldConfig {
@@ -281,6 +282,7 @@ public class PurpurWorldConfig {
set("mobs.creeper.attributes.max_health", oldValue);
}
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);

View File

@@ -38,10 +38,10 @@ index 587feda351efae19407cb9f23c6c1d42d5ed0cc9..e0ba1ef404c9f8ba1eae563b733d10d9
int i = this.random.nextInt(100);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a5d1b872a557a13f58f27d0289027d48a97f9da2..0419865e00cdaa0460a1e5eebbb35ec8df1e95c4 100644
index d40a83d760641feb2fe4e23a51ace710325a2c9d..26d706f7cb814000196b251479f668385b53205d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -819,6 +819,8 @@ public class PurpurWorldConfig {
@@ -826,6 +826,8 @@ public class PurpurWorldConfig {
public boolean rabbitRidable = false;
public boolean rabbitRidableInWater = false;
public double rabbitMaxHealth = 3.0D;
@@ -50,7 +50,7 @@ index a5d1b872a557a13f58f27d0289027d48a97f9da2..0419865e00cdaa0460a1e5eebbb35ec8
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -828,6 +830,8 @@ public class PurpurWorldConfig {
@@ -835,6 +837,8 @@ public class PurpurWorldConfig {
set("mobs.rabbit.attributes.max_health", oldValue);
}
rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth);

View File

@@ -40,10 +40,10 @@ index a00627e0fa38632449042f59c053b4dac13e58bf..8218a074cdbe9df514f4de5aefd3c266
this.entity.stopSeenByPlayer(player);
player.connection.send(new ClientboundRemoveEntityPacket(this.entity.getId()));
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 8bfecd58ad2f1e6657414c9620fcd85c7f012ae4..09f1d0355f0dabbf742cdef544ae630666b455fb 100644
index e425f660e93db4186a9d0ef3f43137667d5ecd4f..4fd18a3d1d8d72d42e14de2b59c2564a18721709 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -181,6 +181,11 @@ public class PurpurConfig {
@@ -208,6 +208,11 @@ public class PurpurConfig {
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
}

View File

@@ -75,10 +75,10 @@ index 80749df5d00df415a1b9e7c0e8586625b6453ffb..406b6ed8084c18da1062d8e8049bdfff
// Paper start - Cancellable death event
protected org.bukkit.event.entity.EntityDeathEvent dropAllDeathLoot(DamageSource source) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0419865e00cdaa0460a1e5eebbb35ec8df1e95c4..581c1853725d9cffc29885402a36a45e8b313e5d 100644
index 26d706f7cb814000196b251479f668385b53205d..f52adabf70056ee282ca9640b20ad2bd8e9347e4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -413,6 +413,7 @@ public class PurpurWorldConfig {
@@ -420,6 +420,7 @@ public class PurpurWorldConfig {
public boolean foxRidable = false;
public boolean foxRidableInWater = false;
public double foxMaxHealth = 10.0D;
@@ -86,7 +86,7 @@ index 0419865e00cdaa0460a1e5eebbb35ec8df1e95c4..581c1853725d9cffc29885402a36a45e
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -422,6 +423,7 @@ public class PurpurWorldConfig {
@@ -429,6 +430,7 @@ public class PurpurWorldConfig {
set("mobs.fox.attributes.max_health", oldValue);
}
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);

View File

@@ -59,10 +59,10 @@ index 18780fb268cabb47bb0deb84c44520831c1a762b..d39c88af3882a09ff1a06f9052d7b9b8
this.goalSelector.addGoal(5, new RandomStrollGoal(this, 1.0D));
this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 581c1853725d9cffc29885402a36a45e8b313e5d..3b9f366fbb5e96b0b6be616b9184ba5e58c4a9f0 100644
index f52adabf70056ee282ca9640b20ad2bd8e9347e4..4a2e4b82d5693e7e73fb9722aa4a09af13f61149 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -795,6 +795,8 @@ public class PurpurWorldConfig {
@@ -802,6 +802,8 @@ public class PurpurWorldConfig {
public boolean polarBearRidable = false;
public boolean polarBearRidableInWater = false;
public double polarBearMaxHealth = 30.0D;
@@ -71,7 +71,7 @@ index 581c1853725d9cffc29885402a36a45e8b313e5d..3b9f366fbb5e96b0b6be616b9184ba5e
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -804,6 +806,9 @@ public class PurpurWorldConfig {
@@ -811,6 +813,9 @@ public class PurpurWorldConfig {
set("mobs.polar_bear.attributes.max_health", oldValue);
}
polarBearMaxHealth = getDouble("mobs.polar_bear.attributes.max_health", polarBearMaxHealth);

View File

@@ -51,10 +51,10 @@ index 55dccf338f9fba17fbcb88672d36b83e7bbec88b..eaec6eba96db3b8ce046208a4a1e5fc4
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3b9f366fbb5e96b0b6be616b9184ba5e58c4a9f0..1153271f5e3dab623563c697bff563614f12404b 100644
index 4a2e4b82d5693e7e73fb9722aa4a09af13f61149..321343f7bdb807f42d9529eeaa739110db496e50 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -225,6 +225,7 @@ public class PurpurWorldConfig {
@@ -232,6 +232,7 @@ public class PurpurWorldConfig {
public boolean chickenRidable = false;
public boolean chickenRidableInWater = false;
public double chickenMaxHealth = 4.0D;
@@ -62,7 +62,7 @@ index 3b9f366fbb5e96b0b6be616b9184ba5e58c4a9f0..1153271f5e3dab623563c697bff56361
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -234,6 +235,7 @@ public class PurpurWorldConfig {
@@ -241,6 +242,7 @@ public class PurpurWorldConfig {
set("mobs.chicken.attributes.max_health", oldValue);
}
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);

View File

@@ -17,11 +17,11 @@ index 5fc66d7096afcfe63eba774e1dc330ac3263e4b0..7a3a364f5e3b025cc0a5694401cb9298
if (!this.canTick) {
if (this.noTickPoseDirty) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 631b7dccb648fdb12b7e7232403cac47b90d9125..41e3342f37c2b55655b01281c6411ec6dc94f336 100644
index 321343f7bdb807f42d9529eeaa739110db496e50..2cd98ff6adad2ea8b9c3a46b59c8e162474f4375 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -83,6 +83,11 @@ public class PurpurWorldConfig {
return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
@@ -90,6 +90,11 @@ public class PurpurWorldConfig {
return value.isEmpty() ? fallback : value;
}
+ public float armorstandStepHeight = 0.0F;

View File

@@ -49,10 +49,10 @@ index 4cab98b5e441a174482893d3d289bbafa1f7a5fc..fa3cdff99a16b67ed86c8f7940ffa139
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 316fe00962caa5951a3dccb79f4745d3ab4eba22..5cea174102d346a66dafcbd9c1b524bde53d5168 100644
index 2cd98ff6adad2ea8b9c3a46b59c8e162474f4375..def1c09fdefee27d6f1022eef979071109af4061 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -202,6 +202,9 @@ public class PurpurWorldConfig {
@@ -209,6 +209,9 @@ public class PurpurWorldConfig {
public boolean catRidable = false;
public boolean catRidableInWater = false;
public double catMaxHealth = 10.0D;
@@ -62,7 +62,7 @@ index 316fe00962caa5951a3dccb79f4745d3ab4eba22..5cea174102d346a66dafcbd9c1b524bd
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -211,6 +214,9 @@ public class PurpurWorldConfig {
@@ -218,6 +221,9 @@ public class PurpurWorldConfig {
set("mobs.cat.attributes.max_health", oldValue);
}
catMaxHealth = getDouble("mobs.cat.attributes.max_health", catMaxHealth);

View File

@@ -114,10 +114,10 @@ index bee82d5bf600cbeacfcede600e5606529af1435e..9da76357da891a70e20ad80f50873b3b
public Cow getBreedOffspring(ServerLevel world, AgeableMob entity) {
return (Cow) EntityType.COW.create((Level) world);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5cea174102d346a66dafcbd9c1b524bde53d5168..876fc6694f4116772bb6bf1c2249b8981f945f51 100644
index def1c09fdefee27d6f1022eef979071109af4061..9b3698f9ced1c88ab8a8495bfe55225be191c3a1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -264,6 +264,7 @@ public class PurpurWorldConfig {
@@ -271,6 +271,7 @@ public class PurpurWorldConfig {
public boolean cowRidable = false;
public boolean cowRidableInWater = false;
public double cowMaxHealth = 10.0D;
@@ -125,7 +125,7 @@ index 5cea174102d346a66dafcbd9c1b524bde53d5168..876fc6694f4116772bb6bf1c2249b898
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -273,6 +274,7 @@ public class PurpurWorldConfig {
@@ -280,6 +281,7 @@ public class PurpurWorldConfig {
set("mobs.cow.attributes.max_health", oldValue);
}
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);

View File

@@ -28,10 +28,10 @@ index f4a099e691dce3c57069e76d67859161b459098e..518d28dc0b5b8c04263c93a4347e4c97
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 876fc6694f4116772bb6bf1c2249b8981f945f51..b24f63db425608772d18f956fe3245510b2e2d5b 100644
index 9b3698f9ced1c88ab8a8495bfe55225be191c3a1..7f465785f21bfb98a0ee7917811d79cbab90defa 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -754,6 +754,7 @@ public class PurpurWorldConfig {
@@ -761,6 +761,7 @@ public class PurpurWorldConfig {
public boolean pigRidable = false;
public boolean pigRidableInWater = false;
public double pigMaxHealth = 10.0D;
@@ -39,7 +39,7 @@ index 876fc6694f4116772bb6bf1c2249b8981f945f51..b24f63db425608772d18f956fe324551
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -763,6 +764,7 @@ public class PurpurWorldConfig {
@@ -770,6 +771,7 @@ public class PurpurWorldConfig {
set("mobs.pig.attributes.max_health", oldValue);
}
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);

View File

@@ -32,10 +32,10 @@ index 7fbe1a62e9c67a8bdaf13aaa9fae1d8742d75148..0733f9c057fef17fd79a4769f19b78f4
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b24f63db425608772d18f956fe3245510b2e2d5b..9e6228f51d4f9a381537389e55bb60670d3359b7 100644
index 7f465785f21bfb98a0ee7917811d79cbab90defa..091629e631dca35f1aff23afe1dab32627689aee 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -985,6 +985,8 @@ public class PurpurWorldConfig {
@@ -992,6 +992,8 @@ public class PurpurWorldConfig {
public boolean snowGolemRidableInWater = false;
public boolean snowGolemLeaveTrailWhenRidden = false;
public double snowGolemMaxHealth = 4.0D;
@@ -44,7 +44,7 @@ index b24f63db425608772d18f956fe3245510b2e2d5b..9e6228f51d4f9a381537389e55bb6067
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -995,6 +997,8 @@ public class PurpurWorldConfig {
@@ -1002,6 +1004,8 @@ public class PurpurWorldConfig {
set("mobs.snow_golem.attributes.max_health", oldValue);
}
snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);

View File

@@ -18,10 +18,10 @@ index 177c5b385613ac08a75500013326874ff31a1992..a70c631691512a633c7fe4df9e9f2881
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9e6228f51d4f9a381537389e55bb60670d3359b7..9eedfb6293d56d8d9bc1ce108d7ef9a347748b92 100644
index 091629e631dca35f1aff23afe1dab32627689aee..22e2beff55aa0fc6f8c4d6d8a6491b3a5e87e795 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -367,6 +367,7 @@ public class PurpurWorldConfig {
@@ -374,6 +374,7 @@ public class PurpurWorldConfig {
public boolean enderDragonRidableInWater = false;
public double enderDragonMaxY = 256D;
public double enderDragonMaxHealth = 200.0D;
@@ -29,7 +29,7 @@ index 9e6228f51d4f9a381537389e55bb60670d3359b7..9eedfb6293d56d8d9bc1ce108d7ef9a3
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -381,6 +382,7 @@ public class PurpurWorldConfig {
@@ -388,6 +389,7 @@ public class PurpurWorldConfig {
set("mobs.ender_dragon.attributes.max_health", oldValue);
}
enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);

View File

@@ -35,10 +35,10 @@ index 1844ea93f8cea420f01937f85ed17c0ec1bb8bf0..9e80ba8970cad91ea22ac701f76e1413
} else {
return InteractionResult.PASS;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9eedfb6293d56d8d9bc1ce108d7ef9a347748b92..530a6887900202340217e6b2f0db495e774881e8 100644
index 22e2beff55aa0fc6f8c4d6d8a6491b3a5e87e795..7a794f951ba01f3b9e6b64c15eb6b265a3dce6ad 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -128,6 +128,11 @@ public class PurpurWorldConfig {
@@ -135,6 +135,11 @@ public class PurpurWorldConfig {
});
}

View File

@@ -70,10 +70,10 @@ index 9b5d11ece006d7aa893360a84ba652c666517ac1..bdd6d8201ac078635d637081a37f353c
@Override
public ClientboundBlockEntityDataPacket getUpdatePacket() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 530a6887900202340217e6b2f0db495e774881e8..11c4716dea2d944402330c525d9bd53b23a8e74f 100644
index 7a794f951ba01f3b9e6b64c15eb6b265a3dce6ad..889760ed74af23f51415b92b42600a02145c38c8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -128,8 +128,10 @@ public class PurpurWorldConfig {
@@ -135,8 +135,10 @@ public class PurpurWorldConfig {
});
}

View File

@@ -42,10 +42,10 @@ index a242a80b16c7d074d52a52728646224b1a0091d4..5d9d77cb382c8075af2713a0ce26c28a
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 11c4716dea2d944402330c525d9bd53b23a8e74f..cc68e6dae4892d8d2efda3dbd9b433601338b6fa 100644
index 889760ed74af23f51415b92b42600a02145c38c8..8b086b7cc7aa5ab001d5dfb840ca8146692152a6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -128,6 +128,11 @@ public class PurpurWorldConfig {
@@ -135,6 +135,11 @@ public class PurpurWorldConfig {
});
}

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Minecart settings and WASD controls
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 373a0e9cb219a9ec3236771a28ba522a9cc452c3..182b9e850be72b72636d03c4d303fb264ca875f6 100644
index eeec7eeb8c4ae0152e028e7a9859310f7351c313..056b679cab7fe660d4a9b8bf782674fb210dd8bb 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -986,6 +986,7 @@ public class ServerPlayer extends Player {
@@ -148,10 +148,10 @@ index 04d5ef90cd4171f9360017ac0c01ce48ae6ec983..7538262e14c86e4da9cd4cb887b76f64
protected final float explosionResistance;
protected final boolean isRandomlyTicking;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 89d090233a42f7d53bcd6376a5a4b0eb2f592952..95d03cb21bdedf595df8aee46ff1ace6323b6a67 100644
index 8b086b7cc7aa5ab001d5dfb840ca8146692152a6..9bf5e19912e39dd92cc868419ee28c2ea83d2be1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -88,6 +88,68 @@ public class PurpurWorldConfig {
@@ -95,6 +95,68 @@ public class PurpurWorldConfig {
armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
}

View File

@@ -20,10 +20,10 @@ index 28d5fc868498a4a6746b9defa1c06da27a4aa495..5b25fc620161053e1f3811dbdd7fac01
// CraftBukkit start - Call death event
org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3c517e22d7882dbb4c156e11d7854add27c57a11..687402ae1949b99f78826be8d549e943230ab55f 100644
index 9bf5e19912e39dd92cc868419ee28c2ea83d2be1..da2e7d146029d36472de7800c42fb5d72252da3a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -190,6 +190,11 @@ public class PurpurWorldConfig {
@@ -197,6 +197,11 @@ public class PurpurWorldConfig {
});
}

View File

@@ -28,10 +28,10 @@ index f33977d95b6db473be4f95075ba99caf90ad0220..56dc04d8875971ee9a5d077a695509af
return stack.isEmpty() ? new ItemStack(Items.BUCKET) : stack;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 687402ae1949b99f78826be8d549e943230ab55f..085549acf40b26f94098077dd90f2c1d4be2e87e 100644
index da2e7d146029d36472de7800c42fb5d72252da3a..a692550385262523e71427b7eda3939e44ad0de5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -191,8 +191,10 @@ public class PurpurWorldConfig {
@@ -198,8 +198,10 @@ public class PurpurWorldConfig {
}
public boolean disableDropsOnCrammingDeath = false;

View File

@@ -17,10 +17,10 @@ index 8212ee2cc1242c0a3626f3643c455f3be0de18c2..aaf6f43c0f37a51a7b2db57b8da43365
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 085549acf40b26f94098077dd90f2c1d4be2e87e..d8cd35bd0e52698e4fbd7e8dbab8258dfe6ede82 100644
index a692550385262523e71427b7eda3939e44ad0de5..eac5609b34e73d3cbfa88b43b3544ca3ccd4cb48 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1295,6 +1295,7 @@ public class PurpurWorldConfig {
@@ -1302,6 +1302,7 @@ public class PurpurWorldConfig {
public boolean witherSkeletonRidable = false;
public boolean witherSkeletonRidableInWater = false;
public double witherSkeletonMaxHealth = 20.0D;
@@ -28,7 +28,7 @@ index 085549acf40b26f94098077dd90f2c1d4be2e87e..d8cd35bd0e52698e4fbd7e8dbab8258d
private void witherSkeletonSettings() {
witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable);
witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater);
@@ -1304,6 +1305,7 @@ public class PurpurWorldConfig {
@@ -1311,6 +1312,7 @@ public class PurpurWorldConfig {
set("mobs.wither_skeleton.attributes.max_health", oldValue);
}
witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth);

View File

@@ -24,10 +24,10 @@ index 34e364afff8cfe060244e5dd7cc0c34033dc6945..c5f1141d46acca284f5489d68d3b628e
this.profiler.pop();
this.endMetricsRecordingTick();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 09f1d0355f0dabbf742cdef544ae630666b455fb..f85849c637c338d42aa6f8d5f96b189113658422 100644
index 4fd18a3d1d8d72d42e14de2b59c2564a18721709..db9c33cc36099fb6b203a5526b6399ca3a067d83 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -192,4 +192,9 @@ public class PurpurConfig {
@@ -219,4 +219,9 @@ public class PurpurConfig {
loggerSuppressInitLegacyMaterialError = getBoolean("settings.logger.suppress-init-legacy-material-errors", loggerSuppressInitLegacyMaterialError);
loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings);
}

View File

@@ -18,10 +18,10 @@ index c95eef8596fe3e1ca83e620a6c54b164c797cbe1..1e6a5404d767318de29184b3e3a2bc41
if (!this.level.isClientSide && this.pickup == AbstractArrow.Pickup.ALLOWED) {
this.spawnAtLocation(this.getPickupItem(), 0.1F);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d8cd35bd0e52698e4fbd7e8dbab8258dfe6ede82..ea1b04f44d15af4651fc068c5c514d82566e4d49 100644
index eac5609b34e73d3cbfa88b43b3544ca3ccd4cb48..3d6d92986ab14d85cab4c35040bad47ca3c01caa 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -192,9 +192,11 @@ public class PurpurWorldConfig {
@@ -199,9 +199,11 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean milkCuresBadOmen = true;

View File

@@ -38,10 +38,10 @@ index b061ecc42122ef66fbf87fe017023abca5728a01..6e0b5fbf5b0d216b6b7c647d45ef37cd
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ea1b04f44d15af4651fc068c5c514d82566e4d49..503a6cddf4b652544ea884a6e8cb78c2fb8658a2 100644
index 3d6d92986ab14d85cab4c35040bad47ca3c01caa..307b955876e8b7517f68b1fd581fb2dd3e3edae0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -364,6 +364,7 @@ public class PurpurWorldConfig {
@@ -371,6 +371,7 @@ public class PurpurWorldConfig {
public boolean creeperRidableInWater = false;
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
@@ -49,7 +49,7 @@ index ea1b04f44d15af4651fc068c5c514d82566e4d49..503a6cddf4b652544ea884a6e8cb78c2
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -374,6 +375,7 @@ public class PurpurWorldConfig {
@@ -381,6 +382,7 @@ public class PurpurWorldConfig {
}
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
@@ -57,7 +57,7 @@ index ea1b04f44d15af4651fc068c5c514d82566e4d49..503a6cddf4b652544ea884a6e8cb78c2
}
public boolean dolphinRidable = false;
@@ -471,6 +473,7 @@ public class PurpurWorldConfig {
@@ -478,6 +480,7 @@ public class PurpurWorldConfig {
public boolean endermanRidable = false;
public boolean endermanRidableInWater = false;
public double endermanMaxHealth = 40.0D;
@@ -65,7 +65,7 @@ index ea1b04f44d15af4651fc068c5c514d82566e4d49..503a6cddf4b652544ea884a6e8cb78c2
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -480,6 +483,7 @@ public class PurpurWorldConfig {
@@ -487,6 +490,7 @@ public class PurpurWorldConfig {
set("mobs.enderman.attributes.max_health", oldValue);
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);

View File

@@ -17,7 +17,7 @@ index e59a77c80a1bbe62aaa61bd4792d21b12c895a5c..44e9d6d0b80203b152957efef953c2fa
// CraftBukkit start
private CraftMerchant craftMerchant;
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index bd6a707962ac4d3961e1ce74570909e29ce4f4dd..8fd1371f7931a97f6663914dc8780c5c9ed296f5 100644
index ed96780ededea9ae98bc0fb60d250587e6bc9854..9e13eda42c781b6f95b63d58d775bb22cbd87a96 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -171,6 +171,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -41,10 +41,10 @@ index d2588a91b55aebdecf8e1644498111ccf84a9dc9..393061e13375bf7a7ee57973b4abac83
this.goalSelector.addGoal(8, new WaterAvoidingRandomStrollGoal(this, 0.35D));
this.goalSelector.addGoal(9, new InteractGoal(this, Player.class, 3.0F, 1.0F));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 503a6cddf4b652544ea884a6e8cb78c2fb8658a2..1a77066e85fd68af98126d3030649510fc6dccee 100644
index 307b955876e8b7517f68b1fd581fb2dd3e3edae0..0b6d19d310993cf697cb546c33efb359bb60c4a6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1223,6 +1223,7 @@ public class PurpurWorldConfig {
@@ -1230,6 +1230,7 @@ public class PurpurWorldConfig {
public double villagerMaxHealth = 20.0D;
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
@@ -52,7 +52,7 @@ index 503a6cddf4b652544ea884a6e8cb78c2fb8658a2..1a77066e85fd68af98126d3030649510
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1234,6 +1235,7 @@ public class PurpurWorldConfig {
@@ -1241,6 +1242,7 @@ public class PurpurWorldConfig {
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
@@ -60,7 +60,7 @@ index 503a6cddf4b652544ea884a6e8cb78c2fb8658a2..1a77066e85fd68af98126d3030649510
}
public boolean vindicatorRidable = false;
@@ -1253,6 +1255,7 @@ public class PurpurWorldConfig {
@@ -1260,6 +1262,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderRidable = false;
public boolean wanderingTraderRidableInWater = false;
public double wanderingTraderMaxHealth = 20.0D;
@@ -68,7 +68,7 @@ index 503a6cddf4b652544ea884a6e8cb78c2fb8658a2..1a77066e85fd68af98126d3030649510
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1262,6 +1265,7 @@ public class PurpurWorldConfig {
@@ -1269,6 +1272,7 @@ public class PurpurWorldConfig {
set("mobs.wandering_trader.attributes.max_health", oldValue);
}
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);

View File

@@ -17,7 +17,7 @@ index c35c5d58523be370732a19c52db4f8e94c88b12f..e07fbf6ba955a6c80ebf64db4d0f73f2
// Paper start - drop leash variable
org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, player, !player.getAbilities().instabuild);
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 8fd1371f7931a97f6663914dc8780c5c9ed296f5..52a592e569d020dca45916be7b5fad28c9d480de 100644
index 9e13eda42c781b6f95b63d58d775bb22cbd87a96..e903fe670e50ff34187994d36a2d875d5f51bdb6 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -178,6 +178,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -49,10 +49,10 @@ index 393061e13375bf7a7ee57973b4abac83ffa15fa3..c48935d35a6141c41db22e3ec172d599
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1a77066e85fd68af98126d3030649510fc6dccee..c87fb386006003123c23d50b0f3f899820fad857 100644
index 0b6d19d310993cf697cb546c33efb359bb60c4a6..e9b1939f69f3bc28e77647c534350f1deda6d8d5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1224,6 +1224,7 @@ public class PurpurWorldConfig {
@@ -1231,6 +1231,7 @@ public class PurpurWorldConfig {
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
public boolean villagerFollowEmeraldBlock = false;
@@ -60,7 +60,7 @@ index 1a77066e85fd68af98126d3030649510fc6dccee..c87fb386006003123c23d50b0f3f8998
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1236,6 +1237,7 @@ public class PurpurWorldConfig {
@@ -1243,6 +1244,7 @@ public class PurpurWorldConfig {
villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
@@ -68,7 +68,7 @@ index 1a77066e85fd68af98126d3030649510fc6dccee..c87fb386006003123c23d50b0f3f8998
}
public boolean vindicatorRidable = false;
@@ -1256,6 +1258,7 @@ public class PurpurWorldConfig {
@@ -1263,6 +1265,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderRidableInWater = false;
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
@@ -76,7 +76,7 @@ index 1a77066e85fd68af98126d3030649510fc6dccee..c87fb386006003123c23d50b0f3f8998
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1266,6 +1269,7 @@ public class PurpurWorldConfig {
@@ -1273,6 +1276,7 @@ public class PurpurWorldConfig {
}
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 52a592e569d020dca45916be7b5fad28c9d480de..5e100dbdbd6cfb4aa34b0d6b1ce0913899f60b7c 100644
index e903fe670e50ff34187994d36a2d875d5f51bdb6..3865f16e027307f5b8b2a5617b66ffd8b9f85c60 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -1033,6 +1033,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -18,10 +18,10 @@ index 52a592e569d020dca45916be7b5fad28c9d480de..5e100dbdbd6cfb4aa34b0d6b1ce09138
for (int i = 0; i < 10; ++i) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c87fb386006003123c23d50b0f3f899820fad857..8c400b11734f541c683186072f80c89c5f93093b 100644
index e9b1939f69f3bc28e77647c534350f1deda6d8d5..67a4608aa553bc6e3c42c9e30cd1157bb82930f2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1225,6 +1225,8 @@ public class PurpurWorldConfig {
@@ -1232,6 +1232,8 @@ public class PurpurWorldConfig {
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
@@ -30,7 +30,7 @@ index c87fb386006003123c23d50b0f3f899820fad857..8c400b11734f541c683186072f80c89c
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1238,6 +1240,8 @@ public class PurpurWorldConfig {
@@ -1245,6 +1247,8 @@ public class PurpurWorldConfig {
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);

View File

@@ -58,10 +58,10 @@ index 695783e64564b1d2a178d57a89737d2a97ab9014..cd1a33a1f10d04a91358f51d736bda34
protected boolean canConvertToSource() {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8c400b11734f541c683186072f80c89c5f93093b..9cd572048951bb6be33bf86959ad8162780ecdbf 100644
index 67a4608aa553bc6e3c42c9e30cd1157bb82930f2..d37d9dabe054185ceb40f7a7a1471099692fce1f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -204,6 +204,13 @@ public class PurpurWorldConfig {
@@ -211,6 +211,13 @@ public class PurpurWorldConfig {
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
}

View File

@@ -18,10 +18,10 @@ index cd1a33a1f10d04a91358f51d736bda34110324c4..b0d671ba015d1ad37fdf600b8e70def2
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9cd572048951bb6be33bf86959ad8162780ecdbf..3aa045fd27de4a38cf90549e102258cc92a9ea12 100644
index d37d9dabe054185ceb40f7a7a1471099692fce1f..abb50517868f17dba2d3f69bb97cc150b95047fa 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -206,9 +206,13 @@ public class PurpurWorldConfig {
@@ -213,9 +213,13 @@ public class PurpurWorldConfig {
public boolean lavaInfinite = false;
public int lavaInfiniteRequiredSources = 2;

View File

@@ -31,10 +31,10 @@ index e0544699714fd4c6ef2deb17f49b8246a7021463..831a62e56c745884f34fb5d8f84f0375
return 0;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2a2803a8c31f7779bd3bfd666885b8e8bbfc838b..7b3f7ef0df0d0c79c9d133632c57607fa4f3a494 100644
index abb50517868f17dba2d3f69bb97cc150b95047fa..346c6048e0c7b72b14b2001a9071b56b4b0f37d2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -156,6 +156,8 @@ public class PurpurWorldConfig {
@@ -163,6 +163,8 @@ public class PurpurWorldConfig {
public boolean idleTimeoutUpdateTabList = false;
public int playerSpawnInvulnerableTicks = 60;
public boolean playerInvulnerableWhileAcceptingResourcePack = false;
@@ -43,7 +43,7 @@ index 2a2803a8c31f7779bd3bfd666885b8e8bbfc838b..7b3f7ef0df0d0c79c9d133632c57607f
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -163,6 +165,8 @@ public class PurpurWorldConfig {
@@ -170,6 +172,8 @@ public class PurpurWorldConfig {
idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
playerSpawnInvulnerableTicks = getInt("gameplay-mechanics.player.spawn-invulnerable-ticks", playerSpawnInvulnerableTicks);
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);

View File

@@ -31,10 +31,10 @@ index 54bc16b6971259f6083ca530d4109909c86a3e1e..b4640aa8fe8a37a6f27a626862b68b63
protected void updateSwingTime() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 90f126acb69c4017753816f1cd3d4b2bd25b2f89..dc3eb512777f66c4f7fceb30c9b304f9fa29fbdb 100644
index 346c6048e0c7b72b14b2001a9071b56b4b0f37d2..1decce49172573c4c5cbd8272c64483382feb09d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -197,10 +197,14 @@ public class PurpurWorldConfig {
@@ -204,10 +204,14 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean milkCuresBadOmen = true;
public double tridentLoyaltyVoidReturnHeight = 0.0D;

View File

@@ -43,10 +43,10 @@ index aab4a63e61aced51b1b6c885fd8b8426a4f14408..ad095c6bc7e00d286c83e37f84d8ed5d
// CraftBukkit start
Level world = pointer.getLevel();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index dc3eb512777f66c4f7fceb30c9b304f9fa29fbdb..2010a7a7418d19aec51af7de102dd42eb4542a47 100644
index 1decce49172573c4c5cbd8272c64483382feb09d..4dad41b88b5762bc9f93313558f37c3a1f078305 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -207,6 +207,11 @@ public class PurpurWorldConfig {
@@ -214,6 +214,11 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

View File

@@ -17,10 +17,10 @@ index aa7c022c4faade23bd9061311d4152cf845d3331..d4a19fc38027717e43353bc62ef23e56
} else {
return Boat.Status.IN_AIR;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2010a7a7418d19aec51af7de102dd42eb4542a47..24bacb54f53794862adc717004402318267d337b 100644
index 4dad41b88b5762bc9f93313558f37c3a1f078305..a0365a7b10bb77f514437f7056c7a501b565382c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -194,12 +194,14 @@ public class PurpurWorldConfig {
@@ -201,12 +201,14 @@ public class PurpurWorldConfig {
});
}

View File

@@ -73,10 +73,10 @@ index e246bf034a86deba5a15e7c639f5e08213fe7eee..585b29a214d0306ac2d6a170125270c1
Entry<EquipmentSlot, ItemStack> entry = getRandomItemWith(enchantment, entityliving);
return entry != null ? entry.getValue() : ItemStack.EMPTY;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 24bacb54f53794862adc717004402318267d337b..453b3d2758ce9b1b8c1d12524befc868b56f2cc6 100644
index a0365a7b10bb77f514437f7056c7a501b565382c..19eb2faa78ea974d7d8e31bc35956aba15214e4c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -194,6 +194,7 @@ public class PurpurWorldConfig {
@@ -201,6 +201,7 @@ public class PurpurWorldConfig {
});
}
@@ -84,7 +84,7 @@ index 24bacb54f53794862adc717004402318267d337b..453b3d2758ce9b1b8c1d12524befc868
public boolean boatEjectPlayersOnLand = false;
public boolean disableDropsOnCrammingDeath = false;
public boolean milkCuresBadOmen = true;
@@ -201,6 +202,7 @@ public class PurpurWorldConfig {
@@ -208,6 +209,7 @@ public class PurpurWorldConfig {
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
private void miscGameplayMechanicsSettings() {

View File

@@ -99,10 +99,10 @@ index 510ed67a7de2b503ab8b01db57ed09ee33b0d825..3f53dc8f250ad3f7616ce7ef0a2353ca
entityhuman.startAutoSpinAttack(20);
if (entityhuman.isOnGround()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f3408e38ab06c60f3369b5795bed6d9efd53fe0f..de8e853a34738ab09d887361f9e60cfb7a726ce2 100644
index 19eb2faa78ea974d7d8e31bc35956aba15214e4c..782f59ae094bac5c7c86b5c21418e9a7383d3226 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -88,6 +88,19 @@ public class PurpurWorldConfig {
@@ -95,6 +95,19 @@ public class PurpurWorldConfig {
armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
}

View File

@@ -94,10 +94,10 @@ index 158719d46c96bb733a00e08c8285f41a48406abf..5201e59c7ce9e92790c185279ba69d7f
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index de8e853a34738ab09d887361f9e60cfb7a726ce2..572db67801321091942bb88bbdd1416ec9864d9c 100644
index 782f59ae094bac5c7c86b5c21418e9a7383d3226..1804be45445fee8ba4e30950792693ff47eca9a8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,6 +101,49 @@ public class PurpurWorldConfig {
@@ -108,6 +108,49 @@ public class PurpurWorldConfig {
elytraDamagePerTridentBoost = getInt("gameplay-mechanics.elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
}

View File

@@ -17,10 +17,10 @@ index d478627dcd2b6e3d3d95b3fa224a25d44e6bbafb..158fc5748f175708a0c3415a2217663f
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index f85849c637c338d42aa6f8d5f96b189113658422..e4031bdfca9cfd1b54d13187f276b15c640dea88 100644
index db9c33cc36099fb6b203a5526b6399ca3a067d83..ce6ae54b8739d699b756bb8b46180cebd6fe353e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -133,12 +133,14 @@ public class PurpurConfig {
@@ -160,12 +160,14 @@ public class PurpurConfig {
public static String afkBroadcastBack = "<yellow><italic>%s is no longer AFK";
public static String afkTabListPrefix = "[AFK] ";
public static String afkTabListSuffix = "";

View File

@@ -17,10 +17,10 @@ index 158fc5748f175708a0c3415a2217663f77271bc7..9cbaaf4cd138e6c1d2d51afcef24a81a
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index e4031bdfca9cfd1b54d13187f276b15c640dea88..47c71cf5793c8e0c72795effeb189c46f29d6a41 100644
index ce6ae54b8739d699b756bb8b46180cebd6fe353e..e831b4dbf5dd702acc531a2ca7ee7068dff91408 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -133,6 +133,7 @@ public class PurpurConfig {
@@ -160,6 +160,7 @@ public class PurpurConfig {
public static String afkBroadcastBack = "<yellow><italic>%s is no longer AFK";
public static String afkTabListPrefix = "[AFK] ";
public static String afkTabListSuffix = "";
@@ -28,7 +28,7 @@ index e4031bdfca9cfd1b54d13187f276b15c640dea88..47c71cf5793c8e0c72795effeb189c46
public static String pingCommandOutput = "<green>%s's ping is %sms";
private static void messages() {
cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
@@ -140,6 +141,7 @@ public class PurpurConfig {
@@ -167,6 +168,7 @@ public class PurpurConfig {
afkBroadcastBack = getString("settings.messages.afk-broadcast-back", afkBroadcastBack);
afkTabListPrefix = getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix);
afkTabListSuffix = getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix);

View File

@@ -17,10 +17,10 @@ index 9cbaaf4cd138e6c1d2d51afcef24a81a3f2973c5..f164106a957c24bdb71bde85d82948a6
net.pl3x.purpur.command.PingCommand.register(this.dispatcher); // Purpur
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 47c71cf5793c8e0c72795effeb189c46f29d6a41..d847ef8fc7c156e44cc83929f2d7232eea3c0f14 100644
index e831b4dbf5dd702acc531a2ca7ee7068dff91408..fa58d301da334cf901b7c2d4a747ef6da96db69d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -133,6 +133,7 @@ public class PurpurConfig {
@@ -160,6 +160,7 @@ public class PurpurConfig {
public static String afkBroadcastBack = "<yellow><italic>%s is no longer AFK";
public static String afkTabListPrefix = "[AFK] ";
public static String afkTabListSuffix = "";
@@ -28,7 +28,7 @@ index 47c71cf5793c8e0c72795effeb189c46f29d6a41..d847ef8fc7c156e44cc83929f2d7232e
public static String demoCommandOutput = "<green>%s has been shown the demo screen";
public static String pingCommandOutput = "<green>%s's ping is %sms";
private static void messages() {
@@ -141,6 +142,7 @@ public class PurpurConfig {
@@ -168,6 +169,7 @@ public class PurpurConfig {
afkBroadcastBack = getString("settings.messages.afk-broadcast-back", afkBroadcastBack);
afkTabListPrefix = getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix);
afkTabListSuffix = getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix);

View File

@@ -167,10 +167,10 @@ index 04d09123f70a192f1283c0d7e8a8254f3d30889a..43ef93d2c0c59e0d7021ee9aa2b44345
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9f602b143f277510988611b1b93e19c90708a582..0e7dee25ab748fe3529dd2e67de97e68b8cb8d03 100644
index 1804be45445fee8ba4e30950792693ff47eca9a8..506b22fe75866f1c7dc1c3f15c18ae0e2bf23626 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -508,6 +508,9 @@ public class PurpurWorldConfig {
@@ -515,6 +515,9 @@ public class PurpurWorldConfig {
public boolean drownedRidableInWater = false;
public double drownedMaxHealth = 20.0D;
public double drownedSpawnReinforcements = 0.1D;
@@ -180,7 +180,7 @@ index 9f602b143f277510988611b1b93e19c90708a582..0e7dee25ab748fe3529dd2e67de97e68
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -518,6 +521,9 @@ public class PurpurWorldConfig {
@@ -525,6 +528,9 @@ public class PurpurWorldConfig {
}
drownedMaxHealth = getDouble("mobs.drowned.attributes.max_health", drownedMaxHealth);
drownedSpawnReinforcements = getDouble("mobs.drowned.attributes.spawn_reinforcements", drownedSpawnReinforcements);
@@ -190,7 +190,7 @@ index 9f602b143f277510988611b1b93e19c90708a582..0e7dee25ab748fe3529dd2e67de97e68
}
public boolean elderGuardianRidable = false;
@@ -730,6 +736,9 @@ public class PurpurWorldConfig {
@@ -737,6 +743,9 @@ public class PurpurWorldConfig {
public boolean huskRidableInWater = false;
public double huskMaxHealth = 20.0D;
public double huskSpawnReinforcements = 0.1D;
@@ -200,7 +200,7 @@ index 9f602b143f277510988611b1b93e19c90708a582..0e7dee25ab748fe3529dd2e67de97e68
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -740,6 +749,9 @@ public class PurpurWorldConfig {
@@ -747,6 +756,9 @@ public class PurpurWorldConfig {
}
huskMaxHealth = getDouble("mobs.husk.attributes.max_health", huskMaxHealth);
huskSpawnReinforcements = getDouble("mobs.husk.attributes.spawn_reinforcements", huskSpawnReinforcements);
@@ -210,7 +210,7 @@ index 9f602b143f277510988611b1b93e19c90708a582..0e7dee25ab748fe3529dd2e67de97e68
}
public boolean illusionerRidable = false;
@@ -1442,6 +1454,9 @@ public class PurpurWorldConfig {
@@ -1449,6 +1461,9 @@ public class PurpurWorldConfig {
public boolean zombieRidableInWater = false;
public double zombieMaxHealth = 20.0D;
public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index 9f602b143f277510988611b1b93e19c90708a582..0e7dee25ab748fe3529dd2e67de97e68
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1452,6 +1467,9 @@ public class PurpurWorldConfig {
@@ -1459,6 +1474,9 @@ public class PurpurWorldConfig {
}
zombieMaxHealth = getDouble("mobs.zombie.attributes.max_health", zombieMaxHealth);
zombieSpawnReinforcements = getDouble("mobs.zombie.attributes.spawn_reinforcements", zombieSpawnReinforcements);
@@ -230,7 +230,7 @@ index 9f602b143f277510988611b1b93e19c90708a582..0e7dee25ab748fe3529dd2e67de97e68
}
public boolean zombieHorseRidableInWater = false;
@@ -1485,6 +1503,9 @@ public class PurpurWorldConfig {
@@ -1492,6 +1510,9 @@ public class PurpurWorldConfig {
public boolean zombieVillagerRidableInWater = false;
public double zombieVillagerMaxHealth = 20.0D;
public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index 9f602b143f277510988611b1b93e19c90708a582..0e7dee25ab748fe3529dd2e67de97e68
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -1495,12 +1516,18 @@ public class PurpurWorldConfig {
@@ -1502,12 +1523,18 @@ public class PurpurWorldConfig {
}
zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
@@ -259,7 +259,7 @@ index 9f602b143f277510988611b1b93e19c90708a582..0e7dee25ab748fe3529dd2e67de97e68
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1511,5 +1538,8 @@ public class PurpurWorldConfig {
@@ -1518,5 +1545,8 @@ public class PurpurWorldConfig {
}
zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);

View File

@@ -258,10 +258,10 @@ index 5e069ac0c57d2a3a23f6e4483d12ce298d172691..916c29d08fbcf245ad6f50f8e8cc1736
private float speed = 0.1F;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0e7dee25ab748fe3529dd2e67de97e68b8cb8d03..4bd850773e9cd77363f52e9bf186050a09d3419e 100644
index 506b22fe75866f1c7dc1c3f15c18ae0e2bf23626..539b32290edd76080d369b9ea2ad63704d29cfcb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -921,6 +921,9 @@ public class PurpurWorldConfig {
@@ -928,6 +928,9 @@ public class PurpurWorldConfig {
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
public double phantomMaxHealth = 20.0D;
@@ -271,7 +271,7 @@ index 0e7dee25ab748fe3529dd2e67de97e68b8cb8d03..4bd850773e9cd77363f52e9bf186050a
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -934,6 +937,9 @@ public class PurpurWorldConfig {
@@ -941,6 +944,9 @@ public class PurpurWorldConfig {
set("mobs.phantom.attributes.max_health", oldValue);
}
phantomMaxHealth = getDouble("mobs.phantom.attributes.max_health", phantomMaxHealth);

View File

@@ -48,10 +48,10 @@ index 79504dc3448402e73b09c4232b1fd0488872cf68..300c9f136edace2babea4a574090b184
for (int l = 0; l < k; ++l) {
// Paper start
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4bd850773e9cd77363f52e9bf186050a09d3419e..672009f1022b55559322823a93cf1463fa6c63c5 100644
index 539b32290edd76080d369b9ea2ad63704d29cfcb..01240f698be684cea7cd5934c5588eaaf8fb718d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -924,6 +924,18 @@ public class PurpurWorldConfig {
@@ -931,6 +931,18 @@ public class PurpurWorldConfig {
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
public double phantomOrbitCrystalRadius = 0.0D;
@@ -70,7 +70,7 @@ index 4bd850773e9cd77363f52e9bf186050a09d3419e..672009f1022b55559322823a93cf1463
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -940,6 +952,18 @@ public class PurpurWorldConfig {
@@ -947,6 +959,18 @@ public class PurpurWorldConfig {
phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
phantomOrbitCrystalRadius = getDouble("mobs.phantom.orbit-crystal-radius", phantomOrbitCrystalRadius);

View File

@@ -27,10 +27,10 @@ index 163a7861f987c3832aac51cc6df950c768546731..bf5765b6af9c7807d50f7daaacb5d524
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 672009f1022b55559322823a93cf1463fa6c63c5..943a20291e88bbd45fff1885bfd1979e57082e92 100644
index 01240f698be684cea7cd5934c5588eaaf8fb718d..7c37a655ca165bb5bc8b98b1c62ce74ec3424eac 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -267,6 +267,22 @@ public class PurpurWorldConfig {
@@ -274,6 +274,22 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

View File

@@ -18,10 +18,10 @@ index af4eb4a8814491afef449a2874521636957d7557..365c28300ecfbe0161716972adf22a8a
public static boolean canSetSpawn(Level world) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 943a20291e88bbd45fff1885bfd1979e57082e92..6cd97f728e06ae5c1732102bba2ce68c9bdc8327 100644
index 7c37a655ca165bb5bc8b98b1c62ce74ec3424eac..9b5123a723270a5f7a8ee3e207e8e6dd8e7ebfb9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -304,6 +304,22 @@ public class PurpurWorldConfig {
@@ -311,6 +311,22 @@ public class PurpurWorldConfig {
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
}

View File

@@ -68,10 +68,10 @@ index df4f2c729f09d5229553308e4876f29de648543f..f2b0278679fa649bbc2904660e0dc9ab
} else {
world.setBlockAndUpdate(pos, Blocks.WATER.defaultBlockState());
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index d847ef8fc7c156e44cc83929f2d7232eea3c0f14..9fb6bf4cd4d812481fc9bb11075a4ce9c7eaab0b 100644
index fa58d301da334cf901b7c2d4a747ef6da96db69d..40559def56630d31bbe2627b66dff31e8a989c6c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -192,6 +192,11 @@ public class PurpurConfig {
@@ -219,6 +219,11 @@ public class PurpurConfig {
dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
}

View File

@@ -89,10 +89,10 @@ index de3f7b0798d803e6d13a3c95aaaef3045ea22fed..9b8b82bf5bb276be51b8ba5c023879b3
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index af064d4ea1c64a5cd99b784a04599b650cd83d5d..8ba4f1abcb6832878339bd6bd3e12f5e7f046774 100644
index 9b5123a723270a5f7a8ee3e207e8e6dd8e7ebfb9..241439c61b8c871176f4206f22f6dfcc046c3998 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,6 +101,11 @@ public class PurpurWorldConfig {
@@ -108,6 +108,11 @@ public class PurpurWorldConfig {
elytraDamagePerTridentBoost = getInt("gameplay-mechanics.elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
}

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index c6e33f674543841710d351235a1a2b2223422a0d..045bdac43418ff34381e5908cb666e616c77ece2 100644
index 216ba235748215c80b6f6dc4914a24ac1d845024..1fbb9242f2dcc83befc1c91e55565e73f721af95 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2457,5 +2457,25 @@ public class ServerPlayer extends Player {
@@ -55,10 +55,10 @@ index 7192cc7e5a78af2a611bfd853972ac92a5490f23..d96c4d52282e69180273322cb9a83f73
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8ba4f1abcb6832878339bd6bd3e12f5e7f046774..43c8dc815f4e756e270b1a130ec67dba5f4cb453 100644
index 241439c61b8c871176f4206f22f6dfcc046c3998..4c259296f1fb038739de113c9eb0f00c5673c6ac 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -219,6 +219,7 @@ public class PurpurWorldConfig {
@@ -226,6 +226,7 @@ public class PurpurWorldConfig {
public boolean playerInvulnerableWhileAcceptingResourcePack = false;
public String playerDeathExpDropEquation = "expLevel * 7";
public int playerDeathExpDropMax = 100;
@@ -66,7 +66,7 @@ index 8ba4f1abcb6832878339bd6bd3e12f5e7f046774..43c8dc815f4e756e270b1a130ec67dba
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -228,6 +229,7 @@ public class PurpurWorldConfig {
@@ -235,6 +236,7 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Squid EAR immunity
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 89be0e1d958e7c1ed539895cb269296bb9599c64..2d3c95013d680a975943d403fa413e68102a400d 100644
index 4c259296f1fb038739de113c9eb0f00c5673c6ac..7a504780ff7ce1fc3bd345d36202f42167df1b4e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1257,6 +1257,7 @@ public class PurpurWorldConfig {
@@ -1264,6 +1264,7 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public double squidMaxHealth = 10.0D;
@@ -16,7 +16,7 @@ index 89be0e1d958e7c1ed539895cb269296bb9599c64..2d3c95013d680a975943d403fa413e68
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1265,6 +1266,7 @@ public class PurpurWorldConfig {
@@ -1272,6 +1273,7 @@ public class PurpurWorldConfig {
set("mobs.squid.attributes.max_health", oldValue);
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);

View File

@@ -835,17 +835,10 @@ index ed3944a60d09495eb424dd11d00e8c3585177d51..fcf25cc905ece0213a0eb6365a0a5756
return false;
} else {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 9fb6bf4cd4d812481fc9bb11075a4ce9c7eaab0b..18af1952331ea6037495c1aa57ab41fbd080f0f9 100644
index 40559def56630d31bbe2627b66dff31e8a989c6c..44286c661943cb147372b7864709485e747545c1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -1,5 +1,6 @@
package net.pl3x.purpur;
+import co.aikar.timings.TimingsManager;
import com.google.common.base.Throwables;
import net.minecraft.server.MinecraftServer;
import net.pl3x.purpur.command.PurpurCommand;
@@ -147,6 +148,128 @@ public class PurpurConfig {
@@ -174,6 +174,128 @@ public class PurpurConfig {
pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
}

View File

@@ -47,10 +47,10 @@ index 916c29d08fbcf245ad6f50f8e8cc173677b01081..c55aba456aa144e58fc35877c61eff30
list.sort(Comparator.<Player, Double>comparing(Entity::getY).reversed()); // Paper - remap fix
Iterator iterator = list.iterator();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2d3c95013d680a975943d403fa413e68102a400d..fa699ad8f555131b71f83cb8a43b6ba10a37a00c 100644
index 7a504780ff7ce1fc3bd345d36202f42167df1b4e..f478cd6f8f258c5a456c0a8e54ed1274a5b7526d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -975,6 +975,9 @@ public class PurpurWorldConfig {
@@ -982,6 +982,9 @@ public class PurpurWorldConfig {
public int phantomSpawnOverheadRadius = 10;
public int phantomSpawnMinPerAttempt = 1;
public int phantomSpawnMaxPerAttempt = -1;
@@ -60,7 +60,7 @@ index 2d3c95013d680a975943d403fa413e68102a400d..fa699ad8f555131b71f83cb8a43b6ba1
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1003,6 +1006,9 @@ public class PurpurWorldConfig {
@@ -1010,6 +1013,9 @@ public class PurpurWorldConfig {
phantomSpawnOverheadRadius = getInt("mobs.phantom.spawn.overhead.radius", phantomSpawnOverheadRadius);
phantomSpawnMinPerAttempt = getInt("mobs.phantom.spawn.per-attempt.min", phantomSpawnMinPerAttempt);
phantomSpawnMaxPerAttempt = getInt("mobs.phantom.spawn.per-attempt.max", phantomSpawnMaxPerAttempt);

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable villager breeding
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 5e100dbdbd6cfb4aa34b0d6b1ce0913899f60b7c..1e05cc98a332e5b115c4670e5331e679117c6629 100644
index 3865f16e027307f5b8b2a5617b66ffd8b9f85c60..bb3572370a86519a92b7b3dab0482cd1527de19d 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -751,7 +751,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -18,10 +18,10 @@ index 5e100dbdbd6cfb4aa34b0d6b1ce0913899f60b7c..1e05cc98a332e5b115c4670e5331e679
private boolean hungry() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fa699ad8f555131b71f83cb8a43b6ba10a37a00c..df85b6c0f861b25422b69a08ada6a8e537afbb14 100644
index f478cd6f8f258c5a456c0a8e54ed1274a5b7526d..2cf5ebe674ca8ecee7ebc7084259ac1dd8c17564 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1400,6 +1400,7 @@ public class PurpurWorldConfig {
@@ -1407,6 +1407,7 @@ public class PurpurWorldConfig {
public boolean villagerCanBeLeashed = false;
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
@@ -29,7 +29,7 @@ index fa699ad8f555131b71f83cb8a43b6ba10a37a00c..df85b6c0f861b25422b69a08ada6a8e5
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1415,6 +1416,7 @@ public class PurpurWorldConfig {
@@ -1422,6 +1423,7 @@ public class PurpurWorldConfig {
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);

View File

@@ -17,10 +17,10 @@ index 9228c0bc797fb95c8ac949bdc568eadafee84a80..f2c9f841d397f445cd3d0420f19e765c
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index df85b6c0f861b25422b69a08ada6a8e537afbb14..2fe461aa6b25bc1eda8f6e307914eab9760e504c 100644
index 2cf5ebe674ca8ecee7ebc7084259ac1dd8c17564..d0e05b1020d3bf64a6ba23ef7aac1133a7779990 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -334,6 +334,11 @@ public class PurpurWorldConfig {
@@ -341,6 +341,11 @@ public class PurpurWorldConfig {
signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
}

View File

@@ -29,10 +29,10 @@ index d96c4d52282e69180273322cb9a83f7365667fe3..0fa7a658af3dc1766e06d90d396a426c
event.setCancelled(itemstack == null);
this.level.getCraftServer().getPluginManager().callEvent(event);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index edeb6fff3bdd716ed1771705b79853d913cd1bbc..1a3ea260a5532db2aa14bab3145f3a00d6683cea 100644
index d0e05b1020d3bf64a6ba23ef7aac1133a7779990..7bcb4fdb7733e477f306ef15667958228704a5f0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -220,6 +220,7 @@ public class PurpurWorldConfig {
@@ -227,6 +227,7 @@ public class PurpurWorldConfig {
public String playerDeathExpDropEquation = "expLevel * 7";
public int playerDeathExpDropMax = 100;
public boolean teleportIfOutsideBorder = false;
@@ -40,7 +40,7 @@ index edeb6fff3bdd716ed1771705b79853d913cd1bbc..1a3ea260a5532db2aa14bab3145f3a00
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -230,6 +231,7 @@ public class PurpurWorldConfig {
@@ -237,6 +238,7 @@ public class PurpurWorldConfig {
playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);

View File

@@ -30,10 +30,10 @@ index 76e6ea34db3942e9dd7646ad7ca1259f4387a4d8..9096c40ad5784d9097e889f0f43b6cf1
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 716898ec4ff67c64d96a47f5f76ea7096dbeb61c..ff4c9d73d3390c4367bb92e094a9eba5f5399ae5 100644
index 7bcb4fdb7733e477f306ef15667958228704a5f0..0317bab2b696af2624d0384684d0e9b2e1abe749 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1429,6 +1429,7 @@ public class PurpurWorldConfig {
@@ -1436,6 +1436,7 @@ public class PurpurWorldConfig {
public boolean vindicatorRidable = false;
public boolean vindicatorRidableInWater = false;
public double vindicatorMaxHealth = 24.0D;
@@ -41,7 +41,7 @@ index 716898ec4ff67c64d96a47f5f76ea7096dbeb61c..ff4c9d73d3390c4367bb92e094a9eba5
private void vindicatorSettings() {
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
@@ -1438,6 +1439,7 @@ public class PurpurWorldConfig {
@@ -1445,6 +1446,7 @@ public class PurpurWorldConfig {
set("mobs.vindicator.attributes.max_health", oldValue);
}
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);

View File

@@ -117,10 +117,10 @@ index f8e58d9f71703139a736d93e7f1996e027a29444..d3c8fd8399629efb8bcbaf7d9a0c4334
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 18af1952331ea6037495c1aa57ab41fbd080f0f9..11694f63641932c165c343bec254d0b1a94358ea 100644
index 44286c661943cb147372b7864709485e747545c1..96dc811c655672e6fdb23865d63b564331ec7d88 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -320,6 +320,15 @@ public class PurpurConfig {
@@ -346,6 +346,15 @@ public class PurpurConfig {
allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd);
}

View File

@@ -41,10 +41,10 @@ index 92623ae25249d63efb92be8bd6c95228f9155ad2..20bf6d01046488eff53a109f5239351a
static void setEntityPokingOutOfBlock(BlockSource pointer, Entity entity, Direction direction) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ff4c9d73d3390c4367bb92e094a9eba5f5399ae5..81a6f90e1506fcb57b75281a09459c9c7b86494b 100644
index 0317bab2b696af2624d0384684d0e9b2e1abe749..ff2f7ecafe75f8c5d17e44dd1271c24e40b57410 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -293,8 +293,10 @@ public class PurpurWorldConfig {
@@ -300,8 +300,10 @@ public class PurpurWorldConfig {
}
public boolean dispenserApplyCursedArmor = true;

View File

@@ -37,10 +37,10 @@ index c81af461fa01dac0b7b26becc1a5e7ae31bb5f95..2dbc71a3d76cc87e2683b8f351bd8db0
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 81a6f90e1506fcb57b75281a09459c9c7b86494b..fbfb46f1a4ab5dd49059a51d5938431d76c880be 100644
index ff2f7ecafe75f8c5d17e44dd1271c24e40b57410..3db1e63c7689c0fa12335d2b28f500f5b48e5f18 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -276,6 +276,11 @@ public class PurpurWorldConfig {
@@ -283,6 +283,11 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

View File

@@ -35,10 +35,10 @@ index 7538262e14c86e4da9cd4cb887b76f649bfef2e6..f34973be478de4f088a0593b45bd89e5
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fbfb46f1a4ab5dd49059a51d5938431d76c880be..17e473ffde0aa075e97b76c6dcb47648ad57cc99 100644
index 3db1e63c7689c0fa12335d2b28f500f5b48e5f18..18ba4b452147cd2f320ac243f859f2edd39dafd1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -276,6 +276,28 @@ public class PurpurWorldConfig {
@@ -283,6 +283,28 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

View File

@@ -17,10 +17,10 @@ index c372d47a929e06c8cfb0df86cf4e9bfee4d4b300..2aead13e8f879b614445715fb1912a20
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 17e473ffde0aa075e97b76c6dcb47648ad57cc99..d647f3bcebbacdfd603da7897d7b66a357e818d4 100644
index 18ba4b452147cd2f320ac243f859f2edd39dafd1..8b1c836759edec76fa9337e60f8795daf9b92d22 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -542,6 +542,7 @@ public class PurpurWorldConfig {
@@ -549,6 +549,7 @@ public class PurpurWorldConfig {
public float dolphinSpitSpeed = 1.0F;
public float dolphinSpitDamage = 2.0F;
public double dolphinMaxHealth = 10.0D;
@@ -28,7 +28,7 @@ index 17e473ffde0aa075e97b76c6dcb47648ad57cc99..d647f3bcebbacdfd603da7897d7b66a3
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinSpitCooldown = getInt("mobs.dolphin.spit.cooldown", dolphinSpitCooldown);
@@ -553,6 +554,7 @@ public class PurpurWorldConfig {
@@ -560,6 +561,7 @@ public class PurpurWorldConfig {
set("mobs.dolphin.attributes.max_health", oldValue);
}
dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);

View File

@@ -31,19 +31,10 @@ index 6e0b5fbf5b0d216b6b7c647d45ef37cd6b591717..5ebedd6a156b06e98aded57c817f6342
if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
for (int i = 0; i < 64; ++i) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 11694f63641932c165c343bec254d0b1a94358ea..223d93c5c03a43076d8544232e3656c4c29ad2d0 100644
index 96dc811c655672e6fdb23865d63b564331ec7d88..c283926d05fa60c576b8018bcaee465a03a699a5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -3,6 +3,8 @@ package net.pl3x.purpur;
import co.aikar.timings.TimingsManager;
import com.google.common.base.Throwables;
import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.entity.EntityDimensions;
+import net.minecraft.world.entity.EntityType;
import net.pl3x.purpur.command.PurpurCommand;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
@@ -310,6 +312,12 @@ public class PurpurConfig {
@@ -336,6 +336,12 @@ public class PurpurConfig {
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
}

View File

@@ -60,10 +60,10 @@ index 6f7e6429c35eea346517cbf08cf223fc6d838a8c..6a77112180556675af38cb1b3ce0b38a
+ // Purpur
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d647f3bcebbacdfd603da7897d7b66a357e818d4..556d5edc7ad8acb676cfb60ec18bca60e24dcfd8 100644
index 8b1c836759edec76fa9337e60f8795daf9b92d22..fec1dd7acd0f466cb27753bc93357ec45ed86162 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1302,6 +1302,7 @@ public class PurpurWorldConfig {
@@ -1309,6 +1309,7 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
@@ -71,7 +71,7 @@ index d647f3bcebbacdfd603da7897d7b66a357e818d4..556d5edc7ad8acb676cfb60ec18bca60
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1311,6 +1312,7 @@ public class PurpurWorldConfig {
@@ -1318,6 +1319,7 @@ public class PurpurWorldConfig {
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);

View File

@@ -18,10 +18,10 @@ index c07b5d1f1ef8b5e6026c7555d476880c8802d6c5..068f1b184a3694603f564d49fa45d5ce
private final LevelAccessor level;
private final Direction.Axis axis;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 223d93c5c03a43076d8544232e3656c4c29ad2d0..cd9f2217beba48a204edd3769429fa1ab312ab69 100644
index c283926d05fa60c576b8018bcaee465a03a699a5..380bb11ea7cabd9513397dec5eb171f4269418bb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -296,6 +296,7 @@ public class PurpurConfig {
@@ -320,6 +320,7 @@ public class PurpurConfig {
public static boolean barrelSixRows = false;
public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false;
@@ -29,7 +29,7 @@ index 223d93c5c03a43076d8544232e3656c4c29ad2d0..cd9f2217beba48a204edd3769429fa1a
private static void blockSettings() {
if (version < 3) {
boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
@@ -310,6 +311,7 @@ public class PurpurConfig {
@@ -334,6 +335,7 @@ public class PurpurConfig {
enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);
org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);

View File

@@ -27,10 +27,10 @@ index e43b31f07d6f0cbb35f925dca952b5947fe1fd4f..cc5854281d976c2faa453c2a6b07b574
public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 556d5edc7ad8acb676cfb60ec18bca60e24dcfd8..888674faa5d804e1a011ca266043da5c7ecf6ce6 100644
index fec1dd7acd0f466cb27753bc93357ec45ed86162..6dd08d200d17891e9277dbef396087a1e713dc2a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -262,6 +262,7 @@ public class PurpurWorldConfig {
@@ -269,6 +269,7 @@ public class PurpurWorldConfig {
public boolean useBetterMending = false;
public boolean boatEjectPlayersOnLand = false;
public boolean disableDropsOnCrammingDeath = false;
@@ -38,7 +38,7 @@ index 556d5edc7ad8acb676cfb60ec18bca60e24dcfd8..888674faa5d804e1a011ca266043da5c
public boolean milkCuresBadOmen = true;
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
@@ -270,6 +271,7 @@ public class PurpurWorldConfig {
@@ -277,6 +278,7 @@ public class PurpurWorldConfig {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);

View File

@@ -23,10 +23,10 @@ index 22dd455b3b9c148f38a63f72901009f864e63a4b..689df66281ef84f0cc31d89c6f2e654c
this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth());
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 888674faa5d804e1a011ca266043da5c7ecf6ce6..a5123bea0e5da28591216d9365529aa99d199e5f 100644
index 6dd08d200d17891e9277dbef396087a1e713dc2a..2dabbe5d444e108fcf167dd001921c9c5c2294fd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1513,6 +1513,8 @@ public class PurpurWorldConfig {
@@ -1520,6 +1520,8 @@ public class PurpurWorldConfig {
public boolean witherRidableInWater = false;
public double witherMaxY = 256D;
public double witherMaxHealth = 300.0D;
@@ -35,7 +35,7 @@ index 888674faa5d804e1a011ca266043da5c7ecf6ce6..a5123bea0e5da28591216d9365529aa9
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1527,6 +1529,8 @@ public class PurpurWorldConfig {
@@ -1534,6 +1536,8 @@ public class PurpurWorldConfig {
set("mobs.wither.attributes.max_health", oldValue);
}
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);

View File

@@ -94,10 +94,10 @@ index f8ede3588bfda9a7d4d5807311a3e9c2651fd0a3..56967cef0f184def046935e20148574f
if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) {
blockposition1 = blockposition2;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 093c44cba0675316479f5d96434092821804cfa0..2e2f5e7ca914abf1a1d22c8ea03f363643f46488 100644
index 2dabbe5d444e108fcf167dd001921c9c5c2294fd..ab389b70947d4410148f3e5f243346f63784981b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -63,6 +63,12 @@ public class PurpurWorldConfig {
@@ -69,6 +69,12 @@ public class PurpurWorldConfig {
return PurpurConfig.config.getBoolean("world-settings." + worldName + "." + path, PurpurConfig.config.getBoolean("world-settings.default." + path));
}
@@ -110,7 +110,7 @@ index 093c44cba0675316479f5d96434092821804cfa0..2e2f5e7ca914abf1a1d22c8ea03f3636
private double getDouble(String path, double def) {
PurpurConfig.config.addDefault("world-settings.default." + path, def);
return PurpurConfig.config.getDouble("world-settings." + worldName + "." + path, PurpurConfig.config.getDouble("world-settings.default." + path));
@@ -211,6 +217,21 @@ public class PurpurWorldConfig {
@@ -218,6 +224,21 @@ public class PurpurWorldConfig {
}
}

View File

@@ -52,10 +52,10 @@ index 45e369aa69a6b78def42b619b1b1b8259d4b30ea..de7443e7a27e51eabaed2d6d348ec8ea
if (!this.raidMap.containsKey(raid.getId())) {
this.raidMap.put(raid.getId(), raid);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b92862b331666f36a8cef0289b5241f03fe3bf9b..7a53ccbde201376248208090b598dc109ffd564e 100644
index ab389b70947d4410148f3e5f243346f63784981b..f0137b639ffa7335943a7dc20d06cb582e2aee9d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -288,6 +288,7 @@ public class PurpurWorldConfig {
@@ -295,6 +295,7 @@ public class PurpurWorldConfig {
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -63,7 +63,7 @@ index b92862b331666f36a8cef0289b5241f03fe3bf9b..7a53ccbde201376248208090b598dc10
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
@@ -297,6 +298,7 @@ public class PurpurWorldConfig {
@@ -304,6 +305,7 @@ public class PurpurWorldConfig {
tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);

View File

@@ -289,10 +289,10 @@ index 4a11f7417b438ee5711a720aca3321c88e970b2a..46b74271ce5f614f07754db14d2a552c
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c53852320909c7481f23b33433c771b96ae8557b..401621a9a9592558efd7c3aa043822a857ab6b41 100644
index f0137b639ffa7335943a7dc20d06cb582e2aee9d..25a5d30c58b6cc7f1debe4a5e849968015c42a9a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -255,6 +255,35 @@ public class PurpurWorldConfig {
@@ -262,6 +262,35 @@ public class PurpurWorldConfig {
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
}

View File

@@ -71,10 +71,10 @@ index 77002a4c3b03e0397515fd922f14e56b8e81074a..b80f7c71cbf7b10bda6fac3cfe673ac7
this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7b81840051e2221b3287ad03108437256addaa76..6e2bc00cc363acfcc0d2d39053aa29352f6d79ff 100644
index 25a5d30c58b6cc7f1debe4a5e849968015c42a9a..1789dba767f0d60c461f8e1feff3a862249bd03c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1636,6 +1636,7 @@ public class PurpurWorldConfig {
@@ -1643,6 +1643,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyOnlyBaby = true;
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
@@ -82,7 +82,7 @@ index 7b81840051e2221b3287ad03108437256addaa76..6e2bc00cc363acfcc0d2d39053aa2935
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1649,6 +1650,7 @@ public class PurpurWorldConfig {
@@ -1656,6 +1657,7 @@ public class PurpurWorldConfig {
zombieJockeyOnlyBaby = getBoolean("mobs.zombie.jockey.only-babies", zombieJockeyOnlyBaby);
zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);

View File

@@ -189,10 +189,10 @@ index c3a07ccccd5cc38552363c82398f432c8d624288..132c9e6a643995d9fde535a78d9edc9e
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6e2bc00cc363acfcc0d2d39053aa29352f6d79ff..92dd97364a7c40c5ff05d408d40616ac4ed11116 100644
index 1789dba767f0d60c461f8e1feff3a862249bd03c..467faae7c7a001d0c9a2eeedb60a9efc4f8024a3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -314,6 +314,7 @@ public class PurpurWorldConfig {
@@ -321,6 +321,7 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesCanUsePortals = true;
public boolean milkCuresBadOmen = true;
@@ -200,7 +200,7 @@ index 6e2bc00cc363acfcc0d2d39053aa29352f6d79ff..92dd97364a7c40c5ff05d408d40616ac
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -324,6 +325,7 @@ public class PurpurWorldConfig {
@@ -331,6 +332,7 @@ public class PurpurWorldConfig {
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);

View File

@@ -58,10 +58,10 @@ index 2affff346a7fe81480e86cb61996039df0569853..12be4a2f25a7def8341acda47d10a256
float f1 = Mth.cos(f) * 0.2F;
float f2 = -0.1F + this.squid.getRandom().nextFloat() * 0.2F;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 92dd97364a7c40c5ff05d408d40616ac4ed11116..024d03c318ab4c76f173599cdca8d7e4e1f7c4bd 100644
index 467faae7c7a001d0c9a2eeedb60a9efc4f8024a3..11db98679973399dc227bb0d63ac688c81426a97 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -801,9 +801,11 @@ public class PurpurWorldConfig {
@@ -808,9 +808,11 @@ public class PurpurWorldConfig {
public boolean glowSquidRidable = false;
public double glowSquidMaxHealth = 10.0D;
@@ -73,7 +73,7 @@ index 92dd97364a7c40c5ff05d408d40616ac4ed11116..024d03c318ab4c76f173599cdca8d7e4
}
public boolean goatRidable = false;
@@ -1359,6 +1361,7 @@ public class PurpurWorldConfig {
@@ -1366,6 +1368,7 @@ public class PurpurWorldConfig {
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
public double squidOffsetWaterCheck = 0.0D;
@@ -81,7 +81,7 @@ index 92dd97364a7c40c5ff05d408d40616ac4ed11116..024d03c318ab4c76f173599cdca8d7e4
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1369,6 +1372,7 @@ public class PurpurWorldConfig {
@@ -1376,6 +1379,7 @@ public class PurpurWorldConfig {
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);

View File

@@ -27,10 +27,10 @@ index afe33f20578177cb517e1c116e6319481642e66c..fe4695adbb506733b4029ecfabcfda3d
} else {
user.startUsingItem(hand);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f7baead9f97d680c45dd4e87e1e017bddd313494..18ffce02b1301659e898d5c7e656d6a90f6568df 100644
index 11db98679973399dc227bb0d63ac688c81426a97..63556973302e6073c2599730847549273a145755 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -112,6 +112,17 @@ public class PurpurWorldConfig {
@@ -119,6 +119,17 @@ public class PurpurWorldConfig {
entityLifeSpan = getInt("gameplay-mechanics.entity-lifespan", entityLifeSpan);
}

View File

@@ -61,10 +61,10 @@ index 2ad5ff9a1d7de54e75436e99da8a73db9dc91bde..60605a8a021cc56f9c3ba22bc43c43c3
} else if (blockState.is(Blocks.HONEY_BLOCK)) {
return BlockPathTypes.STICKY_HONEY;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 916674bd0ee39f6580d82026bf571f54fc3ec20e..6f5b372f0a9e9d9f98da61b7ead568a9c4ada3ae 100644
index 63556973302e6073c2599730847549273a145755..23c5b84db099b2ac72699cee41f8c2084adec0ed 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -437,6 +437,11 @@ public class PurpurWorldConfig {
@@ -444,6 +444,11 @@ public class PurpurWorldConfig {
spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
}

View File

@@ -70,10 +70,10 @@ index 13bee6ce45fd718484a9cf08645556717c9934e8..07e6d7b7a6d275010797c991be977d61
public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2cf088cc750aad13001859bbc8b49343e5459567..71d3d41eab2fc5068f34e8e1b20b43a19caa958e 100644
index 23c5b84db099b2ac72699cee41f8c2084adec0ed..e23b646a5f2661a26e069021bebaa06706185d80 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -94,6 +94,13 @@ public class PurpurWorldConfig {
@@ -101,6 +101,13 @@ public class PurpurWorldConfig {
armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
}

View File

@@ -17,10 +17,10 @@ index 3aece8245060dd1ba269c08d226c84247a6f0a83..6763d0b96c83d1b462999f525bf1f31c
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index cd9f2217beba48a204edd3769429fa1ab312ab69..327dc3b4a06ed180521153c4ce5c57dfdf560aef 100644
index 380bb11ea7cabd9513397dec5eb171f4269418bb..1d9fa061b0a109296a1bcc7d06a7786ddc76d1b9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -314,6 +314,16 @@ public class PurpurConfig {
@@ -338,6 +338,16 @@ public class PurpurConfig {
cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
}

View File

@@ -48,10 +48,10 @@ index 348e485897c34cca19113cc35f055a58778ca38b..1eab83cefdf1484b8cf80072d9a0ee61
private static boolean canBurn(@Nullable Recipe<?> recipe, NonNullList<ItemStack> slots, int count) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a3091e4c78544f8ee53d9ada1a8f7cd7b68de49d..fc75bc0436afb9531024a542616707fc1420a0ba 100644
index e23b646a5f2661a26e069021bebaa06706185d80..8131cbb602e809770acbdb32a78b2ca36f310689 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -405,6 +405,11 @@ public class PurpurWorldConfig {
@@ -412,6 +412,11 @@ public class PurpurWorldConfig {
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
}

View File

@@ -24,10 +24,10 @@ index 5d9d77cb382c8075af2713a0ce26c28a35a0aaa8..2d4d59eb5a534e4c283933b734c44776
return;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fc75bc0436afb9531024a542616707fc1420a0ba..f7cbd213c39cdc388651b133acf119d7c0d8387e 100644
index 8131cbb602e809770acbdb32a78b2ca36f310689..a87f6bc71dfa8f5f98f592e13152a5a8384a445d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -401,8 +401,10 @@ public class PurpurWorldConfig {
@@ -408,8 +408,10 @@ public class PurpurWorldConfig {
}
public boolean farmlandGetsMoistFromBelow = false;

View File

@@ -95,10 +95,10 @@ index 65aba9a17a76e56c0140220ab00645a1e02cc8b5..bfac7888f71232ac095e2615bddf05d7
this.world = new CraftWorld((ServerLevel) this, gen, env);
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f7cbd213c39cdc388651b133acf119d7c0d8387e..d7f9e34ea49b786e515a75969ba088fe8f84fb52 100644
index a87f6bc71dfa8f5f98f592e13152a5a8384a445d..4dcff94e8ccf1af911be322c04871b8d561f60ca 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -337,6 +337,7 @@ public class PurpurWorldConfig {
@@ -344,6 +344,7 @@ public class PurpurWorldConfig {
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
public int raidCooldownSeconds = 0;
@@ -106,7 +106,7 @@ index f7cbd213c39cdc388651b133acf119d7c0d8387e..d7f9e34ea49b786e515a75969ba088fe
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
@@ -348,6 +349,7 @@ public class PurpurWorldConfig {
@@ -355,6 +356,7 @@ public class PurpurWorldConfig {
voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
raidCooldownSeconds = getInt("gameplay-mechanics.raid-cooldown-seconds", raidCooldownSeconds);

View File

@@ -474,10 +474,10 @@ index 5d289be8f0ef003abbce992e7662f6ddce4f4a99..5e3d7321a73144c3e4c43c18c5b748b2
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa3b3cbef3 100644
index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07455bff74 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -469,9 +469,11 @@ public class PurpurWorldConfig {
@@ -476,9 +476,11 @@ public class PurpurWorldConfig {
public boolean axolotlRidable = false;
public double axolotlMaxHealth = 14.0D;
@@ -489,7 +489,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean batRidable = false;
@@ -501,6 +503,7 @@ public class PurpurWorldConfig {
@@ -508,6 +510,7 @@ public class PurpurWorldConfig {
public boolean beeRidableInWater = false;
public double beeMaxY = 256D;
public double beeMaxHealth = 10.0D;
@@ -497,7 +497,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -511,6 +514,7 @@ public class PurpurWorldConfig {
@@ -518,6 +521,7 @@ public class PurpurWorldConfig {
set("mobs.bee.attributes.max_health", oldValue);
}
beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
@@ -505,7 +505,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean blazeRidable = false;
@@ -535,6 +539,7 @@ public class PurpurWorldConfig {
@@ -542,6 +546,7 @@ public class PurpurWorldConfig {
public int catSpawnDelay = 1200;
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
@@ -513,7 +513,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -547,6 +552,7 @@ public class PurpurWorldConfig {
@@ -554,6 +559,7 @@ public class PurpurWorldConfig {
catSpawnDelay = getInt("mobs.cat.spawn-delay", catSpawnDelay);
catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange);
catSpawnVillageScanRange = getInt("mobs.cat.scan-range-for-other-cats.village", catSpawnVillageScanRange);
@@ -521,7 +521,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean caveSpiderRidable = false;
@@ -567,6 +573,7 @@ public class PurpurWorldConfig {
@@ -574,6 +580,7 @@ public class PurpurWorldConfig {
public boolean chickenRidableInWater = false;
public double chickenMaxHealth = 4.0D;
public boolean chickenRetaliate = false;
@@ -529,7 +529,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -577,6 +584,7 @@ public class PurpurWorldConfig {
@@ -584,6 +591,7 @@ public class PurpurWorldConfig {
}
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
@@ -537,7 +537,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean codRidable = false;
@@ -595,6 +603,7 @@ public class PurpurWorldConfig {
@@ -602,6 +610,7 @@ public class PurpurWorldConfig {
public boolean cowRidableInWater = false;
public double cowMaxHealth = 10.0D;
public int cowFeedMushrooms = 0;
@@ -545,7 +545,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -605,6 +614,7 @@ public class PurpurWorldConfig {
@@ -612,6 +621,7 @@ public class PurpurWorldConfig {
}
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
@@ -553,7 +553,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean creeperRidable = false;
@@ -652,6 +662,7 @@ public class PurpurWorldConfig {
@@ -659,6 +669,7 @@ public class PurpurWorldConfig {
public double donkeyJumpStrengthMax = 0.5D;
public double donkeyMovementSpeedMin = 0.175D;
public double donkeyMovementSpeedMax = 0.175D;
@@ -561,7 +561,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
if (PurpurConfig.version < 10) {
@@ -667,6 +678,7 @@ public class PurpurWorldConfig {
@@ -674,6 +685,7 @@ public class PurpurWorldConfig {
donkeyJumpStrengthMax = getDouble("mobs.donkey.attributes.jump_strength.max", donkeyJumpStrengthMax);
donkeyMovementSpeedMin = getDouble("mobs.donkey.attributes.movement_speed.min", donkeyMovementSpeedMin);
donkeyMovementSpeedMax = getDouble("mobs.donkey.attributes.movement_speed.max", donkeyMovementSpeedMax);
@@ -569,7 +569,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean drownedRidable = false;
@@ -773,6 +785,7 @@ public class PurpurWorldConfig {
@@ -780,6 +792,7 @@ public class PurpurWorldConfig {
public boolean foxRidableInWater = false;
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
@@ -577,7 +577,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -783,6 +796,7 @@ public class PurpurWorldConfig {
@@ -790,6 +803,7 @@ public class PurpurWorldConfig {
}
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
@@ -585,7 +585,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean ghastRidable = false;
@@ -843,10 +857,12 @@ public class PurpurWorldConfig {
@@ -850,10 +864,12 @@ public class PurpurWorldConfig {
public boolean goatRidable = false;
public boolean goatRidableInWater = false;
public double goatMaxHealth = 10.0D;
@@ -598,7 +598,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean guardianRidable = false;
@@ -864,6 +880,7 @@ public class PurpurWorldConfig {
@@ -871,6 +887,7 @@ public class PurpurWorldConfig {
public boolean hoglinRidable = false;
public boolean hoglinRidableInWater = false;
public double hoglinMaxHealth = 40.0D;
@@ -606,7 +606,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void hoglinSettings() {
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
@@ -873,6 +890,7 @@ public class PurpurWorldConfig {
@@ -880,6 +897,7 @@ public class PurpurWorldConfig {
set("mobs.hoglin.attributes.max_health", oldValue);
}
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
@@ -614,7 +614,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean horseRidableInWater = false;
@@ -882,6 +900,7 @@ public class PurpurWorldConfig {
@@ -889,6 +907,7 @@ public class PurpurWorldConfig {
public double horseJumpStrengthMax = 1.0D;
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
@@ -622,7 +622,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -897,6 +916,7 @@ public class PurpurWorldConfig {
@@ -904,6 +923,7 @@ public class PurpurWorldConfig {
horseJumpStrengthMax = getDouble("mobs.horse.attributes.jump_strength.max", horseJumpStrengthMax);
horseMovementSpeedMin = getDouble("mobs.horse.attributes.movement_speed.min", horseMovementSpeedMin);
horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax);
@@ -630,7 +630,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean huskRidable = false;
@@ -967,6 +987,7 @@ public class PurpurWorldConfig {
@@ -974,6 +994,7 @@ public class PurpurWorldConfig {
public double llamaJumpStrengthMax = 0.5D;
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
@@ -638,7 +638,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -983,6 +1004,7 @@ public class PurpurWorldConfig {
@@ -990,6 +1011,7 @@ public class PurpurWorldConfig {
llamaJumpStrengthMax = getDouble("mobs.llama.attributes.jump_strength.max", llamaJumpStrengthMax);
llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
@@ -646,7 +646,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean magmaCubeRidable = false;
@@ -1002,6 +1024,7 @@ public class PurpurWorldConfig {
@@ -1009,6 +1031,7 @@ public class PurpurWorldConfig {
public boolean mooshroomRidable = false;
public boolean mooshroomRidableInWater = false;
public double mooshroomMaxHealth = 10.0D;
@@ -654,7 +654,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1011,6 +1034,7 @@ public class PurpurWorldConfig {
@@ -1018,6 +1041,7 @@ public class PurpurWorldConfig {
set("mobs.mooshroom.attributes.max_health", oldValue);
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -662,7 +662,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean muleRidableInWater = false;
@@ -1020,6 +1044,7 @@ public class PurpurWorldConfig {
@@ -1027,6 +1051,7 @@ public class PurpurWorldConfig {
public double muleJumpStrengthMax = 0.5D;
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
@@ -670,7 +670,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1035,11 +1060,13 @@ public class PurpurWorldConfig {
@@ -1042,11 +1067,13 @@ public class PurpurWorldConfig {
muleJumpStrengthMax = getDouble("mobs.mule.attributes.jump_strength.max", muleJumpStrengthMax);
muleMovementSpeedMin = getDouble("mobs.mule.attributes.movement_speed.min", muleMovementSpeedMin);
muleMovementSpeedMax = getDouble("mobs.mule.attributes.movement_speed.max", muleMovementSpeedMax);
@@ -684,7 +684,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1049,11 +1076,13 @@ public class PurpurWorldConfig {
@@ -1056,11 +1083,13 @@ public class PurpurWorldConfig {
set("mobs.ocelot.attributes.max_health", oldValue);
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -698,7 +698,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1063,6 +1092,7 @@ public class PurpurWorldConfig {
@@ -1070,6 +1099,7 @@ public class PurpurWorldConfig {
set("mobs.panda.attributes.max_health", oldValue);
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -706,7 +706,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean parrotRidable = false;
@@ -1143,6 +1173,7 @@ public class PurpurWorldConfig {
@@ -1150,6 +1180,7 @@ public class PurpurWorldConfig {
public boolean pigRidableInWater = false;
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
@@ -714,7 +714,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1153,6 +1184,7 @@ public class PurpurWorldConfig {
@@ -1160,6 +1191,7 @@ public class PurpurWorldConfig {
}
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
@@ -722,7 +722,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean piglinRidable = false;
@@ -1202,6 +1234,7 @@ public class PurpurWorldConfig {
@@ -1209,6 +1241,7 @@ public class PurpurWorldConfig {
public double polarBearMaxHealth = 30.0D;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -730,7 +730,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1214,6 +1247,7 @@ public class PurpurWorldConfig {
@@ -1221,6 +1254,7 @@ public class PurpurWorldConfig {
polarBearBreedableItemString = getString("mobs.polar_bear.breedable-item", polarBearBreedableItemString);
Item item = Registry.ITEM.get(new ResourceLocation(polarBearBreedableItemString));
if (item != Items.AIR) polarBearBreedableItem = item;
@@ -738,7 +738,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean pufferfishRidable = false;
@@ -1233,6 +1267,7 @@ public class PurpurWorldConfig {
@@ -1240,6 +1274,7 @@ public class PurpurWorldConfig {
public double rabbitMaxHealth = 3.0D;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -746,7 +746,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1244,6 +1279,7 @@ public class PurpurWorldConfig {
@@ -1251,6 +1286,7 @@ public class PurpurWorldConfig {
rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth);
rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
@@ -754,7 +754,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean ravagerRidable = false;
@@ -1275,6 +1311,7 @@ public class PurpurWorldConfig {
@@ -1282,6 +1318,7 @@ public class PurpurWorldConfig {
public boolean sheepRidable = false;
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
@@ -762,7 +762,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1284,6 +1321,7 @@ public class PurpurWorldConfig {
@@ -1291,6 +1328,7 @@ public class PurpurWorldConfig {
set("mobs.sheep.attributes.max_health", oldValue);
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -770,7 +770,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean shulkerRidable = false;
@@ -1438,6 +1476,7 @@ public class PurpurWorldConfig {
@@ -1445,6 +1483,7 @@ public class PurpurWorldConfig {
public boolean striderRidable = false;
public boolean striderRidableInWater = false;
public double striderMaxHealth = 20.0D;
@@ -778,7 +778,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1447,6 +1486,7 @@ public class PurpurWorldConfig {
@@ -1454,6 +1493,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -786,7 +786,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean traderLlamaRidable = false;
@@ -1457,6 +1497,7 @@ public class PurpurWorldConfig {
@@ -1464,6 +1504,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -794,7 +794,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1473,6 +1514,7 @@ public class PurpurWorldConfig {
@@ -1480,6 +1521,7 @@ public class PurpurWorldConfig {
traderLlamaJumpStrengthMax = getDouble("mobs.trader_llama.attributes.jump_strength.max", traderLlamaJumpStrengthMax);
traderLlamaMovementSpeedMin = getDouble("mobs.trader_llama.attributes.movement_speed.min", traderLlamaMovementSpeedMin);
traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
@@ -802,7 +802,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean tropicalFishRidable = false;
@@ -1493,6 +1535,7 @@ public class PurpurWorldConfig {
@@ -1500,6 +1542,7 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromExpOrbs = true;
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;
@@ -810,7 +810,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void turtleEggSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1505,6 +1548,7 @@ public class PurpurWorldConfig {
@@ -1512,6 +1555,7 @@ public class PurpurWorldConfig {
turtleEggsBreakFromExpOrbs = getBoolean("blocks.turtle_egg.break-from-exp-orbs", turtleEggsBreakFromExpOrbs);
turtleEggsBreakFromItems = getBoolean("blocks.turtle_egg.break-from-items", turtleEggsBreakFromItems);
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
@@ -818,7 +818,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean vexRidable = false;
@@ -1533,6 +1577,7 @@ public class PurpurWorldConfig {
@@ -1540,6 +1584,7 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
@@ -826,7 +826,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1549,6 +1594,7 @@ public class PurpurWorldConfig {
@@ -1556,6 +1601,7 @@ public class PurpurWorldConfig {
villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
@@ -834,7 +834,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
}
public boolean vindicatorRidable = false;
@@ -1642,6 +1688,7 @@ public class PurpurWorldConfig {
@@ -1649,6 +1695,7 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -842,7 +842,7 @@ index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1651,6 +1698,7 @@ public class PurpurWorldConfig {
@@ -1658,6 +1705,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

View File

@@ -142,10 +142,10 @@ index 282bfe4904637aaff1bd29e30ed18ba843c07cab..ddd50db8bb92c147d7c1eef4d1df3ac5
if (((HangingEntity) object).survives()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8777f901c5b04e0465559aa00382dbfa3b3cbef3..8cbbe6bcebe67ac1613747a94312994534395fa9 100644
index f40cc359bb7f68e3332014c43c747b07455bff74..3cbda02809a4be857b22941716cffc8f39109359 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -90,8 +90,10 @@ public class PurpurWorldConfig {
@@ -97,8 +97,10 @@ public class PurpurWorldConfig {
}
public float armorstandStepHeight = 0.0F;
@@ -156,7 +156,7 @@ index 8777f901c5b04e0465559aa00382dbfa3b3cbef3..8cbbe6bcebe67ac1613747a943129945
}
public int daytimeTicks = 12000;
@@ -333,6 +335,7 @@ public class PurpurWorldConfig {
@@ -340,6 +342,7 @@ public class PurpurWorldConfig {
public boolean entitiesCanUsePortals = true;
public boolean milkCuresBadOmen = true;
public boolean persistentTileEntityDisplayNames = false;
@@ -164,7 +164,7 @@ index 8777f901c5b04e0465559aa00382dbfa3b3cbef3..8cbbe6bcebe67ac1613747a943129945
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -345,6 +348,7 @@ public class PurpurWorldConfig {
@@ -352,6 +355,7 @@ public class PurpurWorldConfig {
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames);

View File

@@ -17,10 +17,10 @@ index 623f78c078fb3aa2665d7e8a37672438227bce6b..500c69e555c7247e20ef8cc59d834155
((Mob) newEntityLiving).setPersistenceRequired();
// Paper end
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8d79d5737cf21f0f85d2110c77a045b033a9d7b9..2634fef87b0535e048f51e53a351540ab0c23584 100644
index 3cbda02809a4be857b22941716cffc8f39109359..bc5b6c99697fd8fc31d5ec545756fa1d7a161176 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -91,9 +91,11 @@ public class PurpurWorldConfig {
@@ -98,9 +98,11 @@ public class PurpurWorldConfig {
public float armorstandStepHeight = 0.0F;
public boolean armorstandSetNameVisible = false;

View File

@@ -82,10 +82,10 @@ index 35b2bad76c45b5a94ba7f2e9c7a8cfeb8c3f498b..d2cb1a7e7ea364cb8e2af4c4e756d8e4
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 18ddc7b26898a1f63bbdba02b63a0abcf10edd85..a5dee4b756e4e66255f634e025c069f874f592f4 100644
index bc5b6c99697fd8fc31d5ec545756fa1d7a161176..97c50c0d0f2f5466f56f32afd544c7d85181d20e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -401,6 +401,11 @@ public class PurpurWorldConfig {
@@ -408,6 +408,11 @@ public class PurpurWorldConfig {
}
}
@@ -97,7 +97,7 @@ index 18ddc7b26898a1f63bbdba02b63a0abcf10edd85..a5dee4b756e4e66255f634e025c069f8
public boolean dispenserApplyCursedArmor = true;
public boolean dispenserPlaceAnvils = false;
private void dispenserSettings() {
@@ -464,6 +469,16 @@ public class PurpurWorldConfig {
@@ -471,6 +476,16 @@ public class PurpurWorldConfig {
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
}

View File

@@ -103,10 +103,10 @@ index d2cb1a7e7ea364cb8e2af4c4e756d8e45bc0ca10..bb99dda3c5167f23b2500a1f37cbc1ca
// Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a5dee4b756e4e66255f634e025c069f874f592f4..0888eaf81da0700f5dbb36ae3a89fbf653af92f7 100644
index 97c50c0d0f2f5466f56f32afd544c7d85181d20e..241377857a5ba67b22300b1be407c8322b089f52 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -402,8 +402,10 @@ public class PurpurWorldConfig {
@@ -409,8 +409,10 @@ public class PurpurWorldConfig {
}
public double caveVinesGrowthModifier = 0.10D;
@@ -117,7 +117,7 @@ index a5dee4b756e4e66255f634e025c069f874f592f4..0888eaf81da0700f5dbb36ae3a89fbf6
}
public boolean dispenserApplyCursedArmor = true;
@@ -436,6 +438,11 @@ public class PurpurWorldConfig {
@@ -443,6 +445,11 @@ public class PurpurWorldConfig {
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
}
@@ -129,7 +129,7 @@ index a5dee4b756e4e66255f634e025c069f874f592f4..0888eaf81da0700f5dbb36ae3a89fbf6
public boolean respawnAnchorExplode = true;
public double respawnAnchorExplosionPower = 5.0D;
public boolean respawnAnchorExplosionFire = true;
@@ -470,13 +477,17 @@ public class PurpurWorldConfig {
@@ -477,13 +484,17 @@ public class PurpurWorldConfig {
}
public double twistingVinesGrowthModifier = 0.10D;

View File

@@ -21,10 +21,10 @@ index 5ebedd6a156b06e98aded57c817f63429a1ae380..c99d295b999a28dd1eb504179250445d
private static class EndermanFreezeWhenLookedAt extends Goal {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0888eaf81da0700f5dbb36ae3a89fbf653af92f7..cd4ea52298aa54c08363125888e18c0bc2046319 100644
index 241377857a5ba67b22300b1be407c8322b089f52..b38a2ed581653fcd17995a66fb509a449390bc02 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -773,6 +773,7 @@ public class PurpurWorldConfig {
@@ -780,6 +780,7 @@ public class PurpurWorldConfig {
public boolean endermanRidableInWater = false;
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
@@ -32,7 +32,7 @@ index 0888eaf81da0700f5dbb36ae3a89fbf653af92f7..cd4ea52298aa54c08363125888e18c0b
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -783,6 +784,7 @@ public class PurpurWorldConfig {
@@ -790,6 +791,7 @@ public class PurpurWorldConfig {
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);

View File

@@ -18,10 +18,10 @@ index ed2f039c4042861bcfa2e41d8281eefd37daa9fa..d5d84893c77b4e60a19032d765d76bfd
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 147681048f24ea75ba7ddb0a019a83703a191e74..aaca5c8007ce8a33ecec0b9ff057c59a4c2778a3 100644
index b38a2ed581653fcd17995a66fb509a449390bc02..5628b807c63f371c2fddf544b24bd31d5a7fb452 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -277,6 +277,11 @@ public class PurpurWorldConfig {
@@ -284,6 +284,11 @@ public class PurpurWorldConfig {
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
}

View File

@@ -44,10 +44,10 @@ index fe045f8e35fe2aac51032a67ce52b27a53a8eff0..03bc86c776596ca5964c22adb757115d
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 05238fefda24c5f2c21eae51a7ded213e10e9de0..bfaf307b04d20d6c9fa009ac7138a51a984e1e40 100644
index 5628b807c63f371c2fddf544b24bd31d5a7fb452..7658c497c374412df0b862c520036d9916d7a845 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1762,6 +1762,7 @@ public class PurpurWorldConfig {
@@ -1769,6 +1769,7 @@ public class PurpurWorldConfig {
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -55,7 +55,7 @@ index 05238fefda24c5f2c21eae51a7ded213e10e9de0..bfaf307b04d20d6c9fa009ac7138a51a
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1776,6 +1777,11 @@ public class PurpurWorldConfig {
@@ -1783,6 +1784,11 @@ public class PurpurWorldConfig {
zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);

View File

@@ -18,10 +18,10 @@ index 9b8b82bf5bb276be51b8ba5c023879b3a45212cb..13b256c7d9723e38d1a1f5766fb2a28b
} else {
this.setLeftHanded(false);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ef742c14be5920db31fb291f1b93b671c5f59e30..3572f04b329be012172451f552df3d0a0aaf72ae 100644
index 7658c497c374412df0b862c520036d9916d7a845..50ed815e0d91ffdcdc0a15186a42a32bebe12a9f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -119,8 +119,10 @@ public class PurpurWorldConfig {
@@ -126,8 +126,10 @@ public class PurpurWorldConfig {
}
public int entityLifeSpan = 0;

Some files were not shown because too many files have changed in this diff Show More