Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update silk touch patch to use minimessage

Browse Source
This commit is contained in:
William Blake Galbreath
2021-09-02 15:17:12 -05:00
parent 8c2e417757
commit c28262576c
174 changed files with 656 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
patches/api/0023-ChatColor-conveniences.patch
View File

@@ -5,17 +5,64 @@ Subject: [PATCH] ChatColor conveniences
diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
index 4594701d77c5d0f744bece871b98d9f6f73eb5a7..499b222dee1f11d497a29a9a263a5596401ca1eb 100644
index 4594701d77c5d0f744bece871b98d9f6f73eb5a7..bf2a3d76c51fd445667291e203909a5df69a7bcb 100644
--- a/src/main/java/org/bukkit/ChatColor.java
+++ b/src/main/java/org/bukkit/ChatColor.java
@@ -413,4 +413,30 @@ public enum ChatColor {
@@ -2,6 +2,7 @@ package org.bukkit;
import com.google.common.collect.Maps;
import java.util.Map;
+import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang.Validate;
import org.jetbrains.annotations.Contract;
@@ -413,4 +414,71 @@ public enum ChatColor {
BY_CHAR.put(color.code, color);
}
}
+
+ // Purpur start
+ /**
+ * Convert legacy string into a string ready to be parsed by MiniMessage
+ *
+ * @param str Legacy string
+ * @return MiniMessage ready string
+ */
+ public static String toMM(String str) {
+ StringBuilder sb = new StringBuilder(str);
+ Matcher m = STRIP_COLOR_PATTERN.matcher(sb);
+ while (m.find()) {
+ sb.replace(m.start(), m.end(), sb.substring(m.start(), m.end()).toLowerCase());
+ }
+ return sb.toString()
+ .replace("&0", "<black>")
+ .replace("&1", "<dark_blue>")
+ .replace("&2", "<dark_green>")
+ .replace("&3", "<dark_aqua>")
+ .replace("&4", "<dark_red>")
+ .replace("&5", "<dark_purple>")
+ .replace("&6", "<gold>")
+ .replace("&7", "<grey>")
+ .replace("&8", "<dark_grey>")
+ .replace("&9", "<blue>")
+ .replace("&a", "<green>")
+ .replace("&b", "<aqua>")
+ .replace("&c", "<red>")
+ .replace("&d", "<light_purple>")
+ .replace("&e", "<yellow>")
+ .replace("&f", "<white>")
+ .replace("&k", "<obf>")
+ .replace("&l", "<b>")
+ .replace("&m", "<st>")
+ .replace("&n", "<u>")
+ .replace("&o", "<i>")
+ .replace("&r", "<r>");
+ }
+
+ @Deprecated
+ public static final Pattern HEX_PATTERN = Pattern.compile("(#[A-Fa-f0-9]{6})");
+
+ @Deprecated
+ @Nullable
+ public static String replaceHex(@Nullable String str) {
+ if (str != null) {
@@ -28,11 +75,13 @@ index 4594701d77c5d0f744bece871b98d9f6f73eb5a7..499b222dee1f11d497a29a9a263a5596
+ return str;
+ }
+
+ @Deprecated
+ @Nullable
+ public static String color(@Nullable String str) {
+ return color(str, true);
+ }
+
+ @Deprecated
+ @Nullable
+ public static String color(@Nullable String str, boolean parseHex) {
+ return str != null ? net.md_5.bungee.api.ChatColor.translateAlternateColorCodes('&', parseHex ? replaceHex(str) : str) : str;

13
patches/server/0004-Purpur-config-files.patch
View File

@@ -30,7 +30,7 @@ index f5d01bce4d5547b4aeca96b7962b2090f47ea541..05f1b6d103ec20f196b60944f5bc0073
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index da67fb1d6c6719e757ad600fe5ea36e9e18b1325..3781e7c23347a5860c448a94bd01cb90979d9d4a 100644
index 9364b58d2dc9ab199ac4303806a799d158e3fbe4..5cb4635690efd400853ab6378886642dd3bf2983 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -118,6 +118,11 @@ public class PaperConfig {
@@ -123,7 +123,7 @@ index 6f4e6105aa1d6546daa2424f57972fd29db25fa3..4c55bb04ff41fabb47c6477ba33e0e0a
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..6903706219a146146a213710a5f83af37f7f60b8
index 0000000000000000000000000000000000000000..963ef9cf4dc134f5311420edd8c851eab34af3e2
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,159 @@
@@ -190,8 +190,8 @@ index 0000000000000000000000000000000000000000..6903706219a146146a213710a5f83af3
+ commands = new HashMap<>();
+ commands.put("purpur", new PurpurCommand("purpur"));
+
+ version = getInt("config-version", 20);
+ set("config-version", 20);
+ version = getInt("config-version", 21);
+ set("config-version", 21);
+
+ readConfig(PurpurConfig.class, null);
+ }
@@ -288,10 +288,10 @@ index 0000000000000000000000000000000000000000..6903706219a146146a213710a5f83af3
+}
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..683ee20f08eac69238bea33021e35b1838c44a8b
index 0000000000000000000000000000000000000000..8bc89d48695c816a1db77f9cdffd05f35afea92a
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -0,0 +1,95 @@
@@ -0,0 +1,96 @@
+package net.pl3x.purpur;
+
+import net.minecraft.core.Registry;
@@ -310,6 +310,7 @@ index 0000000000000000000000000000000000000000..683ee20f08eac69238bea33021e35b18
+import net.pl3x.purpur.tool.Waxable;
+import net.pl3x.purpur.tool.Weatherable;
+import org.apache.commons.lang.BooleanUtils;
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.configuration.ConfigurationSection;
+

6
patches/server/0007-Ridables.patch
View File

@@ -4525,7 +4525,7 @@ index 008e3b769011df76697ad0abcdde5727cef05f64..0837875231ef96ff58f2fee3e558d706
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 50dd18f72d7ec674a33049ad2e228f7d8a4054a5..827e6ea7d409a200d1a20bd45cd02ceb6e0fc20b 100644
index 963ef9cf4dc134f5311420edd8c851eab34af3e2..0eceeb349314302c12b7fb738014299f5342b78a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -156,4 +156,9 @@ public class PurpurConfig {
@@ -4539,10 +4539,10 @@ index 50dd18f72d7ec674a33049ad2e228f7d8a4054a5..827e6ea7d409a200d1a20bd45cd02ceb
+ }
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 683ee20f08eac69238bea33021e35b1838c44a8b..3f91e7f49a1f00ff21fd65ea443af02729b7cc10 100644
index 8bc89d48695c816a1db77f9cdffd05f35afea92a..defc41f65e0899c2ae0984b55aeebcb8f606f040 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -92,4 +92,532 @@ public class PurpurWorldConfig {
@@ -93,4 +93,532 @@ public class PurpurWorldConfig {
final Map<String, Object> value = PurpurConfig.getMap("world-settings." + worldName + "." + path, null);
return value.isEmpty() ? fallback : value;
}

10
patches/server/0008-Configurable-entity-base-attributes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable entity base attributes
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 4fc93b94c97a0b9bca7de40d7db8c3f02104b1bd..c813f28c56b54bd3870cc12e3ecf0ae98545a6b0 100644
index 33edd0863374b4a7f2b0812879b23533515da447..efcba8ea0ab1f25f6480fe0a3bbe1537764438aa 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -150,7 +150,7 @@ import org.bukkit.plugin.PluginManager;
@@ -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 3f91e7f49a1f00ff21fd65ea443af02729b7cc10..3627b50dd3af5da225004cd3f8158fcbd30d8ea3 100644
index defc41f65e0899c2ae0984b55aeebcb8f606f040..20215510857b8e49ea0c93d35eddfbad7cd355b0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -103,257 +103,573 @@ public class PurpurWorldConfig {
@@ -104,257 +104,573 @@ public class PurpurWorldConfig {
}
public boolean axolotlRidable = false;
@@ -1999,7 +1999,7 @@ index 3f91e7f49a1f00ff21fd65ea443af02729b7cc10..3627b50dd3af5da225004cd3f8158fcb
}
public boolean phantomRidable = false;
@@ -362,6 +678,7 @@ public class PurpurWorldConfig {
@@ -363,6 +679,7 @@ public class PurpurWorldConfig {
public float phantomFlameDamage = 1.0F;
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
@@ -2007,7 +2007,7 @@ index 3f91e7f49a1f00ff21fd65ea443af02729b7cc10..3627b50dd3af5da225004cd3f8158fcb
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -369,255 +686,559 @@ public class PurpurWorldConfig {
@@ -370,255 +687,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);

6
patches/server/0013-AFK-API.patch
View File

@@ -192,7 +192,7 @@ index 7224c56e8a68870364c6538c82c04f371b74aabd..730e8a856b9e9560a62d959cefb6efad
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 e9c2ad24aea7861d8d3c1f8879f70e8fa514fa05..4451d9fca6dad1406b8da348e34d62123b0a08e5 100644
index 70b9e94ec9f094b9db5808247f05d577f76e2401..dca58fcd00d104e70a7e7c57132b9016df393640 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -158,8 +158,16 @@ public class PurpurConfig {
@@ -213,10 +213,10 @@ index e9c2ad24aea7861d8d3c1f8879f70e8fa514fa05..4451d9fca6dad1406b8da348e34d6212
private static void timingsSettings() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3627b50dd3af5da225004cd3f8158fcbd30d8ea3..61a0bc8acff72431318bf8fe4f9d5018f85bacc5 100644
index 20215510857b8e49ea0c93d35eddfbad7cd355b0..996171e7271e62e72c0b2b213c21caf53c815e97 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -93,6 +93,24 @@ public class PurpurWorldConfig {
@@ -94,6 +94,24 @@ public class PurpurWorldConfig {
return value.isEmpty() ? fallback : value;
}

6
patches/server/0021-Player-invulnerabilities.patch
View File

@@ -121,10 +121,10 @@ index 1c1602f839828252748e1acacfe42c7cac194332..5b1641eae57b974997803fbc42710032
return entityplayer1;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 61a0bc8acff72431318bf8fe4f9d5018f85bacc5..c4b95b8afd575ce94202b9359884a220e9c649a9 100644
index 996171e7271e62e72c0b2b213c21caf53c815e97..8e9ba3a8582c8e5d1e14bf3bfa8ecfce5ccf7b0c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -98,6 +98,8 @@ public class PurpurWorldConfig {
@@ -99,6 +99,8 @@ public class PurpurWorldConfig {
public boolean idleTimeoutCountAsSleeping = false;
public boolean idleTimeoutUpdateTabList = false;
public boolean idleTimeoutTargetPlayer = true;
@@ -133,7 +133,7 @@ index 61a0bc8acff72431318bf8fe4f9d5018f85bacc5..c4b95b8afd575ce94202b9359884a220
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -109,6 +111,8 @@ public class PurpurWorldConfig {
@@ -110,6 +112,8 @@ public class PurpurWorldConfig {
idleTimeoutCountAsSleeping = getBoolean("gameplay-mechanics.player.idle-timeout.count-as-sleeping", idleTimeoutCountAsSleeping);
idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
idleTimeoutTargetPlayer = getBoolean("gameplay-mechanics.player.idle-timeout.mobs-target", idleTimeoutTargetPlayer);

6
patches/server/0023-Configurable-villager-brain-ticks.patch
View File

@@ -40,10 +40,10 @@ index 682feb6f3c109b0b3034f3942f7dfa73721d359b..14b27c84624467615ad7cc4d5df94cd6
}
// Airplane end
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c4b95b8afd575ce94202b9359884a220e9c649a9..a4abc312a9c173fb6a4374c97012abc43c801b7a 100644
index 8e9ba3a8582c8e5d1e14bf3bfa8ecfce5ccf7b0c..6df320ab8214669517d5de30a28f044a5a6b4a33 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1076,6 +1076,8 @@ public class PurpurWorldConfig {
@@ -1077,6 +1077,8 @@ public class PurpurWorldConfig {
public boolean villagerRidable = false;
public boolean villagerRidableInWater = false;
public double villagerMaxHealth = 20.0D;
@@ -52,7 +52,7 @@ index c4b95b8afd575ce94202b9359884a220e9c649a9..a4abc312a9c173fb6a4374c97012abc4
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1085,6 +1087,8 @@ public class PurpurWorldConfig {
@@ -1086,6 +1088,8 @@ public class PurpurWorldConfig {
set("mobs.villager.attributes.max_health", oldValue);
}
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);

75
patches/server/0025-Silk-touch-spawners.patch
View File

@@ -30,12 +30,15 @@ index f68639508d7ff9a0e743b5282301e62435d53656..89d4b7e4cd4222b61b49833fceda56ff
public static final Item CHEST = registerBlock(Blocks.CHEST, CreativeModeTab.TAB_DECORATIONS);
public static final Item CRAFTING_TABLE = registerBlock(Blocks.CRAFTING_TABLE, CreativeModeTab.TAB_DECORATIONS);
diff --git a/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java b/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java
index b1e04d41de80971a7a1616beb0860226ecc25045..295ae3877b955978105b756055c21e63cf3b84ab 100644
index b1e04d41de80971a7a1616beb0860226ecc25045..a499cf626a54fcef62bc34bba4193ba0565d8379 100644
--- a/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java
@@ -2,8 +2,16 @@ package net.minecraft.world.level.block;
@@ -1,9 +1,19 @@
package net.minecraft.world.level.block;
import javax.annotation.Nullable;
+
+import net.kyori.adventure.text.minimessage.MiniMessage;
import net.minecraft.core.BlockPos;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
@@ -50,7 +53,7 @@ index b1e04d41de80971a7a1616beb0860226ecc25045..295ae3877b955978105b756055c21e63
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntity;
@@ -13,6 +21,18 @@ import net.minecraft.world.level.block.entity.SpawnerBlockEntity;
@@ -13,6 +23,19 @@ import net.minecraft.world.level.block.entity.SpawnerBlockEntity;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
@@ -62,6 +65,7 @@ index b1e04d41de80971a7a1616beb0860226ecc25045..295ae3877b955978105b756055c21e63
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+
+import java.util.List;
+import java.util.Locale;
+
+import static net.kyori.adventure.text.format.TextDecoration.ITALIC;
+// Purpur end
@@ -69,7 +73,7 @@ index b1e04d41de80971a7a1616beb0860226ecc25045..295ae3877b955978105b756055c21e63
public class SpawnerBlock extends BaseEntityBlock {
protected SpawnerBlock(BlockBehaviour.Properties settings) {
@@ -30,6 +50,59 @@ public class SpawnerBlock extends BaseEntityBlock {
@@ -30,6 +53,55 @@ public class SpawnerBlock extends BaseEntityBlock {
return createTickerHelper(type, BlockEntityType.MOB_SPAWNER, world.isClientSide ? SpawnerBlockEntity::clientTick : SpawnerBlockEntity::serverTick);
}
@@ -80,39 +84,35 @@ index b1e04d41de80971a7a1616beb0860226ecc25045..295ae3877b955978105b756055c21e63
+ ResourceLocation type = ((SpawnerBlockEntity) blockEntity).getSpawner().getEntityId(level, pos);
+ if (type != null) {
+ final Component mobName = PaperAdventure.asAdventure(EntityType.getFromKey(type).getDescription());
+ final TextReplacementConfig config = TextReplacementConfig.builder()
+ .matchLiteral("{mob}")
+ .replacement(mobName)
+ .build();
+
+ CompoundTag display = new CompoundTag();
+ boolean customDisplay = false;
+ CompoundTag tag = new CompoundTag();
+
+ String name = level.purpurConfig.silkTouchSpawnerName;
+ if (name != null && !name.isEmpty() && !name.equals("Spawner")) {
+ final Component displayName = PaperAdventure.LEGACY_AMPERSAND.deserialize(name).replaceText(config).decoration(ITALIC, false);
+ display.put("Name", StringTag.valueOf(GsonComponentSerializer.gson().serialize(displayName)));
+ customDisplay = true;
+ Component displayName = MiniMessage.get().parse(name, "mob", mobName);
+ if (name.startsWith("<reset>")) {
+ displayName = displayName.decoration(ITALIC, false);
+ }
+ display.put("Name", StringTag.valueOf(PaperAdventure.asJsonString(displayName, Locale.ROOT)));
+ tag.put("display", display);
+ }
+
+ List<String> lore = level.purpurConfig.silkTouchSpawnerLore;
+ if (lore != null && !lore.isEmpty()) {
+ ListTag list = new ListTag();
+ for (String line : lore) {
+ final Component lineComponent = PaperAdventure.LEGACY_AMPERSAND.deserialize(line).replaceText(config).decoration(ITALIC, false);
+ list.add(StringTag.valueOf(GsonComponentSerializer.gson().serialize(lineComponent)));
+ Component lineComponent = MiniMessage.get().parse(line, "mob", mobName);
+ if (line.startsWith("<reset>")) {
+ lineComponent = lineComponent.decoration(ITALIC, false);
+ }
+ list.add(StringTag.valueOf(PaperAdventure.asJsonString(lineComponent, Locale.ROOT)));
+ }
+ display.put("Lore", list);
+ customDisplay = true;
+ }
+
+ CompoundTag tag = new CompoundTag();
+ if (customDisplay) {
+ tag.put("display", display);
+ }
+ tag.putString("Purpur.mob_type", type.toString());
+
+ ItemStack item = new ItemStack(Blocks.SPAWNER.asItem());
+ tag.putString("Purpur.mob_type", type.toString());
+ item.setTag(tag);
+
+ popResource(level, pos, item);
@@ -129,7 +129,7 @@ index b1e04d41de80971a7a1616beb0860226ecc25045..295ae3877b955978105b756055c21e63
@Override
public void spawnAfterBreak(BlockState state, ServerLevel world, BlockPos pos, ItemStack stack) {
super.spawnAfterBreak(state, world, pos, stack);
@@ -42,6 +115,7 @@ public class SpawnerBlock extends BaseEntityBlock {
@@ -42,6 +114,7 @@ public class SpawnerBlock extends BaseEntityBlock {
@Override
public int getExpDrop(BlockState iblockdata, ServerLevel worldserver, BlockPos blockposition, ItemStack itemstack) {
@@ -138,33 +138,40 @@ 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 a4abc312a9c173fb6a4374c97012abc43c801b7a..48670fd7e51c39e207d95059261c09d52f309db6 100644
index 6df320ab8214669517d5de30a28f044a5a6b4a33..8920b47610a323ceb6b19a05b7592d8acf809bc4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -115,6 +115,31 @@ public class PurpurWorldConfig {
@@ -116,6 +116,38 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}
+ public boolean silkTouchEnabled = false;
+ public String silkTouchSpawnerName = "Spawner";
+ public String silkTouchSpawnerName = "<reset><white>Spawner";
+ public List<String> silkTouchSpawnerLore = new ArrayList<>();
+ public List<Item> silkTouchTools = new ArrayList<>();
+ public int minimumSilkTouchSpawnerRequire = 1;
+ private void silkTouchSettings() {
+ if (PurpurConfig.version < 21) {
+ String oldName = getString("gameplay-mechanics.silk-touch.spawner-name", silkTouchSpawnerName);
+ set("gameplay-mechanics.silk-touch.spawner-name", "<reset>" + ChatColor.toMM(oldName.replace("{mob}", "<mob>")));
+ List<String> list = new ArrayList<>();
+ getList("gameplay-mechanics.silk-touch.spawner-lore", List.of("Spawns a <mob>"))
+ .forEach(line -> list.add("<reset>" + ChatColor.toMM(line.toString().replace("{mob}", "<mob>"))));
+ set("gameplay-mechanics.silk-touch.spawner-lore", list);
+ }
+ silkTouchEnabled = getBoolean("gameplay-mechanics.silk-touch.enabled", silkTouchEnabled);
+ silkTouchSpawnerName = getString("gameplay-mechanics.silk-touch.spawner-name", silkTouchSpawnerName);
+ minimumSilkTouchSpawnerRequire = getInt("gameplay-mechanics.silk-touch.minimal-level", minimumSilkTouchSpawnerRequire);
+ silkTouchSpawnerLore.clear();
+ getList("gameplay-mechanics.silk-touch.spawner-lore", new ArrayList<String>(){{
+ add("Spawns a {mob}");
+ }}).forEach(line -> silkTouchSpawnerLore.add(line.toString()));
+ getList("gameplay-mechanics.silk-touch.spawner-lore", List.of("Spawns a <mob>"))
+ .forEach(line -> silkTouchSpawnerLore.add(line.toString()));
+ silkTouchTools.clear();
+ getList("gameplay-mechanics.silk-touch.tools", new ArrayList<String>(){{
+ add("minecraft:iron_pickaxe");
+ add("minecraft:golden_pickaxe");
+ add("minecraft:diamond_pickaxe");
+ add("minecraft:netherite_pickaxe");
+ }}).forEach(key -> {
+ getList("gameplay-mechanics.silk-touch.tools", List.of(
+ "minecraft:iron_pickaxe",
+ "minecraft:golden_pickaxe",
+ "minecraft:diamond_pickaxe",
+ "minecraft:netherite_pickaxe"
+ )).forEach(key -> {
+ Item item = Registry.ITEM.get(new ResourceLocation(key.toString()));
+ if (item != Items.AIR) silkTouchTools.add(item);
+ });

6
patches/server/0026-MC-168772-Fix-Add-turtle-egg-block-options.patch
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 48670fd7e51c39e207d95059261c09d52f309db6..feb378bf766ef967a55c429df27017b9065cfb0c 100644
index 8920b47610a323ceb6b19a05b7592d8acf809bc4..5b82c82da88f95190f8d7dc1f635fd27c8b513df 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1071,7 +1071,10 @@ public class PurpurWorldConfig {
@@ -1079,7 +1079,10 @@ public class PurpurWorldConfig {
public boolean turtleRidable = false;
public boolean turtleRidableInWater = false;
public double turtleMaxHealth = 30.0D;
@@ -65,7 +65,7 @@ index 48670fd7e51c39e207d95059261c09d52f309db6..feb378bf766ef967a55c429df27017b9
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1080,6 +1083,9 @@ public class PurpurWorldConfig {
@@ -1088,6 +1091,9 @@ public class PurpurWorldConfig {
set("mobs.turtle.attributes.max_health", oldValue);
}
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);

6
patches/server/0030-Giants-AI-settings.patch
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 feb378bf766ef967a55c429df27017b9065cfb0c..1ed71d3251d526a6a454236b5b51c5d161d62f32 100644
index 5b82c82da88f95190f8d7dc1f635fd27c8b513df..01c33f5021905736b05fc33c268e42e4e82c2863 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -460,6 +460,10 @@ public class PurpurWorldConfig {
@@ -468,6 +468,10 @@ public class PurpurWorldConfig {
public double giantMovementSpeed = 0.5D;
public double giantAttackDamage = 50.0D;
public double giantMaxHealth = 100.0D;
@@ -134,7 +134,7 @@ index feb378bf766ef967a55c429df27017b9065cfb0c..1ed71d3251d526a6a454236b5b51c5d1
private void giantSettings() {
giantRidable = getBoolean("mobs.giant.ridable", giantRidable);
giantRidableInWater = getBoolean("mobs.giant.ridable-in-water", giantRidableInWater);
@@ -475,6 +479,10 @@ public class PurpurWorldConfig {
@@ -483,6 +487,10 @@ public class PurpurWorldConfig {
set("mobs.giant.attributes.max_health", oldValue);
}
giantMaxHealth = getDouble("mobs.giant.attributes.max_health", giantMaxHealth);

6
patches/server/0031-Zombie-horse-naturally-spawn.patch
View File

@@ -28,10 +28,10 @@ index 372eea42755cad6bf957fa94b816db25751d707b..9d238d4bf3151dd0c37d0b908c9fe388
entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
this.addEntity(entityhorseskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1ed71d3251d526a6a454236b5b51c5d161d62f32..e351703bf554425cf978297d90cc8d7ab7beb85c 100644
index 01c33f5021905736b05fc33c268e42e4e82c2863..9db45abd1963ae7f48fe06f29fc4e3bf9e2cd983 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1258,6 +1258,7 @@ public class PurpurWorldConfig {
@@ -1266,6 +1266,7 @@ public class PurpurWorldConfig {
public double zombieHorseJumpStrengthMax = 1.0D;
public double zombieHorseMovementSpeedMin = 0.2D;
public double zombieHorseMovementSpeedMax = 0.2D;
@@ -39,7 +39,7 @@ index 1ed71d3251d526a6a454236b5b51c5d161d62f32..e351703bf554425cf978297d90cc8d7a
private void zombieHorseSettings() {
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
@@ -1273,6 +1274,7 @@ public class PurpurWorldConfig {
@@ -1281,6 +1282,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);

6
patches/server/0032-Charged-creeper-naturally-spawn.patch
View File

@@ -24,10 +24,10 @@ index 3a14f975e26530e1c4887844ec0c3967bd15a05b..9e05eadd09df031bac8321748f0e89c2
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e351703bf554425cf978297d90cc8d7ab7beb85c..d47db0fe25ac89c2f5040d7106d9e06b0d415c8a 100644
index 9db45abd1963ae7f48fe06f29fc4e3bf9e2cd983..17952c0f39deeed6c333289f35705c5ae49e0596 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -282,6 +282,7 @@ public class PurpurWorldConfig {
@@ -290,6 +290,7 @@ public class PurpurWorldConfig {
public boolean creeperRidable = false;
public boolean creeperRidableInWater = false;
public double creeperMaxHealth = 20.0D;
@@ -35,7 +35,7 @@ index e351703bf554425cf978297d90cc8d7ab7beb85c..d47db0fe25ac89c2f5040d7106d9e06b
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -291,6 +292,7 @@ public class PurpurWorldConfig {
@@ -299,6 +300,7 @@ public class PurpurWorldConfig {
set("mobs.creeper.attributes.max_health", oldValue);
}
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);

6
patches/server/0033-Rabbit-naturally-spawn-toast-and-killer.patch
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 d47db0fe25ac89c2f5040d7106d9e06b0d415c8a..60319614be9696d80bbbc147e529ad662dec0460 100644
index 17952c0f39deeed6c333289f35705c5ae49e0596..5dbec1b5662df093394e9159fb11e401444da19a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -836,6 +836,8 @@ public class PurpurWorldConfig {
@@ -844,6 +844,8 @@ public class PurpurWorldConfig {
public boolean rabbitRidable = false;
public boolean rabbitRidableInWater = false;
public double rabbitMaxHealth = 3.0D;
@@ -50,7 +50,7 @@ index d47db0fe25ac89c2f5040d7106d9e06b0d415c8a..60319614be9696d80bbbc147e529ad66
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -845,6 +847,8 @@ public class PurpurWorldConfig {
@@ -853,6 +855,8 @@ public class PurpurWorldConfig {
set("mobs.rabbit.attributes.max_health", oldValue);
}
rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth);

6
patches/server/0036-Tulips-change-fox-type.patch
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 60319614be9696d80bbbc147e529ad662dec0460..523ce8f7fff9a98b6646d1035849faeb23ead5ae 100644
index 5dbec1b5662df093394e9159fb11e401444da19a..b14853de709d9d083e2c349f398d81f629ebf6eb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -430,6 +430,7 @@ public class PurpurWorldConfig {
@@ -438,6 +438,7 @@ public class PurpurWorldConfig {
public boolean foxRidable = false;
public boolean foxRidableInWater = false;
public double foxMaxHealth = 10.0D;
@@ -86,7 +86,7 @@ index 60319614be9696d80bbbc147e529ad662dec0460..523ce8f7fff9a98b6646d1035849faeb
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -439,6 +440,7 @@ public class PurpurWorldConfig {
@@ -447,6 +448,7 @@ public class PurpurWorldConfig {
set("mobs.fox.attributes.max_health", oldValue);
}
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);

6
patches/server/0037-Breedable-Polar-Bears.patch
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 523ce8f7fff9a98b6646d1035849faeb23ead5ae..a52c414ffc277c866e3d845202afea3672dc91b8 100644
index b14853de709d9d083e2c349f398d81f629ebf6eb..241ba6a10eda5bf97adb09cc2ae423da6036d55f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -812,6 +812,8 @@ public class PurpurWorldConfig {
@@ -820,6 +820,8 @@ public class PurpurWorldConfig {
public boolean polarBearRidable = false;
public boolean polarBearRidableInWater = false;
public double polarBearMaxHealth = 30.0D;
@@ -71,7 +71,7 @@ index 523ce8f7fff9a98b6646d1035849faeb23ead5ae..a52c414ffc277c866e3d845202afea36
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -821,6 +823,9 @@ public class PurpurWorldConfig {
@@ -829,6 +831,9 @@ public class PurpurWorldConfig {
set("mobs.polar_bear.attributes.max_health", oldValue);
}
polarBearMaxHealth = getDouble("mobs.polar_bear.attributes.max_health", polarBearMaxHealth);

6
patches/server/0038-Chickens-can-retaliate.patch
View File

@@ -51,10 +51,10 @@ index 9fe68301b9a6efd703fb9d2215a9cd3b2f017a4e..35cf6b9fb4d72df905d93bf52c02846b
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a52c414ffc277c866e3d845202afea3672dc91b8..1c8560ac101cf418b3e65d537132c47be27eac92 100644
index 241ba6a10eda5bf97adb09cc2ae423da6036d55f..8692ca2751ba6ed6ad989843261b13d2eeba669e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -242,6 +242,7 @@ public class PurpurWorldConfig {
@@ -250,6 +250,7 @@ public class PurpurWorldConfig {
public boolean chickenRidable = false;
public boolean chickenRidableInWater = false;
public double chickenMaxHealth = 4.0D;
@@ -62,7 +62,7 @@ index a52c414ffc277c866e3d845202afea3672dc91b8..1c8560ac101cf418b3e65d537132c47b
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -251,6 +252,7 @@ public class PurpurWorldConfig {
@@ -259,6 +260,7 @@ public class PurpurWorldConfig {
set("mobs.chicken.attributes.max_health", oldValue);
}
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);

4
patches/server/0039-Add-option-to-set-armorstand-step-height.patch
View File

@@ -17,10 +17,10 @@ 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 1c8560ac101cf418b3e65d537132c47be27eac92..048fc7e4ac798e7e9b561558b25d74b81563b706 100644
index 8692ca2751ba6ed6ad989843261b13d2eeba669e..7eead3ef93dd4e8d912809a2c47062b95cb80168 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -93,6 +93,11 @@ public class PurpurWorldConfig {
@@ -94,6 +94,11 @@ public class PurpurWorldConfig {
return value.isEmpty() ? fallback : value;
}

6
patches/server/0040-Cat-spawning-options.patch
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 048fc7e4ac798e7e9b561558b25d74b81563b706..08fb29310cc26b5d45528a86c654029ae8fe1b12 100644
index 7eead3ef93dd4e8d912809a2c47062b95cb80168..8f7e7007633ee30f3f943d583623c122d5bc7de3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -219,6 +219,9 @@ public class PurpurWorldConfig {
@@ -227,6 +227,9 @@ public class PurpurWorldConfig {
public boolean catRidable = false;
public boolean catRidableInWater = false;
public double catMaxHealth = 10.0D;
@@ -62,7 +62,7 @@ index 048fc7e4ac798e7e9b561558b25d74b81563b706..08fb29310cc26b5d45528a86c654029a
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -228,6 +231,9 @@ public class PurpurWorldConfig {
@@ -236,6 +239,9 @@ public class PurpurWorldConfig {
set("mobs.cat.attributes.max_health", oldValue);
}
catMaxHealth = getDouble("mobs.cat.attributes.max_health", catMaxHealth);

6
patches/server/0042-Cows-eat-mushrooms.patch
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 08fb29310cc26b5d45528a86c654029ae8fe1b12..9381e25068d1d75ccfa949307f9cd02794724af4 100644
index 8f7e7007633ee30f3f943d583623c122d5bc7de3..c5124c7beff61ea1a60db0b0e14f99f3302831b9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -281,6 +281,7 @@ public class PurpurWorldConfig {
@@ -289,6 +289,7 @@ public class PurpurWorldConfig {
public boolean cowRidable = false;
public boolean cowRidableInWater = false;
public double cowMaxHealth = 10.0D;
@@ -125,7 +125,7 @@ index 08fb29310cc26b5d45528a86c654029ae8fe1b12..9381e25068d1d75ccfa949307f9cd027
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -290,6 +291,7 @@ public class PurpurWorldConfig {
@@ -298,6 +299,7 @@ public class PurpurWorldConfig {
set("mobs.cow.attributes.max_health", oldValue);
}
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);

6
patches/server/0044-Pigs-give-saddle-back.patch
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 9381e25068d1d75ccfa949307f9cd02794724af4..63b1858a91050ffc0720532ee872e7c458ec5a5d 100644
index c5124c7beff61ea1a60db0b0e14f99f3302831b9..91d62888b6012b51b1eeb29b864d7d560397b7c1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -771,6 +771,7 @@ public class PurpurWorldConfig {
@@ -779,6 +779,7 @@ public class PurpurWorldConfig {
public boolean pigRidable = false;
public boolean pigRidableInWater = false;
public double pigMaxHealth = 10.0D;
@@ -39,7 +39,7 @@ index 9381e25068d1d75ccfa949307f9cd02794724af4..63b1858a91050ffc0720532ee872e7c4
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -780,6 +781,7 @@ public class PurpurWorldConfig {
@@ -788,6 +789,7 @@ public class PurpurWorldConfig {
set("mobs.pig.attributes.max_health", oldValue);
}
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);

6
patches/server/0045-Snowman-drop-and-put-back-pumpkin.patch
View File

@@ -32,10 +32,10 @@ index fcf3092ef1863f62d9e76a77c0299ce1495ca1b7..ee64f4084b25d77f1c25b76a5b7d90cd
this.forceDrops = false; // CraftBukkit
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 63b1858a91050ffc0720532ee872e7c458ec5a5d..13aa04d07c9f345d62fbe673dfd69d96dc42078b 100644
index 91d62888b6012b51b1eeb29b864d7d560397b7c1..94b7f06779eda71e7e14458d1e1eacc1969e899c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1002,6 +1002,8 @@ public class PurpurWorldConfig {
@@ -1010,6 +1010,8 @@ public class PurpurWorldConfig {
public boolean snowGolemRidableInWater = false;
public boolean snowGolemLeaveTrailWhenRidden = false;
public double snowGolemMaxHealth = 4.0D;
@@ -44,7 +44,7 @@ index 63b1858a91050ffc0720532ee872e7c458ec5a5d..13aa04d07c9f345d62fbe673dfd69d96
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1012,6 +1014,8 @@ public class PurpurWorldConfig {
@@ -1020,6 +1022,8 @@ public class PurpurWorldConfig {
set("mobs.snow_golem.attributes.max_health", oldValue);
}
snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);

6
patches/server/0046-Ender-dragon-always-drop-full-exp.patch
View File

@@ -18,10 +18,10 @@ index d3caa18f5de2d96eae691655dd13e83f82c61e0c..f637cd740ec3801ce1c387473b5c4ff6
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 13aa04d07c9f345d62fbe673dfd69d96dc42078b..36ac4fb4ab94a8287b0063dc21efba156d38acac 100644
index 94b7f06779eda71e7e14458d1e1eacc1969e899c..12407ab2b99b9d4aa00ddd73f9257d6de493f524 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -384,6 +384,7 @@ public class PurpurWorldConfig {
@@ -392,6 +392,7 @@ public class PurpurWorldConfig {
public boolean enderDragonRidableInWater = false;
public double enderDragonMaxY = 256D;
public double enderDragonMaxHealth = 200.0D;
@@ -29,7 +29,7 @@ index 13aa04d07c9f345d62fbe673dfd69d96dc42078b..36ac4fb4ab94a8287b0063dc21efba15
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -398,6 +399,7 @@ public class PurpurWorldConfig {
@@ -406,6 +407,7 @@ public class PurpurWorldConfig {
set("mobs.ender_dragon.attributes.max_health", oldValue);
}
enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);

4
patches/server/0047-Signs-editable-on-right-click.patch
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 36ac4fb4ab94a8287b0063dc21efba156d38acac..9541fa2198420001bb471f088be4d46020b0ae3f 100644
index 12407ab2b99b9d4aa00ddd73f9257d6de493f524..5cfccc5a7ee50b24151d6886a1f336c6b217c24e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -145,6 +145,11 @@ public class PurpurWorldConfig {
@@ -153,6 +153,11 @@ public class PurpurWorldConfig {
});
}

4
patches/server/0048-Signs-allow-color-codes.patch
View File

@@ -70,10 +70,10 @@ index 344d3a8c1162f1a4ab5fc2b7676680ddace46649..156a153abe59f86db7f942155d8a21de
@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 9541fa2198420001bb471f088be4d46020b0ae3f..982f88df319a3ca239a7364baee22595157d4e43 100644
index 5cfccc5a7ee50b24151d6886a1f336c6b217c24e..ea387b513f86249a6ceaa67cb6358dc56ed4b16d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -145,8 +145,10 @@ public class PurpurWorldConfig {
@@ -153,8 +153,10 @@ public class PurpurWorldConfig {
});
}

4
patches/server/0049-Allow-soil-to-moisten-from-water-directly-under-it.patch
View File

@@ -18,10 +18,10 @@ index 5955c95efbfa3e614ecf03de3e485a1ea88b7859..f638c7b27a846bf9db73e98ce9eb5d57
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 982f88df319a3ca239a7364baee22595157d4e43..1a6c882a9c30c5970383ae14a8718cb5cfc66713 100644
index ea387b513f86249a6ceaa67cb6358dc56ed4b16d..35fbc48c6396f23add351063a9df12f15643a3a8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -145,6 +145,11 @@ public class PurpurWorldConfig {
@@ -153,6 +153,11 @@ public class PurpurWorldConfig {
});
}

6
patches/server/0050-Minecart-settings-and-WASD-controls.patch
View File

@@ -135,7 +135,7 @@ index 9ea3837acc315e5c57f28c63c356efd633f1e6cf..e8b76b67f972c2f44e7611434246a822
}
}
diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
index c5663df749dd2bbfd2ba9bf7e1e7a9e21992b81a..4853025530de9c22bde9e54b81120102dae5477c 100644
index d87f8d106834678364f8720447d671de60c2454e..3d677fe25ed015e30634bf2fccde29f332e3dd87 100644
--- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
+++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
@@ -70,7 +70,7 @@ import net.minecraft.world.phys.shapes.VoxelShape;
@@ -148,10 +148,10 @@ index c5663df749dd2bbfd2ba9bf7e1e7a9e21992b81a..4853025530de9c22bde9e54b81120102
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 1a6c882a9c30c5970383ae14a8718cb5cfc66713..0cc349ff27e2d0c4e9cbe239af7aca5a90e8cce3 100644
index 35fbc48c6396f23add351063a9df12f15643a3a8..77d19b9bea9fce62c1438f399574393f7282e849 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -98,6 +98,68 @@ public class PurpurWorldConfig {
@@ -99,6 +99,68 @@ public class PurpurWorldConfig {
armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
}

4
patches/server/0051-Disable-loot-drops-on-death-by-cramming.patch
View File

@@ -20,10 +20,10 @@ index 8026d97279013a3fd830e9ccd579d8043ca7a3c9..f165e468130f219c78ea1c66f235eb32
// 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 0cc349ff27e2d0c4e9cbe239af7aca5a90e8cce3..56be4ffad744f8d7f55c89f29a208b0c0e8779a6 100644
index 77d19b9bea9fce62c1438f399574393f7282e849..209c269d0a5351a206451ab9724307d811c16a11 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 {
@@ -215,6 +215,11 @@ public class PurpurWorldConfig {
});
}

4
patches/server/0052-Option-to-toggle-milk-curing-bad-omen.patch
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 56be4ffad744f8d7f55c89f29a208b0c0e8779a6..098ab1266df569f0b09088c481b34303f344ffd1 100644
index 209c269d0a5351a206451ab9724307d811c16a11..ba2d49771e317d52b46868372572f59bf2fc3394 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -208,8 +208,10 @@ public class PurpurWorldConfig {
@@ -216,8 +216,10 @@ public class PurpurWorldConfig {
}
public boolean disableDropsOnCrammingDeath = false;

4
patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
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 098ab1266df569f0b09088c481b34303f344ffd1..12df67056e742916b9638ee1fce6f8b7dab2b3f2 100644
index ba2d49771e317d52b46868372572f59bf2fc3394..1ff4e926accf8029315d5d2ffd209f62b16fd729 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -209,9 +209,11 @@ public class PurpurWorldConfig {
@@ -217,9 +217,11 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean milkCuresBadOmen = true;

10
patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch
View File

@@ -38,10 +38,10 @@ index b92a83cfd15cedf7cd68c26193e65c5f24d9a621..a36313c321f9057350a9edb8b0959fd4
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 12df67056e742916b9638ee1fce6f8b7dab2b3f2..b94165c34e4c809e3686253beae26c05c7c3a181 100644
index 1ff4e926accf8029315d5d2ffd209f62b16fd729..cd77b51e3cc64f34e0f1cb163c17d2f3bf054880 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -381,6 +381,7 @@ public class PurpurWorldConfig {
@@ -389,6 +389,7 @@ public class PurpurWorldConfig {
public boolean creeperRidableInWater = false;
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
@@ -49,7 +49,7 @@ index 12df67056e742916b9638ee1fce6f8b7dab2b3f2..b94165c34e4c809e3686253beae26c05
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -391,6 +392,7 @@ public class PurpurWorldConfig {
@@ -399,6 +400,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 12df67056e742916b9638ee1fce6f8b7dab2b3f2..b94165c34e4c809e3686253beae26c05
}
public boolean dolphinRidable = false;
@@ -488,6 +490,7 @@ public class PurpurWorldConfig {
@@ -496,6 +498,7 @@ public class PurpurWorldConfig {
public boolean endermanRidable = false;
public boolean endermanRidableInWater = false;
public double endermanMaxHealth = 40.0D;
@@ -65,7 +65,7 @@ index 12df67056e742916b9638ee1fce6f8b7dab2b3f2..b94165c34e4c809e3686253beae26c05
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -497,6 +500,7 @@ public class PurpurWorldConfig {
@@ -505,6 +508,7 @@ public class PurpurWorldConfig {
set("mobs.enderman.attributes.max_health", oldValue);
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);

10
patches/server/0060-Villagers-follow-emerald-blocks.patch
View File

@@ -54,10 +54,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 b94165c34e4c809e3686253beae26c05c7c3a181..a70ea41a56edf5a52c96feb0bdebccaee0b89f04 100644
index cd77b51e3cc64f34e0f1cb163c17d2f3bf054880..714ad964c90d8fb8244787899be1338c8ab445f8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1240,6 +1240,7 @@ public class PurpurWorldConfig {
@@ -1248,6 +1248,7 @@ public class PurpurWorldConfig {
public double villagerMaxHealth = 20.0D;
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
@@ -65,7 +65,7 @@ index b94165c34e4c809e3686253beae26c05c7c3a181..a70ea41a56edf5a52c96feb0bdebccae
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1251,6 +1252,7 @@ public class PurpurWorldConfig {
@@ -1259,6 +1260,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);
@@ -73,7 +73,7 @@ index b94165c34e4c809e3686253beae26c05c7c3a181..a70ea41a56edf5a52c96feb0bdebccae
}
public boolean vindicatorRidable = false;
@@ -1270,6 +1272,7 @@ public class PurpurWorldConfig {
@@ -1278,6 +1280,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderRidable = false;
public boolean wanderingTraderRidableInWater = false;
public double wanderingTraderMaxHealth = 20.0D;
@@ -81,7 +81,7 @@ index b94165c34e4c809e3686253beae26c05c7c3a181..a70ea41a56edf5a52c96feb0bdebccae
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1279,6 +1282,7 @@ public class PurpurWorldConfig {
@@ -1287,6 +1290,7 @@ public class PurpurWorldConfig {
set("mobs.wandering_trader.attributes.max_health", oldValue);
}
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);

10
patches/server/0061-Allow-leashing-villagers.patch
View File

@@ -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 a70ea41a56edf5a52c96feb0bdebccaee0b89f04..af80a7d516fa5669fe7406ab3b07b39ee643928f 100644
index 714ad964c90d8fb8244787899be1338c8ab445f8..66198aa053072cf95b6d8f988ae839ec72fa67f0 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 {
@@ -1249,6 +1249,7 @@ public class PurpurWorldConfig {
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
public boolean villagerFollowEmeraldBlock = false;
@@ -60,7 +60,7 @@ index a70ea41a56edf5a52c96feb0bdebccaee0b89f04..af80a7d516fa5669fe7406ab3b07b39e
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1253,6 +1254,7 @@ public class PurpurWorldConfig {
@@ -1261,6 +1262,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 a70ea41a56edf5a52c96feb0bdebccaee0b89f04..af80a7d516fa5669fe7406ab3b07b39e
}
public boolean vindicatorRidable = false;
@@ -1273,6 +1275,7 @@ public class PurpurWorldConfig {
@@ -1281,6 +1283,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderRidableInWater = false;
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
@@ -76,7 +76,7 @@ index a70ea41a56edf5a52c96feb0bdebccaee0b89f04..af80a7d516fa5669fe7406ab3b07b39e
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1283,6 +1286,7 @@ public class PurpurWorldConfig {
@@ -1291,6 +1294,7 @@ public class PurpurWorldConfig {
}
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);

6
patches/server/0062-Implement-configurable-search-radius-for-villagers-t.patch
View File

@@ -18,10 +18,10 @@ index 481595bb478ebbf2e76948cfdfa531d703f22b6d..69465bc31cff3e96904fa2fabbe31061
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 af80a7d516fa5669fe7406ab3b07b39ee643928f..18a6cc3765813868e624b8be8bd02fb057354637 100644
index 66198aa053072cf95b6d8f988ae839ec72fa67f0..999d98cb67fa14427b5a16a46ea047fc90444f7c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1242,6 +1242,8 @@ public class PurpurWorldConfig {
@@ -1250,6 +1250,8 @@ public class PurpurWorldConfig {
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
@@ -30,7 +30,7 @@ index af80a7d516fa5669fe7406ab3b07b39ee643928f..18a6cc3765813868e624b8be8bd02fb0
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1255,6 +1257,8 @@ public class PurpurWorldConfig {
@@ -1263,6 +1265,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);

4
patches/server/0063-Implement-infinite-lava.patch
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 18a6cc3765813868e624b8be8bd02fb057354637..13721c931f7763a9a9d60896f6d8b2e54122f9c7 100644
index 999d98cb67fa14427b5a16a46ea047fc90444f7c..420f358be94ec98a85dd8dc5c8c9ee8cb1650b6b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -221,6 +221,13 @@ public class PurpurWorldConfig {
@@ -229,6 +229,13 @@ public class PurpurWorldConfig {
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
}

4
patches/server/0064-Make-lava-flow-speed-configurable.patch
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 13721c931f7763a9a9d60896f6d8b2e54122f9c7..3e12ddad6dc848a82a15b271314ce24788e7d402 100644
index 420f358be94ec98a85dd8dc5c8c9ee8cb1650b6b..23d5d959e40b496fe54d0fe6b7434a090afdc0fb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -223,9 +223,13 @@ public class PurpurWorldConfig {
@@ -231,9 +231,13 @@ public class PurpurWorldConfig {
public boolean lavaInfinite = false;
public int lavaInfiniteRequiredSources = 2;

6
patches/server/0065-Add-player-death-exp-control-options.patch
View File

@@ -31,10 +31,10 @@ index 9ffe8832ef9b74ed3794243965d0cc3d3fbc4ef5..c557bee52a3f136696bb55853622b032
return 0;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3e12ddad6dc848a82a15b271314ce24788e7d402..9c6554bb8633899466aab12a7cb9ea87dac95b73 100644
index 23d5d959e40b496fe54d0fe6b7434a090afdc0fb..54f802449b8be8913c6d357ba7f6cfe50c09fb03 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -167,6 +167,8 @@ public class PurpurWorldConfig {
@@ -168,6 +168,8 @@ public class PurpurWorldConfig {
public boolean idleTimeoutTargetPlayer = true;
public int playerSpawnInvulnerableTicks = 60;
public boolean playerInvulnerableWhileAcceptingResourcePack = false;
@@ -43,7 +43,7 @@ index 3e12ddad6dc848a82a15b271314ce24788e7d402..9c6554bb8633899466aab12a7cb9ea87
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -180,6 +182,8 @@ public class PurpurWorldConfig {
@@ -181,6 +183,8 @@ public class PurpurWorldConfig {
idleTimeoutTargetPlayer = getBoolean("gameplay-mechanics.player.idle-timeout.mobs-target", idleTimeoutTargetPlayer);
playerSpawnInvulnerableTicks = getInt("gameplay-mechanics.player.spawn-invulnerable-ticks", playerSpawnInvulnerableTicks);
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);

4
patches/server/0066-Configurable-void-damage-height-and-damage.patch
View File

@@ -31,10 +31,10 @@ index 5529b1bcfeeb234a5629d3d7eaeb3ba759bce131..1c75911afb5a2de6f0099f43cb0660f4
protected void updateSwingTime() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9c6554bb8633899466aab12a7cb9ea87dac95b73..313d977209b9cb972207cf2d4f63b5d4aadc7227 100644
index 54f802449b8be8913c6d357ba7f6cfe50c09fb03..b1722d945ce43e296e603b8c4eec43df39cc3bed 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -214,10 +214,14 @@ public class PurpurWorldConfig {
@@ -222,10 +222,14 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean milkCuresBadOmen = true;
public double tridentLoyaltyVoidReturnHeight = 0.0D;

4
patches/server/0068-Dispenser-curse-of-binding-protection.patch
View File

@@ -43,10 +43,10 @@ index aab4a63e61aced51b1b6c885fd8b8426a4f14408..dba3b8e0671ee63ff077155a8964f3e2
// 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 313d977209b9cb972207cf2d4f63b5d4aadc7227..ee53de5106cc9f3caef95e13d85d4cbd89982012 100644
index b1722d945ce43e296e603b8c4eec43df39cc3bed..c5ced15da2a371dde1dbcc18266119bef2ceb035 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -224,6 +224,11 @@ public class PurpurWorldConfig {
@@ -232,6 +232,11 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

4
patches/server/0069-Add-option-for-boats-to-eject-players-on-land.patch
View File

@@ -17,10 +17,10 @@ index 391454a58d18d7373b974e094fd62514ca0d0b6b..6acd2dc6ec9c3761fa330c74df8c7e7b
} 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 ee53de5106cc9f3caef95e13d85d4cbd89982012..29f50b0144f28c03af1114bed4473b5bbcf34677 100644
index c5ced15da2a371dde1dbcc18266119bef2ceb035..270ce40a4e81037196a9df8fe21790682b917ce4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -211,12 +211,14 @@ public class PurpurWorldConfig {
@@ -219,12 +219,14 @@ public class PurpurWorldConfig {
});
}

6
patches/server/0070-Mending-mends-most-damages-equipment-first.patch
View File

@@ -73,10 +73,10 @@ index d439e8ce87bf7da03683a336941c7673b8b166e4..955e482e4bc83f2b777cd2e4254c40be
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 29f50b0144f28c03af1114bed4473b5bbcf34677..a5572f018bbc5f12d97a1466bd7e34f7999d99e8 100644
index 270ce40a4e81037196a9df8fe21790682b917ce4..8c7d9c15732e0223030a8c868b3d4f42f1226854 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -211,6 +211,7 @@ public class PurpurWorldConfig {
@@ -219,6 +219,7 @@ public class PurpurWorldConfig {
});
}
@@ -84,7 +84,7 @@ index 29f50b0144f28c03af1114bed4473b5bbcf34677..a5572f018bbc5f12d97a1466bd7e34f7
public boolean boatEjectPlayersOnLand = false;
public boolean disableDropsOnCrammingDeath = false;
public boolean milkCuresBadOmen = true;
@@ -218,6 +219,7 @@ public class PurpurWorldConfig {
@@ -226,6 +227,7 @@ public class PurpurWorldConfig {
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
private void miscGameplayMechanicsSettings() {

4
patches/server/0072-Implement-elytra-settings.patch
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 a5572f018bbc5f12d97a1466bd7e34f7999d99e8..08768d2159e663036f652aff9b0e089da943db28 100644
index 8c7d9c15732e0223030a8c868b3d4f42f1226854..aa438090a05da82e0aa95ced0765409f91344f4f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -98,6 +98,19 @@ public class PurpurWorldConfig {
@@ -99,6 +99,19 @@ public class PurpurWorldConfig {
armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
}

4
patches/server/0073-Item-entity-immunities.patch
View File

@@ -96,10 +96,10 @@ index dae6f7a05426ea31d13c82458b33e20abc2571b6..c51161136bec4b4dbe10c0bff5fc197b
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 08768d2159e663036f652aff9b0e089da943db28..2a1cc21584f9e9765d8c00766450c2fc6e49f35d 100644
index aa438090a05da82e0aa95ced0765409f91344f4f..7eb78791f507dfc50ae70134fdfe161256f5ee16 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -111,6 +111,49 @@ public class PurpurWorldConfig {
@@ -112,6 +112,49 @@ public class PurpurWorldConfig {
elytraDamagePerTridentBoost = getInt("gameplay-mechanics.elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
}

20
patches/server/0077-Configurable-jockey-options.patch
View File

@@ -167,10 +167,10 @@ index 8464026df1b46ad30301fed4944aa1d3cd39bd9e..5b5958e37918b97fa994500fe94cd0e5
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2a1cc21584f9e9765d8c00766450c2fc6e49f35d..d2754ceb0d87dd844a5e325ee5a89b4e586f2592 100644
index 7eb78791f507dfc50ae70134fdfe161256f5ee16..e0733147d9976e42a06e262e54fef121ac583915 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -525,6 +525,9 @@ public class PurpurWorldConfig {
@@ -533,6 +533,9 @@ public class PurpurWorldConfig {
public boolean drownedRidableInWater = false;
public double drownedMaxHealth = 20.0D;
public double drownedSpawnReinforcements = 0.1D;
@@ -180,7 +180,7 @@ index 2a1cc21584f9e9765d8c00766450c2fc6e49f35d..d2754ceb0d87dd844a5e325ee5a89b4e
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -535,6 +538,9 @@ public class PurpurWorldConfig {
@@ -543,6 +546,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 2a1cc21584f9e9765d8c00766450c2fc6e49f35d..d2754ceb0d87dd844a5e325ee5a89b4e
}
public boolean elderGuardianRidable = false;
@@ -747,6 +753,9 @@ public class PurpurWorldConfig {
@@ -755,6 +761,9 @@ public class PurpurWorldConfig {
public boolean huskRidableInWater = false;
public double huskMaxHealth = 20.0D;
public double huskSpawnReinforcements = 0.1D;
@@ -200,7 +200,7 @@ index 2a1cc21584f9e9765d8c00766450c2fc6e49f35d..d2754ceb0d87dd844a5e325ee5a89b4e
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -757,6 +766,9 @@ public class PurpurWorldConfig {
@@ -765,6 +774,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 2a1cc21584f9e9765d8c00766450c2fc6e49f35d..d2754ceb0d87dd844a5e325ee5a89b4e
}
public boolean illusionerRidable = false;
@@ -1457,6 +1469,9 @@ public class PurpurWorldConfig {
@@ -1465,6 +1477,9 @@ public class PurpurWorldConfig {
public boolean zombieRidableInWater = false;
public double zombieMaxHealth = 20.0D;
public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index 2a1cc21584f9e9765d8c00766450c2fc6e49f35d..d2754ceb0d87dd844a5e325ee5a89b4e
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1467,6 +1482,9 @@ public class PurpurWorldConfig {
@@ -1475,6 +1490,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 2a1cc21584f9e9765d8c00766450c2fc6e49f35d..d2754ceb0d87dd844a5e325ee5a89b4e
}
public boolean zombieHorseRidableInWater = false;
@@ -1500,6 +1518,9 @@ public class PurpurWorldConfig {
@@ -1508,6 +1526,9 @@ public class PurpurWorldConfig {
public boolean zombieVillagerRidableInWater = false;
public double zombieVillagerMaxHealth = 20.0D;
public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index 2a1cc21584f9e9765d8c00766450c2fc6e49f35d..d2754ceb0d87dd844a5e325ee5a89b4e
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -1510,12 +1531,18 @@ public class PurpurWorldConfig {
@@ -1518,12 +1539,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 2a1cc21584f9e9765d8c00766450c2fc6e49f35d..d2754ceb0d87dd844a5e325ee5a89b4e
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1526,5 +1553,8 @@ public class PurpurWorldConfig {
@@ -1534,5 +1561,8 @@ public class PurpurWorldConfig {
}
zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);

6
patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
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 d2754ceb0d87dd844a5e325ee5a89b4e586f2592..62c257b28d921d36198f925170a9ea01ec2c63be 100644
index e0733147d9976e42a06e262e54fef121ac583915..c384123af3fd0c24fe1e1481197ea3a7a15eb8a2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -938,6 +938,9 @@ public class PurpurWorldConfig {
@@ -946,6 +946,9 @@ public class PurpurWorldConfig {
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
public double phantomMaxHealth = 20.0D;
@@ -271,7 +271,7 @@ index d2754ceb0d87dd844a5e325ee5a89b4e586f2592..62c257b28d921d36198f925170a9ea01
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -951,6 +954,9 @@ public class PurpurWorldConfig {
@@ -959,6 +962,9 @@ public class PurpurWorldConfig {
set("mobs.phantom.attributes.max_health", oldValue);
}
phantomMaxHealth = getDouble("mobs.phantom.attributes.max_health", phantomMaxHealth);

6
patches/server/0079-Add-phantom-spawning-options.patch
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 62c257b28d921d36198f925170a9ea01ec2c63be..518925c8d6269161c439c7e87b8be108296fc301 100644
index c384123af3fd0c24fe1e1481197ea3a7a15eb8a2..295999b5269de11b5384fea831470e5b0c909343 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -941,6 +941,18 @@ public class PurpurWorldConfig {
@@ -949,6 +949,18 @@ public class PurpurWorldConfig {
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
public double phantomOrbitCrystalRadius = 0.0D;
@@ -70,7 +70,7 @@ index 62c257b28d921d36198f925170a9ea01ec2c63be..518925c8d6269161c439c7e87b8be108
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -957,6 +969,18 @@ public class PurpurWorldConfig {
@@ -965,6 +977,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);

4
patches/server/0080-Implement-bed-explosion-options.patch
View File

@@ -27,10 +27,10 @@ index e3ff04fe21761db65fb03c5e58ecd5823f0507c6..6362c9dcfbc980a0591ac6dfebe45e47
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 518925c8d6269161c439c7e87b8be108296fc301..3abfc7c8400ebebd81fab7206d5f86c61c48ed07 100644
index 295999b5269de11b5384fea831470e5b0c909343..f2e4511bae29a6df5d50e75e3a72e49d152ae38a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -284,6 +284,22 @@ public class PurpurWorldConfig {
@@ -292,6 +292,22 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

4
patches/server/0081-Implement-respawn-anchor-explosion-options.patch
View File

@@ -18,10 +18,10 @@ index 0a5d563700c9f806139001181f01fa9d0111f792..1aae3d27ed6c0433312502a59fe1eb70
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 3abfc7c8400ebebd81fab7206d5f86c61c48ed07..492156452dd6f91a3cd638ff8bbf88db458b5c12 100644
index f2e4511bae29a6df5d50e75e3a72e49d152ae38a..4a03ec9088c2f1e52ac7a81e901cc32352879c02 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -321,6 +321,22 @@ public class PurpurWorldConfig {
@@ -329,6 +329,22 @@ public class PurpurWorldConfig {
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
}

4
patches/server/0084-Entity-lifespan.patch
View File

@@ -89,10 +89,10 @@ index e985f795747e25c5456658df3e1d65a520d8a2cc..437015eef7404362cb564dec72e3e87c
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 492156452dd6f91a3cd638ff8bbf88db458b5c12..f1de0689c36fbbc422a38b1692cba32ba48b155c 100644
index 4a03ec9088c2f1e52ac7a81e901cc32352879c02..e13159745e1c03df859f9ad93c828925d6e399d1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -111,6 +111,11 @@ public class PurpurWorldConfig {
@@ -112,6 +112,11 @@ public class PurpurWorldConfig {
elytraDamagePerTridentBoost = getInt("gameplay-mechanics.elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
}

6
patches/server/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
View File

@@ -55,10 +55,10 @@ index d08a9032a0551361e5ced4fe20cf803d68898665..8896f8aa3f21dba3fe78b5cf6f3ee1ad
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f1de0689c36fbbc422a38b1692cba32ba48b155c..0e076eb9afad6b974d140d8f439e4d689d171eff 100644
index e13159745e1c03df859f9ad93c828925d6e399d1..1e35ef6c93ee5aa2791defed112459e6ece50495 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -230,6 +230,7 @@ public class PurpurWorldConfig {
@@ -231,6 +231,7 @@ public class PurpurWorldConfig {
public boolean playerInvulnerableWhileAcceptingResourcePack = false;
public String playerDeathExpDropEquation = "expLevel * 7";
public int playerDeathExpDropMax = 100;
@@ -66,7 +66,7 @@ index f1de0689c36fbbc422a38b1692cba32ba48b155c..0e076eb9afad6b974d140d8f439e4d68
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -245,6 +246,7 @@ public class PurpurWorldConfig {
@@ -246,6 +247,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);

6
patches/server/0086-Squid-EAR-immunity.patch
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 0e076eb9afad6b974d140d8f439e4d689d171eff..6264540a68771b03210bf7f91268aa08dde7c518 100644
index 1e35ef6c93ee5aa2791defed112459e6ece50495..8e52cb93307582b1fbc78dcf45e4c2dfaad2fbbe 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1274,6 +1274,7 @@ public class PurpurWorldConfig {
@@ -1282,6 +1282,7 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public double squidMaxHealth = 10.0D;
@@ -16,7 +16,7 @@ index 0e076eb9afad6b974d140d8f439e4d689d171eff..6264540a68771b03210bf7f91268aa08
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1282,6 +1283,7 @@ public class PurpurWorldConfig {
@@ -1290,6 +1291,7 @@ public class PurpurWorldConfig {
set("mobs.squid.attributes.max_health", oldValue);
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);

6
patches/server/0087-Phantoms-burn-in-light.patch
View File

@@ -47,10 +47,10 @@ index 916c29d08fbcf245ad6f50f8e8cc173677b01081..59033a5c28f672089fe3ad846775753a
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 6264540a68771b03210bf7f91268aa08dde7c518..9436b404d961368a66bbc94683bf0216b7a8b3f2 100644
index 8e52cb93307582b1fbc78dcf45e4c2dfaad2fbbe..d4f265f2f55bbe2abbee6022b1fb5ce5275628c7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -992,6 +992,9 @@ public class PurpurWorldConfig {
@@ -1000,6 +1000,9 @@ public class PurpurWorldConfig {
public int phantomSpawnOverheadRadius = 10;
public int phantomSpawnMinPerAttempt = 1;
public int phantomSpawnMaxPerAttempt = -1;
@@ -60,7 +60,7 @@ index 6264540a68771b03210bf7f91268aa08dde7c518..9436b404d961368a66bbc94683bf0216
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1020,6 +1023,9 @@ public class PurpurWorldConfig {
@@ -1028,6 +1031,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);

6
patches/server/0088-Configurable-villager-breeding.patch
View File

@@ -18,10 +18,10 @@ index 69465bc31cff3e96904fa2fabbe31061e9f5ba4b..a1725ccc7b194c26c4f94561a228da9f
private boolean hungry() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9436b404d961368a66bbc94683bf0216b7a8b3f2..d0df471d0ad2df1590ee5bd41d77dd7fd1f1cff3 100644
index d4f265f2f55bbe2abbee6022b1fb5ce5275628c7..0aa98e385c16faa742e7f11959ade9ec05c661a3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1417,6 +1417,7 @@ public class PurpurWorldConfig {
@@ -1425,6 +1425,7 @@ public class PurpurWorldConfig {
public boolean villagerCanBeLeashed = false;
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
@@ -29,7 +29,7 @@ index 9436b404d961368a66bbc94683bf0216b7a8b3f2..d0df471d0ad2df1590ee5bd41d77dd7f
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1432,6 +1433,7 @@ public class PurpurWorldConfig {
@@ -1440,6 +1441,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);

4
patches/server/0089-Redstone-deactivates-spawners.patch
View File

@@ -17,10 +17,10 @@ index c601b8b12756682a4cb300be8ebed4319902c5b5..eec88d3947d435559d8ce175f72c5efb
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d0df471d0ad2df1590ee5bd41d77dd7fd1f1cff3..140dfa7400b6b77596468f8777b8693af70d6094 100644
index 0aa98e385c16faa742e7f11959ade9ec05c661a3..a75f4c2fe76bb653e88604a9b026f0c3e38c5706 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -351,6 +351,11 @@ public class PurpurWorldConfig {
@@ -359,6 +359,11 @@ public class PurpurWorldConfig {
signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
}

6
patches/server/0090-Totems-work-in-inventory.patch
View File

@@ -29,10 +29,10 @@ index 8896f8aa3f21dba3fe78b5cf6f3ee1adfac2bac3..7339ec31aba03974991fdb247beefc74
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 140dfa7400b6b77596468f8777b8693af70d6094..e56f0fca2faec53cc52a07878d4fbe9cff79b7c9 100644
index a75f4c2fe76bb653e88604a9b026f0c3e38c5706..ce01456bfd0aba630476972bda0f85df8fdaf0d6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -231,6 +231,7 @@ public class PurpurWorldConfig {
@@ -232,6 +232,7 @@ public class PurpurWorldConfig {
public String playerDeathExpDropEquation = "expLevel * 7";
public int playerDeathExpDropMax = 100;
public boolean teleportIfOutsideBorder = false;
@@ -40,7 +40,7 @@ index 140dfa7400b6b77596468f8777b8693af70d6094..e56f0fca2faec53cc52a07878d4fbe9c
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -247,6 +248,7 @@ public class PurpurWorldConfig {
@@ -248,6 +249,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);

6
patches/server/0091-Add-vindicator-johnny-spawn-chance.patch
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 e56f0fca2faec53cc52a07878d4fbe9cff79b7c9..ba43bed5bc2750f466243d2bf423d4caa053a85e 100644
index ce01456bfd0aba630476972bda0f85df8fdaf0d6..efbb85ac5acefe31c4371260a7a4078f49666578 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1446,6 +1446,7 @@ public class PurpurWorldConfig {
@@ -1454,6 +1454,7 @@ public class PurpurWorldConfig {
public boolean vindicatorRidable = false;
public boolean vindicatorRidableInWater = false;
public double vindicatorMaxHealth = 24.0D;
@@ -41,7 +41,7 @@ index e56f0fca2faec53cc52a07878d4fbe9cff79b7c9..ba43bed5bc2750f466243d2bf423d4ca
private void vindicatorSettings() {
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
@@ -1455,6 +1456,7 @@ public class PurpurWorldConfig {
@@ -1463,6 +1464,7 @@ public class PurpurWorldConfig {
set("mobs.vindicator.attributes.max_health", oldValue);
}
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);

4
patches/server/0093-Dispensers-place-anvils-option.patch
View File

@@ -41,10 +41,10 @@ index 0d34026a70c72661a9ba6b319690370e589714cc..da1465096178370494c8ed17bd8495f0
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 ba43bed5bc2750f466243d2bf423d4caa053a85e..d83383f98dd3d5766134137bbfdf0d973a925994 100644
index efbb85ac5acefe31c4371260a7a4078f49666578..e63e1a52c4513c27e9dc5ce9b3bb6fce165f7b8d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -310,8 +310,10 @@ public class PurpurWorldConfig {
@@ -318,8 +318,10 @@ public class PurpurWorldConfig {
}
public boolean dispenserApplyCursedArmor = true;

4
patches/server/0094-Allow-anvil-colors.patch
View File

@@ -37,10 +37,10 @@ index 3ce51ff7af5b907cc044c9dd5894be1a03dc2719..81ffe2c1597487188cfcce09c5e160d8
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d83383f98dd3d5766134137bbfdf0d973a925994..3f780ac884e8037d155d402ba9a6807afb0d7a16 100644
index e63e1a52c4513c27e9dc5ce9b3bb6fce165f7b8d..a5d97a8f2f1c28cbd10ce0e8dbb54404566c8ea1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -293,6 +293,11 @@ public class PurpurWorldConfig {
@@ -301,6 +301,11 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

4
patches/server/0095-Add-no-random-tick-block-list.patch
View File

@@ -35,10 +35,10 @@ index 3d677fe25ed015e30634bf2fccde29f332e3dd87..e1aba175a74e73db0a8a11e8d2df35c4
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3f780ac884e8037d155d402ba9a6807afb0d7a16..d301176f1e755fbacc6b3145c0fe8f36a6764b7c 100644
index a5d97a8f2f1c28cbd10ce0e8dbb54404566c8ea1..0ec33bc04f5c08142309c43e05872b4149c8ad95 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -293,6 +293,28 @@ public class PurpurWorldConfig {
@@ -301,6 +301,28 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

6
patches/server/0096-Add-option-to-disable-dolphin-treasure-searching.patch
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 d301176f1e755fbacc6b3145c0fe8f36a6764b7c..a9388714c4bbe576dd0b4dd4f11a346d12d9f002 100644
index 0ec33bc04f5c08142309c43e05872b4149c8ad95..27e60c75eda476f45c7aac8a199bb45e76174e22 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -559,6 +559,7 @@ public class PurpurWorldConfig {
@@ -567,6 +567,7 @@ public class PurpurWorldConfig {
public float dolphinSpitSpeed = 1.0F;
public float dolphinSpitDamage = 2.0F;
public double dolphinMaxHealth = 10.0D;
@@ -28,7 +28,7 @@ index d301176f1e755fbacc6b3145c0fe8f36a6764b7c..a9388714c4bbe576dd0b4dd4f11a346d
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinSpitCooldown = getInt("mobs.dolphin.spit.cooldown", dolphinSpitCooldown);
@@ -570,6 +571,7 @@ public class PurpurWorldConfig {
@@ -578,6 +579,7 @@ public class PurpurWorldConfig {
set("mobs.dolphin.attributes.max_health", oldValue);
}
dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);

6
patches/server/0098-Stop-squids-floating-on-top-of-water.patch
View File

@@ -60,10 +60,10 @@ index 68cc6f2a78a06293a29317fda72ab3ee79b3533a..cfb2e46b34b2982d6724f18214557fc8
+ // Purpur
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a9388714c4bbe576dd0b4dd4f11a346d12d9f002..e59c9a2a4624ac89de30f486dac6d1aef3d914e5 100644
index 27e60c75eda476f45c7aac8a199bb45e76174e22..7e8044adbd1a3847059ae7eadd89df7b0b7b6bbd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1319,6 +1319,7 @@ public class PurpurWorldConfig {
@@ -1327,6 +1327,7 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
@@ -71,7 +71,7 @@ index a9388714c4bbe576dd0b4dd4f11a346d12d9f002..e59c9a2a4624ac89de30f486dac6d1ae
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1328,6 +1329,7 @@ public class PurpurWorldConfig {
@@ -1336,6 +1337,7 @@ public class PurpurWorldConfig {
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);

6
patches/server/0101-Entities-can-use-portals-configuration.patch
View File

@@ -27,10 +27,10 @@ index 003aefff36185613a195edad1bd0121b8526a90b..c2b808a80696b319143ac7f96e75be51
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 e59c9a2a4624ac89de30f486dac6d1aef3d914e5..8ab851aedffa2a66a3ea948393f1ea56fade7150 100644
index 7e8044adbd1a3847059ae7eadd89df7b0b7b6bbd..af311d13e305143ff7abbd0147119962ce5e7208 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -279,6 +279,7 @@ public class PurpurWorldConfig {
@@ -287,6 +287,7 @@ public class PurpurWorldConfig {
public boolean useBetterMending = false;
public boolean boatEjectPlayersOnLand = false;
public boolean disableDropsOnCrammingDeath = false;
@@ -38,7 +38,7 @@ index e59c9a2a4624ac89de30f486dac6d1aef3d914e5..8ab851aedffa2a66a3ea948393f1ea56
public boolean milkCuresBadOmen = true;
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
@@ -287,6 +288,7 @@ public class PurpurWorldConfig {
@@ -295,6 +296,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);

6
patches/server/0103-Customizable-wither-health-and-healing.patch
View File

@@ -23,10 +23,10 @@ index 12cd1b453150e098975c34e00ec9277ff9730c75..ee13bdfb5cfc9992d26126804c0a0bb5
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 8ab851aedffa2a66a3ea948393f1ea56fade7150..ee548f39f3b0c32bd6abd673ea778e7c433bdf89 100644
index af311d13e305143ff7abbd0147119962ce5e7208..0c8670b283bb9bccfa8b585cf29aabb140c81414 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1530,6 +1530,8 @@ public class PurpurWorldConfig {
@@ -1538,6 +1538,8 @@ public class PurpurWorldConfig {
public boolean witherRidableInWater = false;
public double witherMaxY = 256D;
public double witherMaxHealth = 300.0D;
@@ -35,7 +35,7 @@ index 8ab851aedffa2a66a3ea948393f1ea56fade7150..ee548f39f3b0c32bd6abd673ea778e7c
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1544,6 +1546,8 @@ public class PurpurWorldConfig {
@@ -1552,6 +1554,8 @@ public class PurpurWorldConfig {
set("mobs.wither.attributes.max_health", oldValue);
}
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);

6
patches/server/0104-Allow-toggling-special-MobSpawners-per-world.patch
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 ee548f39f3b0c32bd6abd673ea778e7c433bdf89..3ea46e674461916261030bdd8b693789c34a324a 100644
index 0c8670b283bb9bccfa8b585cf29aabb140c81414..ef2e3ad602815b0f40d0e8f99376258f556757f6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -72,6 +72,12 @@ public class PurpurWorldConfig {
@@ -73,6 +73,12 @@ public class PurpurWorldConfig {
return PurpurConfig.config.getBoolean("world-settings." + worldName + "." + path, PurpurConfig.config.getBoolean("world-settings.default." + path));
}
@@ -110,7 +110,7 @@ index ee548f39f3b0c32bd6abd673ea778e7c433bdf89..3ea46e674461916261030bdd8b693789
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));
@@ -221,6 +227,21 @@ public class PurpurWorldConfig {
@@ -222,6 +228,21 @@ public class PurpurWorldConfig {
}
}

6
patches/server/0105-Raid-cooldown-setting.patch
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 3ea46e674461916261030bdd8b693789c34a324a..0d6e9f5f14d75c71f96da4b2ad7eb9d19fcf4254 100644
index ef2e3ad602815b0f40d0e8f99376258f556757f6..73c2312de3140bb95f5b71817b970b4dbfa79307 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -305,6 +305,7 @@ public class PurpurWorldConfig {
@@ -313,6 +313,7 @@ public class PurpurWorldConfig {
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -63,7 +63,7 @@ index 3ea46e674461916261030bdd8b693789c34a324a..0d6e9f5f14d75c71f96da4b2ad7eb9d1
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
@@ -314,6 +315,7 @@ public class PurpurWorldConfig {
@@ -322,6 +323,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);

6
patches/server/0106-Despawn-rate-config-options-per-projectile-type.patch
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 0d6e9f5f14d75c71f96da4b2ad7eb9d19fcf4254..bf4629ce5d098bd5c950071a810b841427a18fb7 100644
index 73c2312de3140bb95f5b71817b970b4dbfa79307..ec8d6caa531d53d5f7899c135fc067c3f892286c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -272,6 +272,35 @@ public class PurpurWorldConfig {
@@ -273,6 +273,35 @@ public class PurpurWorldConfig {
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
}
@@ -326,5 +326,5 @@ index 0d6e9f5f14d75c71f96da4b2ad7eb9d19fcf4254..bf4629ce5d098bd5c950071a810b8414
+ }
+
public boolean silkTouchEnabled = false;
public String silkTouchSpawnerName = "Spawner";
public String silkTouchSpawnerName = "<reset><white>Spawner";
public List<String> silkTouchSpawnerLore = new ArrayList<>();

6
patches/server/0107-Add-option-to-disable-zombie-aggressiveness-towards-.patch
View File

@@ -71,10 +71,10 @@ index 1f9a233799be988748f6146ced2a4489899079f8..1f90c40c5e92232c38a33097903fd6e2
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 bf4629ce5d098bd5c950071a810b841427a18fb7..1484f492df6366dec71aa1ced77ea6f8037675ca 100644
index ec8d6caa531d53d5f7899c135fc067c3f892286c..4117828770455975109f7c7700218d392fce101c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1651,6 +1651,7 @@ public class PurpurWorldConfig {
@@ -1659,6 +1659,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyOnlyBaby = true;
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
@@ -82,7 +82,7 @@ index bf4629ce5d098bd5c950071a810b841427a18fb7..1484f492df6366dec71aa1ced77ea6f8
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1664,6 +1665,7 @@ public class PurpurWorldConfig {
@@ -1672,6 +1673,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);

6
patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch
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 1484f492df6366dec71aa1ced77ea6f8037675ca..e1aab2eee7b3c3148f48417126bee94e91968033 100644
index 4117828770455975109f7c7700218d392fce101c..a3f5f60167502d596f5587782fa2f3f69f423a18 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -331,6 +331,7 @@ public class PurpurWorldConfig {
@@ -339,6 +339,7 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesCanUsePortals = true;
public boolean milkCuresBadOmen = true;
@@ -200,7 +200,7 @@ index 1484f492df6366dec71aa1ced77ea6f8037675ca..e1aab2eee7b3c3148f48417126bee94e
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -341,6 +342,7 @@ public class PurpurWorldConfig {
@@ -349,6 +350,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);

8
patches/server/0110-Flying-squids-Oh-my.patch
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 e1aab2eee7b3c3148f48417126bee94e91968033..0653652a130841d15365d4843f864c3169c82e12 100644
index a3f5f60167502d596f5587782fa2f3f69f423a18..27b8310766566e17a46b880f6d2636bf62ae9cab 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -818,9 +818,11 @@ public class PurpurWorldConfig {
@@ -826,9 +826,11 @@ public class PurpurWorldConfig {
public boolean glowSquidRidable = false;
public double glowSquidMaxHealth = 10.0D;
@@ -73,7 +73,7 @@ index e1aab2eee7b3c3148f48417126bee94e91968033..0653652a130841d15365d4843f864c31
}
public boolean goatRidable = false;
@@ -1376,6 +1378,7 @@ public class PurpurWorldConfig {
@@ -1384,6 +1386,7 @@ public class PurpurWorldConfig {
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
public double squidOffsetWaterCheck = 0.0D;
@@ -81,7 +81,7 @@ index e1aab2eee7b3c3148f48417126bee94e91968033..0653652a130841d15365d4843f864c31
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1386,6 +1389,7 @@ public class PurpurWorldConfig {
@@ -1394,6 +1397,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);

4
patches/server/0111-Infinity-bow-settings.patch
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 0653652a130841d15365d4843f864c3169c82e12..c7bac948061bacbd50560bddc5a4a4108853f28f 100644
index 27b8310766566e17a46b880f6d2636bf62ae9cab..7dd7e464e1b463e47a41eb94d933edffbf39f280 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -122,6 +122,17 @@ public class PurpurWorldConfig {
@@ -123,6 +123,17 @@ public class PurpurWorldConfig {
entityLifeSpan = getInt("gameplay-mechanics.entity-lifespan", entityLifeSpan);
}

4
patches/server/0112-Stonecutter-damage.patch
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 c7bac948061bacbd50560bddc5a4a4108853f28f..05556f2d9f414a8718a616afcb1d15b2b97e2717 100644
index 7dd7e464e1b463e47a41eb94d933edffbf39f280..1a278a78caaa79cfed13bdd243e212d573a9af77 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -454,6 +454,11 @@ public class PurpurWorldConfig {
@@ -462,6 +462,11 @@ public class PurpurWorldConfig {
spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
}

4
patches/server/0113-Configurable-daylight-cycle.patch
View File

@@ -70,10 +70,10 @@ index 1ea18770c65583e2ed604eb15d15067a638a33a2..85b3ffb58b06ff6342abdd8948c16070
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 05556f2d9f414a8718a616afcb1d15b2b97e2717..fd8430ad5419655f9d53f532e0f5c3d8391425f2 100644
index 1a278a78caaa79cfed13bdd243e212d573a9af77..683d0e5699b8152b45fed8d1b3d1de7700b4705e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -104,6 +104,13 @@ public class PurpurWorldConfig {
@@ -105,6 +105,13 @@ public class PurpurWorldConfig {
armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
}

4
patches/server/0115-Furnace-uses-lava-from-underneath.patch
View File

@@ -48,10 +48,10 @@ index 242d9b2ecb852d812d4887883cb2aabfd21e3715..2c64622577fdb6c2a5746471121403b6
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 fd8430ad5419655f9d53f532e0f5c3d8391425f2..ec8ee7c39f40c24b4a2ee4e052c48fdf43bff645 100644
index 683d0e5699b8152b45fed8d1b3d1de7700b4705e..be99ae32fd8279f00068743f9d9e365cc220a462 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -422,6 +422,17 @@ public class PurpurWorldConfig {
@@ -430,6 +430,17 @@ public class PurpurWorldConfig {
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
}

4
patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
View File

@@ -24,10 +24,10 @@ index f638c7b27a846bf9db73e98ce9eb5d579bc25cac..e0ef42c2613374bedc8eb114aef7dd2a
return;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ec8ee7c39f40c24b4a2ee4e052c48fdf43bff645..74544421716246a73876f4a39711ee25438a8f2c 100644
index be99ae32fd8279f00068743f9d9e365cc220a462..b285a01ab3dd34aefc5e082a60d762de454ac046 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -418,8 +418,10 @@ public class PurpurWorldConfig {
@@ -426,8 +426,10 @@ public class PurpurWorldConfig {
}
public boolean farmlandGetsMoistFromBelow = false;

6
patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch
View File

@@ -95,10 +95,10 @@ index 25422752c79ea4ee547caa46fa4ed920622e682e..5e06dbb25359b593c6960652ee99f822
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, 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 74544421716246a73876f4a39711ee25438a8f2c..db50fe00f2e725d0ab44f8704443cf6107e39d4e 100644
index b285a01ab3dd34aefc5e082a60d762de454ac046..28d75a22b1197fb1451f0b1fe26c335494cea901 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -354,6 +354,7 @@ public class PurpurWorldConfig {
@@ -362,6 +362,7 @@ public class PurpurWorldConfig {
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
public int raidCooldownSeconds = 0;
@@ -106,7 +106,7 @@ index 74544421716246a73876f4a39711ee25438a8f2c..db50fe00f2e725d0ab44f8704443cf61
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
@@ -365,6 +366,7 @@ public class PurpurWorldConfig {
@@ -373,6 +374,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);

90
patches/server/0119-Make-entity-breeding-times-configurable.patch
View File

@@ -474,10 +474,10 @@ index fb0aa2854f8be22682ee65298080b668c722f447..975e15a501f01c1f87b80ee20d57f4d2
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788d204dc17 100644
index 28d75a22b1197fb1451f0b1fe26c335494cea901..be85b0687e46c3ee00709fef7396070fbbb717c2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -492,9 +492,11 @@ public class PurpurWorldConfig {
@@ -500,9 +500,11 @@ public class PurpurWorldConfig {
public boolean axolotlRidable = false;
public double axolotlMaxHealth = 14.0D;
@@ -489,7 +489,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean batRidable = false;
@@ -524,6 +526,7 @@ public class PurpurWorldConfig {
@@ -532,6 +534,7 @@ public class PurpurWorldConfig {
public boolean beeRidableInWater = false;
public double beeMaxY = 256D;
public double beeMaxHealth = 10.0D;
@@ -497,7 +497,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -534,6 +537,7 @@ public class PurpurWorldConfig {
@@ -542,6 +545,7 @@ public class PurpurWorldConfig {
set("mobs.bee.attributes.max_health", oldValue);
}
beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
@@ -505,7 +505,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean blazeRidable = false;
@@ -558,6 +562,7 @@ public class PurpurWorldConfig {
@@ -566,6 +570,7 @@ public class PurpurWorldConfig {
public int catSpawnDelay = 1200;
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
@@ -513,7 +513,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -570,6 +575,7 @@ public class PurpurWorldConfig {
@@ -578,6 +583,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 db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean caveSpiderRidable = false;
@@ -590,6 +596,7 @@ public class PurpurWorldConfig {
@@ -598,6 +604,7 @@ public class PurpurWorldConfig {
public boolean chickenRidableInWater = false;
public double chickenMaxHealth = 4.0D;
public boolean chickenRetaliate = false;
@@ -529,7 +529,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -600,6 +607,7 @@ public class PurpurWorldConfig {
@@ -608,6 +615,7 @@ public class PurpurWorldConfig {
}
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
@@ -537,7 +537,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean codRidable = false;
@@ -618,6 +626,7 @@ public class PurpurWorldConfig {
@@ -626,6 +634,7 @@ public class PurpurWorldConfig {
public boolean cowRidableInWater = false;
public double cowMaxHealth = 10.0D;
public int cowFeedMushrooms = 0;
@@ -545,7 +545,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -628,6 +637,7 @@ public class PurpurWorldConfig {
@@ -636,6 +645,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 db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean creeperRidable = false;
@@ -675,6 +685,7 @@ public class PurpurWorldConfig {
@@ -683,6 +693,7 @@ public class PurpurWorldConfig {
public double donkeyJumpStrengthMax = 0.5D;
public double donkeyMovementSpeedMin = 0.175D;
public double donkeyMovementSpeedMax = 0.175D;
@@ -561,7 +561,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
if (PurpurConfig.version < 10) {
@@ -690,6 +701,7 @@ public class PurpurWorldConfig {
@@ -698,6 +709,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 db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean drownedRidable = false;
@@ -796,6 +808,7 @@ public class PurpurWorldConfig {
@@ -804,6 +816,7 @@ public class PurpurWorldConfig {
public boolean foxRidableInWater = false;
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
@@ -577,7 +577,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -806,6 +819,7 @@ public class PurpurWorldConfig {
@@ -814,6 +827,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 db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean ghastRidable = false;
@@ -866,10 +880,12 @@ public class PurpurWorldConfig {
@@ -874,10 +888,12 @@ public class PurpurWorldConfig {
public boolean goatRidable = false;
public boolean goatRidableInWater = false;
public double goatMaxHealth = 10.0D;
@@ -598,7 +598,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean guardianRidable = false;
@@ -887,6 +903,7 @@ public class PurpurWorldConfig {
@@ -895,6 +911,7 @@ public class PurpurWorldConfig {
public boolean hoglinRidable = false;
public boolean hoglinRidableInWater = false;
public double hoglinMaxHealth = 40.0D;
@@ -606,7 +606,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void hoglinSettings() {
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
@@ -896,6 +913,7 @@ public class PurpurWorldConfig {
@@ -904,6 +921,7 @@ public class PurpurWorldConfig {
set("mobs.hoglin.attributes.max_health", oldValue);
}
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
@@ -614,7 +614,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean horseRidableInWater = false;
@@ -905,6 +923,7 @@ public class PurpurWorldConfig {
@@ -913,6 +931,7 @@ public class PurpurWorldConfig {
public double horseJumpStrengthMax = 1.0D;
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
@@ -622,7 +622,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -920,6 +939,7 @@ public class PurpurWorldConfig {
@@ -928,6 +947,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 db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean huskRidable = false;
@@ -990,6 +1010,7 @@ public class PurpurWorldConfig {
@@ -998,6 +1018,7 @@ public class PurpurWorldConfig {
public double llamaJumpStrengthMax = 0.5D;
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
@@ -638,7 +638,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1006,6 +1027,7 @@ public class PurpurWorldConfig {
@@ -1014,6 +1035,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 db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean magmaCubeRidable = false;
@@ -1025,6 +1047,7 @@ public class PurpurWorldConfig {
@@ -1033,6 +1055,7 @@ public class PurpurWorldConfig {
public boolean mooshroomRidable = false;
public boolean mooshroomRidableInWater = false;
public double mooshroomMaxHealth = 10.0D;
@@ -654,7 +654,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1034,6 +1057,7 @@ public class PurpurWorldConfig {
@@ -1042,6 +1065,7 @@ public class PurpurWorldConfig {
set("mobs.mooshroom.attributes.max_health", oldValue);
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -662,7 +662,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean muleRidableInWater = false;
@@ -1043,6 +1067,7 @@ public class PurpurWorldConfig {
@@ -1051,6 +1075,7 @@ public class PurpurWorldConfig {
public double muleJumpStrengthMax = 0.5D;
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
@@ -670,7 +670,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1058,11 +1083,13 @@ public class PurpurWorldConfig {
@@ -1066,11 +1091,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 db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1072,11 +1099,13 @@ public class PurpurWorldConfig {
@@ -1080,11 +1107,13 @@ public class PurpurWorldConfig {
set("mobs.ocelot.attributes.max_health", oldValue);
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -698,7 +698,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1086,6 +1115,7 @@ public class PurpurWorldConfig {
@@ -1094,6 +1123,7 @@ public class PurpurWorldConfig {
set("mobs.panda.attributes.max_health", oldValue);
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -706,7 +706,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean parrotRidable = false;
@@ -1166,6 +1196,7 @@ public class PurpurWorldConfig {
@@ -1174,6 +1204,7 @@ public class PurpurWorldConfig {
public boolean pigRidableInWater = false;
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
@@ -714,7 +714,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1176,6 +1207,7 @@ public class PurpurWorldConfig {
@@ -1184,6 +1215,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 db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean piglinRidable = false;
@@ -1225,6 +1257,7 @@ public class PurpurWorldConfig {
@@ -1233,6 +1265,7 @@ public class PurpurWorldConfig {
public double polarBearMaxHealth = 30.0D;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -730,7 +730,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1237,6 +1270,7 @@ public class PurpurWorldConfig {
@@ -1245,6 +1278,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 db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean pufferfishRidable = false;
@@ -1256,6 +1290,7 @@ public class PurpurWorldConfig {
@@ -1264,6 +1298,7 @@ public class PurpurWorldConfig {
public double rabbitMaxHealth = 3.0D;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -746,7 +746,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1267,6 +1302,7 @@ public class PurpurWorldConfig {
@@ -1275,6 +1310,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 db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean ravagerRidable = false;
@@ -1298,6 +1334,7 @@ public class PurpurWorldConfig {
@@ -1306,6 +1342,7 @@ public class PurpurWorldConfig {
public boolean sheepRidable = false;
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
@@ -762,7 +762,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1307,6 +1344,7 @@ public class PurpurWorldConfig {
@@ -1315,6 +1352,7 @@ public class PurpurWorldConfig {
set("mobs.sheep.attributes.max_health", oldValue);
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -770,7 +770,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean shulkerRidable = false;
@@ -1461,6 +1499,7 @@ public class PurpurWorldConfig {
@@ -1469,6 +1507,7 @@ public class PurpurWorldConfig {
public boolean striderRidable = false;
public boolean striderRidableInWater = false;
public double striderMaxHealth = 20.0D;
@@ -778,7 +778,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1470,6 +1509,7 @@ public class PurpurWorldConfig {
@@ -1478,6 +1517,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -786,7 +786,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean traderLlamaRidable = false;
@@ -1480,6 +1520,7 @@ public class PurpurWorldConfig {
@@ -1488,6 +1528,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -794,7 +794,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1496,6 +1537,7 @@ public class PurpurWorldConfig {
@@ -1504,6 +1545,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 db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean tropicalFishRidable = false;
@@ -1516,6 +1558,7 @@ public class PurpurWorldConfig {
@@ -1524,6 +1566,7 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromExpOrbs = true;
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;
@@ -810,7 +810,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void turtleEggSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1528,6 +1571,7 @@ public class PurpurWorldConfig {
@@ -1536,6 +1579,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 db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean vexRidable = false;
@@ -1556,6 +1600,7 @@ public class PurpurWorldConfig {
@@ -1564,6 +1608,7 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
@@ -826,7 +826,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1572,6 +1617,7 @@ public class PurpurWorldConfig {
@@ -1580,6 +1625,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 db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
}
public boolean vindicatorRidable = false;
@@ -1663,6 +1709,7 @@ public class PurpurWorldConfig {
@@ -1671,6 +1717,7 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -842,7 +842,7 @@ index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1672,6 +1719,7 @@ public class PurpurWorldConfig {
@@ -1680,6 +1727,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

8
patches/server/0120-Apply-display-names-from-item-forms-of-entities-to-e.patch
View File

@@ -142,10 +142,10 @@ index e5b042f2445eb06fb8075ba539c836595814fa14..8cdede6a9698d6c99b4f08edc2a3403f
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 42f1ef15f020b2b62079d23fde09b788d204dc17..e79720605098b1773227f02705c29415a4723ccc 100644
index be85b0687e46c3ee00709fef7396070fbbb717c2..64d6764348b0b394519ef554fd41ff07ca243308 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -100,8 +100,10 @@ public class PurpurWorldConfig {
@@ -101,8 +101,10 @@ public class PurpurWorldConfig {
}
public float armorstandStepHeight = 0.0F;
@@ -156,7 +156,7 @@ index 42f1ef15f020b2b62079d23fde09b788d204dc17..e79720605098b1773227f02705c29415
}
public int daytimeTicks = 12000;
@@ -350,6 +352,7 @@ public class PurpurWorldConfig {
@@ -358,6 +360,7 @@ public class PurpurWorldConfig {
public boolean entitiesCanUsePortals = true;
public boolean milkCuresBadOmen = true;
public boolean persistentTileEntityDisplayNames = false;
@@ -164,7 +164,7 @@ index 42f1ef15f020b2b62079d23fde09b788d204dc17..e79720605098b1773227f02705c29415
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -362,6 +365,7 @@ public class PurpurWorldConfig {
@@ -370,6 +373,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);

4
patches/server/0121-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
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 e79720605098b1773227f02705c29415a4723ccc..45363eb67ab0c30c687a556392afe8e44e3d5f0d 100644
index 64d6764348b0b394519ef554fd41ff07ca243308..0535ff98b429f796340f3f402313f558a2aca806 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,9 +101,11 @@ public class PurpurWorldConfig {
@@ -102,9 +102,11 @@ public class PurpurWorldConfig {
public float armorstandStepHeight = 0.0F;
public boolean armorstandSetNameVisible = false;

6
patches/server/0122-Add-twisting-and-weeping-vines-growth-rates.patch
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 45363eb67ab0c30c687a556392afe8e44e3d5f0d..7d5493fea2b7cfb26221e8592c7c3ef9cb65d05d 100644
index 0535ff98b429f796340f3f402313f558a2aca806..7f1a5419ded0e161f783f5eb3338935e63aeb878 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -418,6 +418,11 @@ public class PurpurWorldConfig {
@@ -426,6 +426,11 @@ public class PurpurWorldConfig {
}
}
@@ -97,7 +97,7 @@ index 45363eb67ab0c30c687a556392afe8e44e3d5f0d..7d5493fea2b7cfb26221e8592c7c3ef9
public boolean dispenserApplyCursedArmor = true;
public boolean dispenserPlaceAnvils = false;
private void dispenserSettings() {
@@ -487,6 +492,16 @@ public class PurpurWorldConfig {
@@ -495,6 +500,16 @@ public class PurpurWorldConfig {
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
}

8
patches/server/0123-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
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 7d5493fea2b7cfb26221e8592c7c3ef9cb65d05d..7afbb2fb08fa651a11da52582f2b50188e24d086 100644
index 7f1a5419ded0e161f783f5eb3338935e63aeb878..0125759cb690531410890ed58af5feab9eee3ca6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -419,8 +419,10 @@ public class PurpurWorldConfig {
@@ -427,8 +427,10 @@ public class PurpurWorldConfig {
}
public double caveVinesGrowthModifier = 0.10D;
@@ -117,7 +117,7 @@ index 7d5493fea2b7cfb26221e8592c7c3ef9cb65d05d..7afbb2fb08fa651a11da52582f2b5018
}
public boolean dispenserApplyCursedArmor = true;
@@ -459,6 +461,11 @@ public class PurpurWorldConfig {
@@ -467,6 +469,11 @@ public class PurpurWorldConfig {
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
}
@@ -129,7 +129,7 @@ index 7d5493fea2b7cfb26221e8592c7c3ef9cb65d05d..7afbb2fb08fa651a11da52582f2b5018
public boolean respawnAnchorExplode = true;
public double respawnAnchorExplosionPower = 5.0D;
public boolean respawnAnchorExplosionFire = true;
@@ -493,13 +500,17 @@ public class PurpurWorldConfig {
@@ -501,13 +508,17 @@ public class PurpurWorldConfig {
}
public double twistingVinesGrowthModifier = 0.10D;

6
patches/server/0124-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
View File

@@ -21,10 +21,10 @@ index 10c3a0c49579fbd9f1fe7ec82eebd42be3412b69..f701807f2593189632a2a556e82bc0f1
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 7afbb2fb08fa651a11da52582f2b50188e24d086..85d3c66d000f4402c05e41873a3e0ed519f67249 100644
index 0125759cb690531410890ed58af5feab9eee3ca6..7fa4e1e1e31de83d00aa32f2b4aeb6c245ae3131 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -796,6 +796,7 @@ public class PurpurWorldConfig {
@@ -804,6 +804,7 @@ public class PurpurWorldConfig {
public boolean endermanRidableInWater = false;
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
@@ -32,7 +32,7 @@ index 7afbb2fb08fa651a11da52582f2b50188e24d086..85d3c66d000f4402c05e41873a3e0ed5
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -806,6 +807,7 @@ public class PurpurWorldConfig {
@@ -814,6 +815,7 @@ public class PurpurWorldConfig {
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);

4
patches/server/0126-Add-configurable-snowball-damage.patch
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 85d3c66d000f4402c05e41873a3e0ed519f67249..14f7fb59c2b5840254afe7695e1b7413ec5909e8 100644
index 7fa4e1e1e31de83d00aa32f2b4aeb6c245ae3131..985bf48699eb7bf205ec98c044552714a094fef7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -294,6 +294,11 @@ public class PurpurWorldConfig {
@@ -295,6 +295,11 @@ public class PurpurWorldConfig {
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
}

6
patches/server/0127-Zombie-break-door-minimum-difficulty-option.patch
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 14f7fb59c2b5840254afe7695e1b7413ec5909e8..a589e2292aae4402cef2a6a6cea68ab1f81d7f5a 100644
index 985bf48699eb7bf205ec98c044552714a094fef7..a22bc71ef48ce8c258753ee8bd083ddc450f91d6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1783,6 +1783,7 @@ public class PurpurWorldConfig {
@@ -1791,6 +1791,7 @@ public class PurpurWorldConfig {
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -55,7 +55,7 @@ index 14f7fb59c2b5840254afe7695e1b7413ec5909e8..a589e2292aae4402cef2a6a6cea68ab1
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1797,6 +1798,11 @@ public class PurpurWorldConfig {
@@ -1805,6 +1806,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);

4
patches/server/0129-Changeable-Mob-Left-Handed-Chance.patch
View File

@@ -18,10 +18,10 @@ index 437015eef7404362cb564dec72e3e87c79b4ff0b..e6aa1a5040bbd483a752f9c646fdb062
} 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 a589e2292aae4402cef2a6a6cea68ab1f81d7f5a..6060068efe2ad4e3a2c6113a92e1e02db2da5d18 100644
index a22bc71ef48ce8c258753ee8bd083ddc450f91d6..78f558029ac9bb36133b45f357ac85425d474b0e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -129,8 +129,10 @@ public class PurpurWorldConfig {
@@ -130,8 +130,10 @@ public class PurpurWorldConfig {
}
public int entityLifeSpan = 0;

6
patches/server/0130-Add-boat-fall-damage-config.patch
View File

@@ -27,10 +27,10 @@ index f688693ae25999bdbb2a7bf402fdfffd3f62795a..a78d1068802c98d888fe2e139a327a08
if (!flag && isSpawnInvulnerable() && source != DamageSource.OUT_OF_WORLD) { // Purpur
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6060068efe2ad4e3a2c6113a92e1e02db2da5d18..3c47f92a02361b4ed671c3f2a04a85f965a18d93 100644
index 78f558029ac9bb36133b45f357ac85425d474b0e..41dacbe19c2c42b755da0ce91e531c2c84f82016 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -357,6 +357,7 @@ public class PurpurWorldConfig {
@@ -365,6 +365,7 @@ public class PurpurWorldConfig {
public boolean useBetterMending = false;
public boolean boatEjectPlayersOnLand = false;
@@ -38,7 +38,7 @@ index 6060068efe2ad4e3a2c6113a92e1e02db2da5d18..3c47f92a02361b4ed671c3f2a04a85f9
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesCanUsePortals = true;
public boolean milkCuresBadOmen = true;
@@ -370,6 +371,7 @@ public class PurpurWorldConfig {
@@ -378,6 +379,7 @@ public class PurpurWorldConfig {
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);

6
patches/server/0131-Snow-Golem-rate-of-fire-config.patch
View File

@@ -23,10 +23,10 @@ index ee64f4084b25d77f1c25b76a5b7d90cd2547bffb..5e370d5137564ddcfb76a81b92d43e25
this.goalSelector.addGoal(3, new LookAtPlayerGoal(this, Player.class, 6.0F));
this.goalSelector.addGoal(4, new RandomLookAroundGoal(this));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3c47f92a02361b4ed671c3f2a04a85f965a18d93..92a401270ef46e7e8f0b458cfac7ce67ed565cb1 100644
index 41dacbe19c2c42b755da0ce91e531c2c84f82016..e9591ff2c24b2b7f2b4532df3fbd172e4ee2d58a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1479,6 +1479,10 @@ public class PurpurWorldConfig {
@@ -1487,6 +1487,10 @@ public class PurpurWorldConfig {
public double snowGolemMaxHealth = 4.0D;
public boolean snowGolemDropsPumpkin = true;
public boolean snowGolemPutPumpkinBack = false;
@@ -37,7 +37,7 @@ index 3c47f92a02361b4ed671c3f2a04a85f965a18d93..92a401270ef46e7e8f0b458cfac7ce67
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1491,6 +1495,10 @@ public class PurpurWorldConfig {
@@ -1499,6 +1503,10 @@ public class PurpurWorldConfig {
snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);
snowGolemDropsPumpkin = getBoolean("mobs.snow_golem.drop-pumpkin-when-sheared", snowGolemDropsPumpkin);
snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);

6
patches/server/0133-Lobotomize-stuck-villagers.patch
View File

@@ -56,10 +56,10 @@ index a1725ccc7b194c26c4f94561a228da9f56e24cfc..14c616f3159e4227da90c1fcc097bb46
if (this.assignProfessionWhenSpawned) {
this.assignProfessionWhenSpawned = false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 92a401270ef46e7e8f0b458cfac7ce67ed565cb1..e9965b16c346344e7e0fae2a113b53268f04a92f 100644
index e9591ff2c24b2b7f2b4532df3fbd172e4ee2d58a..0cd91a59bbfd54f2ff3fa833a4e387421c9d9029 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1652,6 +1652,8 @@ public class PurpurWorldConfig {
@@ -1660,6 +1660,8 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
public int villagerBreedingTicks = 6000;
@@ -68,7 +68,7 @@ index 92a401270ef46e7e8f0b458cfac7ce67ed565cb1..e9965b16c346344e7e0fae2a113b5326
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1669,6 +1671,13 @@ public class PurpurWorldConfig {
@@ -1677,6 +1679,13 @@ public class PurpurWorldConfig {
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks);

6
patches/server/0134-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
View File

@@ -185,10 +185,10 @@ index 901fc6520d58a5fa5f2cf1b4fa78fec6008aa409..9050cd25663c71197c597aac0ab2e612
public static final VillagerProfession FISHERMAN = register("fisherman", PoiType.FISHERMAN, SoundEvents.VILLAGER_WORK_FISHERMAN);
public static final VillagerProfession FLETCHER = register("fletcher", PoiType.FLETCHER, SoundEvents.VILLAGER_WORK_FLETCHER);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e9965b16c346344e7e0fae2a113b53268f04a92f..11959f09d204cd08a04f7dc7d2aecd18e2430bb3 100644
index 0cd91a59bbfd54f2ff3fa833a4e387421c9d9029..ec4c32396b00cf9d0232d5f070535464db461059 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1654,6 +1654,8 @@ public class PurpurWorldConfig {
@@ -1662,6 +1662,8 @@ public class PurpurWorldConfig {
public int villagerBreedingTicks = 6000;
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheck = 60;
@@ -197,7 +197,7 @@ index e9965b16c346344e7e0fae2a113b53268f04a92f..11959f09d204cd08a04f7dc7d2aecd18
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1678,6 +1680,8 @@ public class PurpurWorldConfig {
@@ -1686,6 +1688,8 @@ public class PurpurWorldConfig {
}
villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck);

6
patches/server/0135-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
View File

@@ -35,10 +35,10 @@ index 5b5958e37918b97fa994500fe94cd0e57faa1948..64216c9d76ce5ec6a845915ca078b0c0
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 11959f09d204cd08a04f7dc7d2aecd18e2430bb3..3538ee8f9526e28a38aca1b69e49b0ada5b57603 100644
index ec4c32396b00cf9d0232d5f070535464db461059..b347ccd3795768aca1c203b88943215f121351d2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1886,6 +1886,7 @@ public class PurpurWorldConfig {
@@ -1894,6 +1894,7 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinJockeyOnlyBaby = true;
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
@@ -46,7 +46,7 @@ index 11959f09d204cd08a04f7dc7d2aecd18e2430bb3..3538ee8f9526e28a38aca1b69e49b0ad
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1899,5 +1900,6 @@ public class PurpurWorldConfig {
@@ -1907,5 +1908,6 @@ public class PurpurWorldConfig {
zombifiedPiglinJockeyOnlyBaby = getBoolean("mobs.zombified_piglin.jockey.only-babies", zombifiedPiglinJockeyOnlyBaby);
zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);

6
patches/server/0137-Configurable-chance-for-wolves-to-spawn-rabid.patch
View File

@@ -201,10 +201,10 @@ index ef4abaf68de01b0879f7d0b330d2d57cc6bd10f9..3e7409ebf1f94b9cf55f2d0b0fe17ca8
return super.mobInteract(player, hand);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3538ee8f9526e28a38aca1b69e49b0ada5b57603..9d17110efe1d606fcc446654d55d09716fd53e2c 100644
index b347ccd3795768aca1c203b88943215f121351d2..08ea2551de99a712ac604716d52fd2992de16a22 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1773,6 +1773,8 @@ public class PurpurWorldConfig {
@@ -1781,6 +1781,8 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -213,7 +213,7 @@ index 3538ee8f9526e28a38aca1b69e49b0ada5b57603..9d17110efe1d606fcc446654d55d0971
public int wolfBreedingTicks = 6000;
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
@@ -1783,6 +1785,8 @@ public class PurpurWorldConfig {
@@ -1791,6 +1793,8 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

6
patches/server/0138-Configurable-default-wolf-collar-color.patch
View File

@@ -24,10 +24,10 @@ index 3e7409ebf1f94b9cf55f2d0b0fe17ca8ec44659f..518dd0e6b4889c049e438b393baa795a
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9d17110efe1d606fcc446654d55d09716fd53e2c..125aceb43ce18c1dd0dae41c444394c3953773e1 100644
index 08ea2551de99a712ac604716d52fd2992de16a22..7c8ae9626d9d61e561cbe0c54cfe971260dc3a69 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1773,6 +1773,7 @@ public class PurpurWorldConfig {
@@ -1781,6 +1781,7 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -35,7 +35,7 @@ index 9d17110efe1d606fcc446654d55d09716fd53e2c..125aceb43ce18c1dd0dae41c444394c3
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -1785,6 +1786,11 @@ public class PurpurWorldConfig {
@@ -1793,6 +1794,11 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

6
patches/server/0139-Phantom-flames-on-swoop.patch
View File

@@ -17,10 +17,10 @@ index 59033a5c28f672089fe3ad846775753ae90f9ad9..a575649cff83df5c0888ba48610ece08
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 125aceb43ce18c1dd0dae41c444394c3953773e1..112cbf62bf97a25d44933e80d637b4169889db20 100644
index 7c8ae9626d9d61e561cbe0c54cfe971260dc3a69..10c6c8a053acf761e2645c86823d1e2eb7c13e13 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1183,6 +1183,7 @@ public class PurpurWorldConfig {
@@ -1191,6 +1191,7 @@ public class PurpurWorldConfig {
public float phantomFlameDamage = 1.0F;
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
@@ -28,7 +28,7 @@ index 125aceb43ce18c1dd0dae41c444394c3953773e1..112cbf62bf97a25d44933e80d637b416
public double phantomMaxHealth = 20.0D;
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
@@ -1209,6 +1210,7 @@ public class PurpurWorldConfig {
@@ -1217,6 +1218,7 @@ 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);

4
patches/server/0140-Option-for-chests-to-open-even-with-a-solid-block-on.patch
View File

@@ -17,10 +17,10 @@ index eecb8c089b5f426b1395b47f714af32c210555ef..ac82e2b0f4ca1232cc7ec6e4c7dd2613
return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 112cbf62bf97a25d44933e80d637b4169889db20..317daf176c8ee961c5feaa738b406b8f5a42e1aa 100644
index 10c6c8a053acf761e2645c86823d1e2eb7c13e13..dcaca117ed5bf3b9c2459cbe72c7752e96b84850 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -434,6 +434,11 @@ public class PurpurWorldConfig {
@@ -442,6 +442,11 @@ public class PurpurWorldConfig {
caveVinesMaxGrowthAge = getInt("blocks.cave_vines.max-growth-age", caveVinesMaxGrowthAge);
}

6
patches/server/0142-Striders-give-saddle-back.patch
View File

@@ -28,10 +28,10 @@ index 9d314470361b2e17afdadc355c084254e5b03aff..66dab9b4e5ae05deeae11c8588a0b855
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 317daf176c8ee961c5feaa738b406b8f5a42e1aa..cb5a4a7510245ade742b780c9ffd68e7596abfc9 100644
index dcaca117ed5bf3b9c2459cbe72c7752e96b84850..666dcdc11178ea576c84f50e37da57f3844b7bf4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1558,6 +1558,7 @@ public class PurpurWorldConfig {
@@ -1566,6 +1566,7 @@ public class PurpurWorldConfig {
public boolean striderRidableInWater = false;
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
@@ -39,7 +39,7 @@ index 317daf176c8ee961c5feaa738b406b8f5a42e1aa..cb5a4a7510245ade742b780c9ffd68e7
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1568,6 +1569,7 @@ public class PurpurWorldConfig {
@@ -1576,6 +1577,7 @@ public class PurpurWorldConfig {
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);

4
patches/server/0144-Full-netherite-armor-grants-fire-resistance.patch
View File

@@ -26,10 +26,10 @@ index 5b0647a8b8d2dd8a44b38c378312ad917d5314d9..d7a3d2928a63517a1513f5572b121f77
protected ItemCooldowns createItemCooldowns() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index cb5a4a7510245ade742b780c9ffd68e7596abfc9..04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78 100644
index 666dcdc11178ea576c84f50e37da57f3844b7bf4..a8390aad9b3991ae83102de0057a2ed45914c612 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -266,6 +266,19 @@ public class PurpurWorldConfig {
@@ -267,6 +267,19 @@ public class PurpurWorldConfig {
villageSiegeSpawning = getBoolean("gameplay-mechanics.mob-spawning.village-sieges", predicate);
}

70
patches/server/0146-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -393,10 +393,10 @@ index e98fc3c235f9160f1928a8afb0d7991a6d3430cb..db35f756b7adb6b113659ae13b08ab89
return true;
// Purpur end
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a6bf404b2 100644
index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e51f4d4ec2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -373,9 +373,12 @@ public class PurpurWorldConfig {
@@ -381,9 +381,12 @@ public class PurpurWorldConfig {
public boolean boatsDoFallDamage = true;
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesCanUsePortals = true;
@@ -409,7 +409,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -387,9 +390,12 @@ public class PurpurWorldConfig {
@@ -395,9 +398,12 @@ public class PurpurWorldConfig {
boatsDoFallDamage = getBoolean("gameplay-mechanics.boat.do-fall-damage", boatsDoFallDamage);
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
@@ -422,7 +422,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
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);
@@ -459,9 +465,11 @@ public class PurpurWorldConfig {
@@ -467,9 +473,11 @@ public class PurpurWorldConfig {
dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
}
@@ -434,7 +434,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
farmlandAlpha = getBoolean("blocks.farmland.use-alpha-farmland", farmlandAlpha);
}
@@ -493,6 +501,11 @@ public class PurpurWorldConfig {
@@ -501,6 +509,11 @@ public class PurpurWorldConfig {
kelpMaxGrowthAge = getInt("blocks.kelp.max-growth-age", kelpMaxGrowthAge);
}
@@ -446,7 +446,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
public boolean respawnAnchorExplode = true;
public double respawnAnchorExplosionPower = 5.0D;
public boolean respawnAnchorExplosionFire = true;
@@ -526,6 +539,11 @@ public class PurpurWorldConfig {
@@ -534,6 +547,11 @@ public class PurpurWorldConfig {
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
}
@@ -458,7 +458,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
public double twistingVinesGrowthModifier = 0.10D;
public int twistingVinesMaxGrowthAge = 25;
private void twistingVinesSettings() {
@@ -704,6 +722,7 @@ public class PurpurWorldConfig {
@@ -712,6 +730,7 @@ public class PurpurWorldConfig {
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
public boolean creeperAllowGriefing = true;
@@ -466,7 +466,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -715,6 +734,7 @@ public class PurpurWorldConfig {
@@ -723,6 +742,7 @@ public class PurpurWorldConfig {
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
@@ -474,7 +474,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
}
public boolean dolphinRidable = false;
@@ -802,6 +822,7 @@ public class PurpurWorldConfig {
@@ -810,6 +830,7 @@ public class PurpurWorldConfig {
public double enderDragonMaxY = 256D;
public double enderDragonMaxHealth = 200.0D;
public boolean enderDragonAlwaysDropsFullExp = false;
@@ -482,7 +482,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -817,6 +838,7 @@ public class PurpurWorldConfig {
@@ -825,6 +846,7 @@ public class PurpurWorldConfig {
}
enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
@@ -490,7 +490,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
}
public boolean endermanRidable = false;
@@ -824,6 +846,7 @@ public class PurpurWorldConfig {
@@ -832,6 +854,7 @@ public class PurpurWorldConfig {
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
@@ -498,7 +498,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -835,6 +858,7 @@ public class PurpurWorldConfig {
@@ -843,6 +866,7 @@ public class PurpurWorldConfig {
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
@@ -506,7 +506,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
}
public boolean endermiteRidable = false;
@@ -854,6 +878,7 @@ public class PurpurWorldConfig {
@@ -862,6 +886,7 @@ public class PurpurWorldConfig {
public boolean evokerRidable = false;
public boolean evokerRidableInWater = false;
public double evokerMaxHealth = 24.0D;
@@ -514,7 +514,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
private void evokerSettings() {
evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
@@ -863,6 +888,7 @@ public class PurpurWorldConfig {
@@ -871,6 +896,7 @@ public class PurpurWorldConfig {
set("mobs.evoker.attributes.max_health", oldValue);
}
evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
@@ -522,7 +522,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
}
public boolean foxRidable = false;
@@ -870,6 +896,7 @@ public class PurpurWorldConfig {
@@ -878,6 +904,7 @@ public class PurpurWorldConfig {
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
public int foxBreedingTicks = 6000;
@@ -530,7 +530,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -881,6 +908,7 @@ public class PurpurWorldConfig {
@@ -889,6 +916,7 @@ public class PurpurWorldConfig {
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks);
@@ -538,7 +538,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
}
public boolean ghastRidable = false;
@@ -1276,6 +1304,7 @@ public class PurpurWorldConfig {
@@ -1284,6 +1312,7 @@ public class PurpurWorldConfig {
public boolean piglinRidable = false;
public boolean piglinRidableInWater = false;
public double piglinMaxHealth = 16.0D;
@@ -546,7 +546,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1285,6 +1314,7 @@ public class PurpurWorldConfig {
@@ -1293,6 +1322,7 @@ public class PurpurWorldConfig {
set("mobs.piglin.attributes.max_health", oldValue);
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -554,7 +554,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
}
public boolean piglinBruteRidable = false;
@@ -1304,6 +1334,7 @@ public class PurpurWorldConfig {
@@ -1312,6 +1342,7 @@ public class PurpurWorldConfig {
public boolean pillagerRidable = false;
public boolean pillagerRidableInWater = false;
public double pillagerMaxHealth = 24.0D;
@@ -562,7 +562,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1313,6 +1344,7 @@ public class PurpurWorldConfig {
@@ -1321,6 +1352,7 @@ public class PurpurWorldConfig {
set("mobs.pillager.attributes.max_health", oldValue);
}
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -570,7 +570,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
}
public boolean polarBearRidable = false;
@@ -1354,6 +1386,7 @@ public class PurpurWorldConfig {
@@ -1362,6 +1394,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -578,7 +578,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1366,11 +1399,13 @@ public class PurpurWorldConfig {
@@ -1374,11 +1407,13 @@ public class PurpurWorldConfig {
rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks);
@@ -592,7 +592,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1380,6 +1415,7 @@ public class PurpurWorldConfig {
@@ -1388,6 +1423,7 @@ public class PurpurWorldConfig {
set("mobs.ravager.attributes.max_health", oldValue);
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -600,7 +600,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
}
public boolean salmonRidable = false;
@@ -1398,6 +1434,7 @@ public class PurpurWorldConfig {
@@ -1406,6 +1442,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
@@ -608,7 +608,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1408,6 +1445,7 @@ public class PurpurWorldConfig {
@@ -1416,6 +1453,7 @@ public class PurpurWorldConfig {
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
@@ -616,7 +616,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
}
public boolean shulkerRidable = false;
@@ -1427,6 +1465,7 @@ public class PurpurWorldConfig {
@@ -1435,6 +1473,7 @@ public class PurpurWorldConfig {
public boolean silverfishRidable = false;
public boolean silverfishRidableInWater = false;
public double silverfishMaxHealth = 8.0D;
@@ -624,7 +624,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1436,6 +1475,7 @@ public class PurpurWorldConfig {
@@ -1444,6 +1483,7 @@ public class PurpurWorldConfig {
set("mobs.silverfish.attributes.max_health", oldValue);
}
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -632,7 +632,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
}
public boolean skeletonRidable = false;
@@ -1503,6 +1543,7 @@ public class PurpurWorldConfig {
@@ -1511,6 +1551,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -640,7 +640,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1519,6 +1560,7 @@ public class PurpurWorldConfig {
@@ -1527,6 +1568,7 @@ public class PurpurWorldConfig {
snowGolemSnowBallMax = getInt("mobs.snow_golem.max-shoot-interval-ticks", snowGolemSnowBallMax);
snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
@@ -648,7 +648,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
}
public boolean squidRidable = false;
@@ -1678,6 +1720,7 @@ public class PurpurWorldConfig {
@@ -1686,6 +1728,7 @@ public class PurpurWorldConfig {
public int villagerLobotomizeCheck = 60;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -656,7 +656,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1704,6 +1747,7 @@ public class PurpurWorldConfig {
@@ -1712,6 +1755,7 @@ public class PurpurWorldConfig {
villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck);
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
@@ -664,7 +664,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
}
public boolean vindicatorRidable = false;
@@ -1760,6 +1804,7 @@ public class PurpurWorldConfig {
@@ -1768,6 +1812,7 @@ public class PurpurWorldConfig {
public double witherMaxHealth = 300.0D;
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
@@ -672,7 +672,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1776,6 +1821,7 @@ public class PurpurWorldConfig {
@@ -1784,6 +1829,7 @@ public class PurpurWorldConfig {
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
@@ -680,7 +680,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
}
public boolean witherSkeletonRidable = false;
@@ -1841,6 +1887,7 @@ public class PurpurWorldConfig {
@@ -1849,6 +1895,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD;
@@ -688,7 +688,7 @@ index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1860,6 +1907,7 @@ public class PurpurWorldConfig {
@@ -1868,6 +1915,7 @@ public class PurpurWorldConfig {
} catch (IllegalArgumentException ignore) {
zombieBreakDoorMinDifficulty = Difficulty.HARD;
}

6
patches/server/0147-Config-to-allow-Note-Block-sounds-when-blocked.patch
View File

@@ -22,10 +22,10 @@ index d3c8fd8399629efb8bcbaf7d9a0c43340fcdfeda..c74df3b5c2a25469ad3fb6a853438bbc
org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.getValue(NoteBlock.INSTRUMENT), data.getValue(NoteBlock.NOTE));
if (!event.isCancelled()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7d6ebaf7e0faa072b5343424ab9f652a6bf404b2..efdfaf989a1f51759f240d95ef425694b35f5e06 100644
index 8df99d5ccee0ff4280a720b2373407e51f4d4ec2..fd9ba48619b103071f9de669dea7d59bd2db2fee 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -376,6 +376,7 @@ public class PurpurWorldConfig {
@@ -384,6 +384,7 @@ public class PurpurWorldConfig {
public boolean entitiesPickUpLootBypassMobGriefing = false;
public boolean fireballsBypassMobGriefing = false;
public boolean milkCuresBadOmen = true;
@@ -33,7 +33,7 @@ index 7d6ebaf7e0faa072b5343424ab9f652a6bf404b2..efdfaf989a1f51759f240d95ef425694
public boolean persistentTileEntityDisplayNames = false;
public boolean persistentDroppableEntityDisplayNames = false;
public boolean projectilesBypassMobGriefing = false;
@@ -393,6 +394,7 @@ public class PurpurWorldConfig {
@@ -401,6 +402,7 @@ public class PurpurWorldConfig {
entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing);
fireballsBypassMobGriefing = getBoolean("gameplay-mechanics.fireballs-bypass-mob-griefing", fireballsBypassMobGriefing);
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);

6
patches/server/0148-Add-EntityTeleportHinderedEvent.patch
View File

@@ -78,10 +78,10 @@ index 09cbce5aec6eabfa220f7de81b492a180cb8ca1e..265770975ad1190283103b04cdd52a07
blockEntity.teleportCooldown = 100;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index efdfaf989a1f51759f240d95ef425694b35f5e06..19b162cd4d8fa4f5c996d54800e3859c88a5d900 100644
index fd9ba48619b103071f9de669dea7d59bd2db2fee..6b02ac8a7ed8e4787abf017af23936718cee8d9c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -375,6 +375,7 @@ public class PurpurWorldConfig {
@@ -383,6 +383,7 @@ public class PurpurWorldConfig {
public boolean entitiesCanUsePortals = true;
public boolean entitiesPickUpLootBypassMobGriefing = false;
public boolean fireballsBypassMobGriefing = false;
@@ -89,7 +89,7 @@ index efdfaf989a1f51759f240d95ef425694b35f5e06..19b162cd4d8fa4f5c996d54800e3859c
public boolean milkCuresBadOmen = true;
public boolean noteBlockIgnoreAbove = false;
public boolean persistentTileEntityDisplayNames = false;
@@ -393,6 +394,7 @@ public class PurpurWorldConfig {
@@ -401,6 +402,7 @@ public class PurpurWorldConfig {
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing);
fireballsBypassMobGriefing = getBoolean("gameplay-mechanics.fireballs-bypass-mob-griefing", fireballsBypassMobGriefing);

4
patches/server/0150-Farmland-trampling-changes.patch
View File

@@ -37,10 +37,10 @@ index e06a8a68ccb9c9a77df061264e58fd850cf1f794..010da2b44fa3a4f033e4f86e9a0917b5
if (CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) {
return;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 19b162cd4d8fa4f5c996d54800e3859c88a5d900..08f96bb13b0bc201a298a91c04d9fa22f0aba77f 100644
index 6b02ac8a7ed8e4787abf017af23936718cee8d9c..8eda95b6b8c71fdc2c1938304b51c626f66235bd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -472,10 +472,16 @@ public class PurpurWorldConfig {
@@ -480,10 +480,16 @@ public class PurpurWorldConfig {
public boolean farmlandBypassMobGriefing = false;
public boolean farmlandGetsMoistFromBelow = false;
public boolean farmlandAlpha = false;

4
patches/server/0151-Movement-options-for-armor-stands.patch
View File

@@ -66,10 +66,10 @@ index 796ab61f4513c02b0d55d34044d2f7084c447796..d119f8ab447bc17deabc494463de4961
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 08f96bb13b0bc201a298a91c04d9fa22f0aba77f..3135325fa86dd88f28c72b1a132939c921149eb7 100644
index 8eda95b6b8c71fdc2c1938304b51c626f66235bd..6a4170e60bf845ac33a7f65c0082617da584f99d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -102,10 +102,16 @@ public class PurpurWorldConfig {
@@ -103,10 +103,16 @@ public class PurpurWorldConfig {
public float armorstandStepHeight = 0.0F;
public boolean armorstandSetNameVisible = false;
public boolean armorstandFixNametags = false;

6
patches/server/0152-Fix-stuck-in-portals.patch
View File

@@ -37,10 +37,10 @@ index 3ad67d65990feaedbb67ed15fe50032c0fd0fdc2..3c5d34e82154c68bb5ac9472d3826962
this.isInsidePortal = true;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3135325fa86dd88f28c72b1a132939c921149eb7..b6c4f29c80ca88c977f21da69e528777f4ed7e04 100644
index 6a4170e60bf845ac33a7f65c0082617da584f99d..60ff59cfbd5e748a6899fdbee4e06d7a01eff115 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -296,6 +296,7 @@ public class PurpurWorldConfig {
@@ -297,6 +297,7 @@ public class PurpurWorldConfig {
public int playerDeathExpDropMax = 100;
public boolean teleportIfOutsideBorder = false;
public boolean totemOfUndyingWorksInInventory = false;
@@ -48,7 +48,7 @@ index 3135325fa86dd88f28c72b1a132939c921149eb7..b6c4f29c80ca88c977f21da69e528777
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -313,6 +314,7 @@ public class PurpurWorldConfig {
@@ -314,6 +315,7 @@ public class PurpurWorldConfig {
playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);

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