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

Move all config stuff to config patch

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-25 20:08:05 -05:00
parent 44e4acda63
commit 4a2d580185
146 changed files with 506 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
patches/server/0002-Purpur-config-files.patch
View File

@@ -142,7 +142,7 @@ index ca7718053a6a2eb715ea3671bd4bc15304ede420..bf31ae9f1ea08d67e7e828cff07b30a3
public void sendMessage(Component message, UUID sender) {}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 862553e98a7237d39a26036c615b9cbd001bd3bf..b5347e768a17e0771163cb73f2d5ccc0d2b50ee3 100644
index 862553e98a7237d39a26036c615b9cbd001bd3bf..d11b463548b847382a22fdf50496b186caa0c526 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -168,6 +168,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -158,7 +158,7 @@ index 862553e98a7237d39a26036c615b9cbd001bd3bf..b5347e768a17e0771163cb73f2d5ccc0
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), this.spigotConfig); // Paper
this.tuinityConfig = new com.tuinity.tuinity.config.TuinityConfig.WorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData)worlddatamutable).getLevelName()); // Tuinity - Server Config
+ this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((ServerLevel) this, ((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Purpur
+ this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((ServerLevel) this, ((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur
this.generator = gen;
this.world = new CraftWorld((ServerLevel) this, gen, env);
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
@@ -300,24 +300,48 @@ index 0000000000000000000000000000000000000000..7c5ecdbd5a05ae07a440cadf79d59a43
+}
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..b760473245a50941129b4063998e7725366db4da
index 0000000000000000000000000000000000000000..3cd897d4049323aeda85c89a73a3f50bd7b94d58
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -0,0 +1,61 @@
@@ -0,0 +1,85 @@
+package net.pl3x.purpur;
+
+import com.tuinity.tuinity.config.TuinityConfig;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.Difficulty;
+import net.minecraft.world.item.DyeColor;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.Explosion;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import org.apache.commons.lang.BooleanUtils;
+import org.bukkit.World;
+import org.bukkit.configuration.ConfigurationSection;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.logging.Level;
+
+import static net.pl3x.purpur.PurpurConfig.log;
+
+public class PurpurWorldConfig {
+
+ private final ServerLevel level;
+ private final String worldName;
+ public PurpurWorldConfig(ServerLevel level, String worldName) {
+ private final World.Environment environment;
+
+ public PurpurWorldConfig(ServerLevel level, String worldName, World.Environment environment) {
+ this.level = level;
+ this.worldName = worldName;
+ this.environment = environment;
+ init();
+ }
+

4
patches/server/0003-Ridables.patch
View File

@@ -4540,10 +4540,10 @@ index 7c5ecdbd5a05ae07a440cadf79d59a439e4db524..bd0807e5647ad4745fa585bf7e6c8532
+ }
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b760473245a50941129b4063998e7725366db4da..8699631fecc1bcaa943514a012ea042a3c425af5 100644
index 3cd897d4049323aeda85c89a73a3f50bd7b94d58..69f63641f5a2ae3e1579d3171bcb1c5e5b39b969 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -58,4 +58,532 @@ public class PurpurWorldConfig {
@@ -82,4 +82,532 @@ public class PurpurWorldConfig {
PurpurConfig.config.addDefault("world-settings.default." + path, def);
return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
}

19
patches/server/0004-Configurable-entity-base-attributes.patch
View File

@@ -1417,21 +1417,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 8699631fecc1bcaa943514a012ea042a3c425af5..70afdc5bd924e3a3e812d4029887da1208526cae 100644
index 69f63641f5a2ae3e1579d3171bcb1c5e5b39b969..36cbaefea53a60c4a7176bf699c03e7cac338976 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -2,7 +2,10 @@ package net.pl3x.purpur;
import net.minecraft.server.level.ServerLevel;
import org.bukkit.configuration.ConfigurationSection;
+
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import static net.pl3x.purpur.PurpurConfig.log;
public class PurpurWorldConfig {
@@ -69,257 +72,573 @@ public class PurpurWorldConfig {
@@ -93,257 +93,573 @@ public class PurpurWorldConfig {
}
public boolean axolotlRidable = false;
@@ -2005,7 +1994,7 @@ index 8699631fecc1bcaa943514a012ea042a3c425af5..70afdc5bd924e3a3e812d4029887da12
}
public boolean phantomRidable = false;
@@ -328,6 +647,7 @@ public class PurpurWorldConfig {
@@ -352,6 +668,7 @@ public class PurpurWorldConfig {
public float phantomFlameDamage = 1.0F;
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
@@ -2013,7 +2002,7 @@ index 8699631fecc1bcaa943514a012ea042a3c425af5..70afdc5bd924e3a3e812d4029887da12
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -335,255 +655,559 @@ public class PurpurWorldConfig {
@@ -359,255 +676,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);

4
patches/server/0009-AFK-API.patch
View File

@@ -198,10 +198,10 @@ index 409948bf86d7b3a30106598cf9ee3cdff05b928d..3efc51e347ae0d5224eae4727867eaf1
public static String timingsUrl = "https://timings.pl3x.net";
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 70afdc5bd924e3a3e812d4029887da1208526cae..608c2f3daaebcf48990ab513f1b765cb3a19b1ec 100644
index 36cbaefea53a60c4a7176bf699c03e7cac338976..1b3ab9fd6a6d094d559e18a1d119e651c411a11e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -62,6 +62,17 @@ public class PurpurWorldConfig {
@@ -83,6 +83,17 @@ public class PurpurWorldConfig {
return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
}

4
patches/server/0017-Player-invulnerabilities.patch
View File

@@ -90,10 +90,10 @@ index d65ca67bb0d46ecd8a4003e44cfec71661679480..51ef325fab982c2fd8a7eb3d7e73cbfd
return entityplayer1;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 608c2f3daaebcf48990ab513f1b765cb3a19b1ec..11866148ebd3ad94af2092eba314082f2a98759c 100644
index 1b3ab9fd6a6d094d559e18a1d119e651c411a11e..2d42f36e9f1ce6bf064588d84ed7ae52563f0e7a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -66,11 +66,15 @@ public class PurpurWorldConfig {
@@ -87,11 +87,15 @@ public class PurpurWorldConfig {
public boolean idleTimeoutTickNearbyEntities = true;
public boolean idleTimeoutCountAsSleeping = false;
public boolean idleTimeoutUpdateTabList = false;

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

@@ -36,10 +36,10 @@ index 07686c678cd47defd9e0b742a71fd13e83142870..bd6a707962ac4d3961e1ce74570909e2
this.level.getProfiler().pop();
if (this.assignProfessionWhenSpawned) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 11866148ebd3ad94af2092eba314082f2a98759c..b81cd054e385643f76b0b4c0b4aaf26ca75e7974 100644
index 2d42f36e9f1ce6bf064588d84ed7ae52563f0e7a..65ca6e4a1c99555842804e5e21415d5f3193d526 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1038,6 +1038,8 @@ public class PurpurWorldConfig {
@@ -1059,6 +1059,8 @@ public class PurpurWorldConfig {
public boolean villagerRidable = false;
public boolean villagerRidableInWater = false;
public double villagerMaxHealth = 20.0D;
@@ -48,7 +48,7 @@ index 11866148ebd3ad94af2092eba314082f2a98759c..b81cd054e385643f76b0b4c0b4aaf26c
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1047,6 +1049,8 @@ public class PurpurWorldConfig {
@@ -1068,6 +1070,8 @@ public class PurpurWorldConfig {
set("mobs.villager.attributes.max_health", oldValue);
}
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);

18
patches/server/0021-Silk-touch-spawners.patch
View File

@@ -130,24 +130,10 @@ index b1e04d41de80971a7a1616beb0860226ecc25045..a42375b6789bb0a386103ad826879032
public void spawnAfterBreak(BlockState state, ServerLevel world, BlockPos pos, ItemStack stack) {
super.spawnAfterBreak(state, world, pos, stack);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b81cd054e385643f76b0b4c0b4aaf26ca75e7974..7cd4106d1db45d2b7cd7f08c55804fb6f5e78cdd 100644
index 65ca6e4a1c99555842804e5e21415d5f3193d526..6db6885ac937fb62755a2f0ef679ff8f88034a35 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,8 +1,13 @@
package net.pl3x.purpur;
import net.minecraft.server.level.ServerLevel;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.Items;
import org.bukkit.configuration.ConfigurationSection;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -77,6 +82,29 @@ public class PurpurWorldConfig {
@@ -98,6 +98,29 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}

6
patches/server/0022-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 7cd4106d1db45d2b7cd7f08c55804fb6f5e78cdd..271d0f1ff56fd13d2134d5213952de5bd0f10b4b 100644
index 6db6885ac937fb62755a2f0ef679ff8f88034a35..f6adc7530c2922282689413572fa6e44cab860ce 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1036,7 +1036,10 @@ public class PurpurWorldConfig {
@@ -1052,7 +1052,10 @@ public class PurpurWorldConfig {
public boolean turtleRidable = false;
public boolean turtleRidableInWater = false;
public double turtleMaxHealth = 30.0D;
@@ -65,7 +65,7 @@ index 7cd4106d1db45d2b7cd7f08c55804fb6f5e78cdd..271d0f1ff56fd13d2134d5213952de5b
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1045,6 +1048,9 @@ public class PurpurWorldConfig {
@@ -1061,6 +1064,9 @@ public class PurpurWorldConfig {
set("mobs.turtle.attributes.max_health", oldValue);
}
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);

6
patches/server/0026-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 271d0f1ff56fd13d2134d5213952de5bd0f10b4b..9e690ab6304a5aeb07ca98aa217c6bb588e72a4d 100644
index f6adc7530c2922282689413572fa6e44cab860ce..de6247368af121fcc3e44e8fa75043774cd224f0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -425,6 +425,10 @@ public class PurpurWorldConfig {
@@ -441,6 +441,10 @@ public class PurpurWorldConfig {
public double giantMovementSpeed = 0.5D;
public double giantAttackDamage = 50.0D;
public double giantMaxHealth = 100.0D;
@@ -134,7 +134,7 @@ index 271d0f1ff56fd13d2134d5213952de5bd0f10b4b..9e690ab6304a5aeb07ca98aa217c6bb5
private void giantSettings() {
giantRidable = getBoolean("mobs.giant.ridable", giantRidable);
giantRidableInWater = getBoolean("mobs.giant.ridable-in-water", giantRidableInWater);
@@ -440,6 +444,10 @@ public class PurpurWorldConfig {
@@ -456,6 +460,10 @@ public class PurpurWorldConfig {
set("mobs.giant.attributes.max_health", oldValue);
}
giantMaxHealth = getDouble("mobs.giant.attributes.max_health", giantMaxHealth);

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

@@ -42,10 +42,10 @@ index 004bdf930769974ed02c68b8939af8e96bad88a7..39402063a73fbdbefdbcd7b4f7ea675c
LightningBolt entitylightning = (LightningBolt) EntityType.LIGHTNING_BOLT.create((net.minecraft.world.level.Level) this);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9e690ab6304a5aeb07ca98aa217c6bb588e72a4d..9e46b2a6e8ec7da40bce1cd010593f2c96b6f44a 100644
index de6247368af121fcc3e44e8fa75043774cd224f0..a91a5c4d2d2eb639c80c91bdacbe0a25cc5225ed 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1223,6 +1223,7 @@ public class PurpurWorldConfig {
@@ -1239,6 +1239,7 @@ public class PurpurWorldConfig {
public double zombieHorseJumpStrengthMax = 1.0D;
public double zombieHorseMovementSpeedMin = 0.2D;
public double zombieHorseMovementSpeedMax = 0.2D;
@@ -53,7 +53,7 @@ index 9e690ab6304a5aeb07ca98aa217c6bb588e72a4d..9e46b2a6e8ec7da40bce1cd010593f2c
private void zombieHorseSettings() {
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
@@ -1238,6 +1239,7 @@ public class PurpurWorldConfig {
@@ -1254,6 +1255,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/0028-Charged-creeper-naturally-spawn.patch
View File

@@ -24,10 +24,10 @@ index b71a6af3c2d1ca2a946b23efb11b0e794840cf25..b2b3630a90c685b0a692efb9bf8bb111
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9e46b2a6e8ec7da40bce1cd010593f2c96b6f44a..fa0ff30f15931e63a1daa36fafc8bed103686a8c 100644
index a91a5c4d2d2eb639c80c91bdacbe0a25cc5225ed..c7a844bb8111dae7c9502ae2cf1660816d3a83f8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -247,6 +247,7 @@ public class PurpurWorldConfig {
@@ -263,6 +263,7 @@ public class PurpurWorldConfig {
public boolean creeperRidable = false;
public boolean creeperRidableInWater = false;
public double creeperMaxHealth = 20.0D;
@@ -35,7 +35,7 @@ index 9e46b2a6e8ec7da40bce1cd010593f2c96b6f44a..fa0ff30f15931e63a1daa36fafc8bed1
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -256,6 +257,7 @@ public class PurpurWorldConfig {
@@ -272,6 +273,7 @@ public class PurpurWorldConfig {
set("mobs.creeper.attributes.max_health", oldValue);
}
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);

6
patches/server/0029-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 fa0ff30f15931e63a1daa36fafc8bed103686a8c..40ee3268f4e050846bdedea1181f3076cb595a0e 100644
index c7a844bb8111dae7c9502ae2cf1660816d3a83f8..08bfa6591548259906f0e7c82046826aafe6bb33 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -801,6 +801,8 @@ public class PurpurWorldConfig {
@@ -817,6 +817,8 @@ public class PurpurWorldConfig {
public boolean rabbitRidable = false;
public boolean rabbitRidableInWater = false;
public double rabbitMaxHealth = 3.0D;
@@ -50,7 +50,7 @@ index fa0ff30f15931e63a1daa36fafc8bed103686a8c..40ee3268f4e050846bdedea1181f3076
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -810,6 +812,8 @@ public class PurpurWorldConfig {
@@ -826,6 +828,8 @@ public class PurpurWorldConfig {
set("mobs.rabbit.attributes.max_health", oldValue);
}
rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth);

6
patches/server/0032-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 40ee3268f4e050846bdedea1181f3076cb595a0e..cdf0357c2941511a6606e0dd0cb8f27d3a0e4b53 100644
index 08bfa6591548259906f0e7c82046826aafe6bb33..9699eb702324e40429510ecc97d0079c7a3b3ae0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -395,6 +395,7 @@ public class PurpurWorldConfig {
@@ -411,6 +411,7 @@ public class PurpurWorldConfig {
public boolean foxRidable = false;
public boolean foxRidableInWater = false;
public double foxMaxHealth = 10.0D;
@@ -86,7 +86,7 @@ index 40ee3268f4e050846bdedea1181f3076cb595a0e..cdf0357c2941511a6606e0dd0cb8f27d
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -404,6 +405,7 @@ public class PurpurWorldConfig {
@@ -420,6 +421,7 @@ public class PurpurWorldConfig {
set("mobs.fox.attributes.max_health", oldValue);
}
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);

6
patches/server/0033-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 cdf0357c2941511a6606e0dd0cb8f27d3a0e4b53..8e3c1ed3dd273ec8da0f89bd3417f2fd3f4fdc2a 100644
index 9699eb702324e40429510ecc97d0079c7a3b3ae0..402d11d29369ce2725cb9a8013ffdabbaf79297d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -777,6 +777,8 @@ public class PurpurWorldConfig {
@@ -793,6 +793,8 @@ public class PurpurWorldConfig {
public boolean polarBearRidable = false;
public boolean polarBearRidableInWater = false;
public double polarBearMaxHealth = 30.0D;
@@ -71,7 +71,7 @@ index cdf0357c2941511a6606e0dd0cb8f27d3a0e4b53..8e3c1ed3dd273ec8da0f89bd3417f2fd
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -786,6 +788,9 @@ public class PurpurWorldConfig {
@@ -802,6 +804,9 @@ public class PurpurWorldConfig {
set("mobs.polar_bear.attributes.max_health", oldValue);
}
polarBearMaxHealth = getDouble("mobs.polar_bear.attributes.max_health", polarBearMaxHealth);

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

@@ -51,10 +51,10 @@ index 55dccf338f9fba17fbcb88672d36b83e7bbec88b..eaec6eba96db3b8ce046208a4a1e5fc4
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8e3c1ed3dd273ec8da0f89bd3417f2fd3f4fdc2a..a2029fb5700f208929b88747453cca64d85173f6 100644
index 402d11d29369ce2725cb9a8013ffdabbaf79297d..631b7dccb648fdb12b7e7232403cac47b90d9125 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -207,6 +207,7 @@ public class PurpurWorldConfig {
@@ -223,6 +223,7 @@ public class PurpurWorldConfig {
public boolean chickenRidable = false;
public boolean chickenRidableInWater = false;
public double chickenMaxHealth = 4.0D;
@@ -62,7 +62,7 @@ index 8e3c1ed3dd273ec8da0f89bd3417f2fd3f4fdc2a..a2029fb5700f208929b88747453cca64
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -216,6 +217,7 @@ public class PurpurWorldConfig {
@@ -232,6 +233,7 @@ public class PurpurWorldConfig {
set("mobs.chicken.attributes.max_health", oldValue);
}
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);

4
patches/server/0035-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 a2029fb5700f208929b88747453cca64d85173f6..6ca36b4637fbef94e61a5f14c0c7059e1ee39278 100644
index 631b7dccb648fdb12b7e7232403cac47b90d9125..41e3342f37c2b55655b01281c6411ec6dc94f336 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -67,6 +67,11 @@ public class PurpurWorldConfig {
@@ -83,6 +83,11 @@ public class PurpurWorldConfig {
return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
}

6
patches/server/0036-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 6ca36b4637fbef94e61a5f14c0c7059e1ee39278..db90479d1d84ffaa5bd348d90c813696c02bbb8d 100644
index 41e3342f37c2b55655b01281c6411ec6dc94f336..eb3d47f97c1dddd809f79cd98017edd810f1671d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -184,6 +184,9 @@ public class PurpurWorldConfig {
@@ -200,6 +200,9 @@ public class PurpurWorldConfig {
public boolean catRidable = false;
public boolean catRidableInWater = false;
public double catMaxHealth = 10.0D;
@@ -62,7 +62,7 @@ index 6ca36b4637fbef94e61a5f14c0c7059e1ee39278..db90479d1d84ffaa5bd348d90c813696
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -193,6 +196,9 @@ public class PurpurWorldConfig {
@@ -209,6 +212,9 @@ public class PurpurWorldConfig {
set("mobs.cat.attributes.max_health", oldValue);
}
catMaxHealth = getDouble("mobs.cat.attributes.max_health", catMaxHealth);

6
patches/server/0038-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 db90479d1d84ffaa5bd348d90c813696c02bbb8d..35e9a071e76d130e2550391cfc41c4e9959949e4 100644
index eb3d47f97c1dddd809f79cd98017edd810f1671d..b85daa6b78e5bc34c5fbee25495ce4e498971fc3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -246,6 +246,7 @@ public class PurpurWorldConfig {
@@ -262,6 +262,7 @@ public class PurpurWorldConfig {
public boolean cowRidable = false;
public boolean cowRidableInWater = false;
public double cowMaxHealth = 10.0D;
@@ -125,7 +125,7 @@ index db90479d1d84ffaa5bd348d90c813696c02bbb8d..35e9a071e76d130e2550391cfc41c4e9
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -255,6 +256,7 @@ public class PurpurWorldConfig {
@@ -271,6 +272,7 @@ public class PurpurWorldConfig {
set("mobs.cow.attributes.max_health", oldValue);
}
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);

6
patches/server/0040-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 35e9a071e76d130e2550391cfc41c4e9959949e4..ccf98f04240b563c1ebfca21d3baa8e3d30f887d 100644
index b85daa6b78e5bc34c5fbee25495ce4e498971fc3..63ec9aee12ccfa08852fe9793008dec984147cd2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -736,6 +736,7 @@ public class PurpurWorldConfig {
@@ -752,6 +752,7 @@ public class PurpurWorldConfig {
public boolean pigRidable = false;
public boolean pigRidableInWater = false;
public double pigMaxHealth = 10.0D;
@@ -39,7 +39,7 @@ index 35e9a071e76d130e2550391cfc41c4e9959949e4..ccf98f04240b563c1ebfca21d3baa8e3
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -745,6 +746,7 @@ public class PurpurWorldConfig {
@@ -761,6 +762,7 @@ public class PurpurWorldConfig {
set("mobs.pig.attributes.max_health", oldValue);
}
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);

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

@@ -32,10 +32,10 @@ index 7fbe1a62e9c67a8bdaf13aaa9fae1d8742d75148..0733f9c057fef17fd79a4769f19b78f4
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ccf98f04240b563c1ebfca21d3baa8e3d30f887d..bba25fff203fe3169293d9965b5226a672bacb28 100644
index 63ec9aee12ccfa08852fe9793008dec984147cd2..f3dc9f8d7afda7d8bcbf42c7a36a7e06ab4e4afc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -967,6 +967,8 @@ public class PurpurWorldConfig {
@@ -983,6 +983,8 @@ public class PurpurWorldConfig {
public boolean snowGolemRidableInWater = false;
public boolean snowGolemLeaveTrailWhenRidden = false;
public double snowGolemMaxHealth = 4.0D;
@@ -44,7 +44,7 @@ index ccf98f04240b563c1ebfca21d3baa8e3d30f887d..bba25fff203fe3169293d9965b5226a6
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -977,6 +979,8 @@ public class PurpurWorldConfig {
@@ -993,6 +995,8 @@ public class PurpurWorldConfig {
set("mobs.snow_golem.attributes.max_health", oldValue);
}
snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);

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

@@ -18,10 +18,10 @@ index 177c5b385613ac08a75500013326874ff31a1992..a70c631691512a633c7fe4df9e9f2881
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index bba25fff203fe3169293d9965b5226a672bacb28..2553712a4488b3eb8179ea5c25852534e4129f26 100644
index f3dc9f8d7afda7d8bcbf42c7a36a7e06ab4e4afc..91290c9c2da64a5f3e7db69aaa440f02f6e0645f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -349,6 +349,7 @@ public class PurpurWorldConfig {
@@ -365,6 +365,7 @@ public class PurpurWorldConfig {
public boolean enderDragonRidableInWater = false;
public double enderDragonMaxY = 256D;
public double enderDragonMaxHealth = 200.0D;
@@ -29,7 +29,7 @@ index bba25fff203fe3169293d9965b5226a672bacb28..2553712a4488b3eb8179ea5c25852534
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -363,6 +364,7 @@ public class PurpurWorldConfig {
@@ -379,6 +380,7 @@ public class PurpurWorldConfig {
set("mobs.ender_dragon.attributes.max_health", oldValue);
}
enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);

4
patches/server/0043-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 2553712a4488b3eb8179ea5c25852534e4129f26..925d50b1b1e83dda6f06e26c9fac3dc82c72b1da 100644
index 91290c9c2da64a5f3e7db69aaa440f02f6e0645f..8ea74cf6b3369cc1de566862f894ac3676643c93 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -110,6 +110,11 @@ public class PurpurWorldConfig {
@@ -126,6 +126,11 @@ public class PurpurWorldConfig {
});
}

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

@@ -68,10 +68,10 @@ index 9b5d11ece006d7aa893360a84ba652c666517ac1..2519e8946064a2326ef9acde1e66d067
@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 925d50b1b1e83dda6f06e26c9fac3dc82c72b1da..d8de869f820d49bebd8facad96d127504b16c2fe 100644
index 8ea74cf6b3369cc1de566862f894ac3676643c93..dfe45b8bc6d96967c2cb1580810f60ffbc1449a4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -110,8 +110,10 @@ public class PurpurWorldConfig {
@@ -126,8 +126,10 @@ public class PurpurWorldConfig {
});
}

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

@@ -42,10 +42,10 @@ index a242a80b16c7d074d52a52728646224b1a0091d4..5d9d77cb382c8075af2713a0ce26c28a
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d8de869f820d49bebd8facad96d127504b16c2fe..0edacc1fd38f9552701563f61f2879b378521e02 100644
index dfe45b8bc6d96967c2cb1580810f60ffbc1449a4..89d090233a42f7d53bcd6376a5a4b0eb2f592952 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -110,6 +110,11 @@ public class PurpurWorldConfig {
@@ -126,6 +126,11 @@ public class PurpurWorldConfig {
});
}

13
patches/server/0046-Minecart-settings-and-WASD-controls.patch
View File

@@ -148,19 +148,10 @@ index 04d5ef90cd4171f9360017ac0c01ce48ae6ec983..7538262e14c86e4da9cd4cb887b76f64
protected final float explosionResistance;
protected final boolean isRandomlyTicking;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0edacc1fd38f9552701563f61f2879b378521e02..dfcb9e6109f30ec3c5c828dc705a06f1a6479917 100644
index 89d090233a42f7d53bcd6376a5a4b0eb2f592952..95d03cb21bdedf595df8aee46ff1ace6323b6a67 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -5,6 +5,8 @@ import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
import org.bukkit.configuration.ConfigurationSection;
import java.util.ArrayList;
@@ -72,6 +74,68 @@ public class PurpurWorldConfig {
@@ -88,6 +88,68 @@ public class PurpurWorldConfig {
armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
}

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

@@ -20,10 +20,10 @@ index 28d5fc868498a4a6746b9defa1c06da27a4aa495..5b25fc620161053e1f3811dbdd7fac01
// CraftBukkit start - Call death event
org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index dfcb9e6109f30ec3c5c828dc705a06f1a6479917..9e94fa19b81d40ddc770468a9ce2397f0698542c 100644
index 95d03cb21bdedf595df8aee46ff1ace6323b6a67..42d9181991d83d44c5bf56960f8c6005353eba91 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -174,6 +174,11 @@ public class PurpurWorldConfig {
@@ -188,6 +188,11 @@ public class PurpurWorldConfig {
});
}

4
patches/server/0049-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 9e94fa19b81d40ddc770468a9ce2397f0698542c..3a3a5569af14d128f4e812af121f7e9d6f69873c 100644
index 42d9181991d83d44c5bf56960f8c6005353eba91..6a640a0e8db52d0b7c3142d331a172fe1239ba2a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -175,8 +175,10 @@ public class PurpurWorldConfig {
@@ -189,8 +189,10 @@ public class PurpurWorldConfig {
}
public boolean disableDropsOnCrammingDeath = false;

6
patches/server/0054-Add-wither-skeleton-takes-wither-damage-option.patch
View File

@@ -17,10 +17,10 @@ index 8212ee2cc1242c0a3626f3643c455f3be0de18c2..aaf6f43c0f37a51a7b2db57b8da43365
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3a3a5569af14d128f4e812af121f7e9d6f69873c..a11816a409bbbed1925cf4b9852fb19957d49e9f 100644
index 6a640a0e8db52d0b7c3142d331a172fe1239ba2a..cf43d434eb808ad80a4b97c9d94210047a02dce3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1279,6 +1279,7 @@ public class PurpurWorldConfig {
@@ -1293,6 +1293,7 @@ public class PurpurWorldConfig {
public boolean witherSkeletonRidable = false;
public boolean witherSkeletonRidableInWater = false;
public double witherSkeletonMaxHealth = 20.0D;
@@ -28,7 +28,7 @@ index 3a3a5569af14d128f4e812af121f7e9d6f69873c..a11816a409bbbed1925cf4b9852fb199
private void witherSkeletonSettings() {
witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable);
witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater);
@@ -1288,6 +1289,7 @@ public class PurpurWorldConfig {
@@ -1302,6 +1303,7 @@ public class PurpurWorldConfig {
set("mobs.wither_skeleton.attributes.max_health", oldValue);
}
witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth);

4
patches/server/0056-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 a11816a409bbbed1925cf4b9852fb19957d49e9f..91ffc2462433477f4a7d9a200db2455759a2b48b 100644
index cf43d434eb808ad80a4b97c9d94210047a02dce3..cd9e1583c5ee1d540992787d04134282b99e050b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -176,9 +176,11 @@ public class PurpurWorldConfig {
@@ -190,9 +190,11 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean milkCuresBadOmen = true;

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

@@ -38,10 +38,10 @@ index b061ecc42122ef66fbf87fe017023abca5728a01..6e0b5fbf5b0d216b6b7c647d45ef37cd
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 91ffc2462433477f4a7d9a200db2455759a2b48b..6ed0c49462280d48346fe358235175c02c9edce6 100644
index cd9e1583c5ee1d540992787d04134282b99e050b..9caf2bc24e27bb652612a01d726034f53f4c7fea 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -348,6 +348,7 @@ public class PurpurWorldConfig {
@@ -362,6 +362,7 @@ public class PurpurWorldConfig {
public boolean creeperRidableInWater = false;
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
@@ -49,7 +49,7 @@ index 91ffc2462433477f4a7d9a200db2455759a2b48b..6ed0c49462280d48346fe358235175c0
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -358,6 +359,7 @@ public class PurpurWorldConfig {
@@ -372,6 +373,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 91ffc2462433477f4a7d9a200db2455759a2b48b..6ed0c49462280d48346fe358235175c0
}
public boolean dolphinRidable = false;
@@ -455,6 +457,7 @@ public class PurpurWorldConfig {
@@ -469,6 +471,7 @@ public class PurpurWorldConfig {
public boolean endermanRidable = false;
public boolean endermanRidableInWater = false;
public double endermanMaxHealth = 40.0D;
@@ -65,7 +65,7 @@ index 91ffc2462433477f4a7d9a200db2455759a2b48b..6ed0c49462280d48346fe358235175c0
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -464,6 +467,7 @@ public class PurpurWorldConfig {
@@ -478,6 +481,7 @@ public class PurpurWorldConfig {
set("mobs.enderman.attributes.max_health", oldValue);
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);

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

@@ -41,10 +41,10 @@ index d2588a91b55aebdecf8e1644498111ccf84a9dc9..393061e13375bf7a7ee57973b4abac83
this.goalSelector.addGoal(8, new WaterAvoidingRandomStrollGoal(this, 0.35D));
this.goalSelector.addGoal(9, new InteractGoal(this, Player.class, 3.0F, 1.0F));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6ed0c49462280d48346fe358235175c02c9edce6..c3037cc2400160a2bd61fbb9d3dbf5c6f068738b 100644
index 9caf2bc24e27bb652612a01d726034f53f4c7fea..0cf3001606f00d0dde9b4ed28a417a557845ec2b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1207,6 +1207,7 @@ public class PurpurWorldConfig {
@@ -1221,6 +1221,7 @@ public class PurpurWorldConfig {
public double villagerMaxHealth = 20.0D;
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
@@ -52,7 +52,7 @@ index 6ed0c49462280d48346fe358235175c02c9edce6..c3037cc2400160a2bd61fbb9d3dbf5c6
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1218,6 +1219,7 @@ public class PurpurWorldConfig {
@@ -1232,6 +1233,7 @@ public class PurpurWorldConfig {
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
@@ -60,7 +60,7 @@ index 6ed0c49462280d48346fe358235175c02c9edce6..c3037cc2400160a2bd61fbb9d3dbf5c6
}
public boolean vindicatorRidable = false;
@@ -1237,6 +1239,7 @@ public class PurpurWorldConfig {
@@ -1251,6 +1253,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderRidable = false;
public boolean wanderingTraderRidableInWater = false;
public double wanderingTraderMaxHealth = 20.0D;
@@ -68,7 +68,7 @@ index 6ed0c49462280d48346fe358235175c02c9edce6..c3037cc2400160a2bd61fbb9d3dbf5c6
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1246,6 +1249,7 @@ public class PurpurWorldConfig {
@@ -1260,6 +1263,7 @@ public class PurpurWorldConfig {
set("mobs.wandering_trader.attributes.max_health", oldValue);
}
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);

10
patches/server/0059-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 c3037cc2400160a2bd61fbb9d3dbf5c6f068738b..af5cc5812ca32d641b57d0889bdc9ff1265919b9 100644
index 0cf3001606f00d0dde9b4ed28a417a557845ec2b..4730feffdfd7fc2cbd9b67c6c39eb54700cac1f4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1208,6 +1208,7 @@ public class PurpurWorldConfig {
@@ -1222,6 +1222,7 @@ public class PurpurWorldConfig {
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
public boolean villagerFollowEmeraldBlock = false;
@@ -60,7 +60,7 @@ index c3037cc2400160a2bd61fbb9d3dbf5c6f068738b..af5cc5812ca32d641b57d0889bdc9ff1
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1220,6 +1221,7 @@ public class PurpurWorldConfig {
@@ -1234,6 +1235,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 c3037cc2400160a2bd61fbb9d3dbf5c6f068738b..af5cc5812ca32d641b57d0889bdc9ff1
}
public boolean vindicatorRidable = false;
@@ -1240,6 +1242,7 @@ public class PurpurWorldConfig {
@@ -1254,6 +1256,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderRidableInWater = false;
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
@@ -76,7 +76,7 @@ index c3037cc2400160a2bd61fbb9d3dbf5c6f068738b..af5cc5812ca32d641b57d0889bdc9ff1
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1250,6 +1253,7 @@ public class PurpurWorldConfig {
@@ -1264,6 +1267,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/0060-Implement-configurable-search-radius-for-villagers-t.patch
View File

@@ -18,10 +18,10 @@ index 52a592e569d020dca45916be7b5fad28c9d480de..5e100dbdbd6cfb4aa34b0d6b1ce09138
for (int i = 0; i < 10; ++i) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index af5cc5812ca32d641b57d0889bdc9ff1265919b9..131999b8d456e12a21a995f1cef211816a679d23 100644
index 4730feffdfd7fc2cbd9b67c6c39eb54700cac1f4..b0b4a47ddaaf010466ef771bedd217571eb444d2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1209,6 +1209,8 @@ public class PurpurWorldConfig {
@@ -1223,6 +1223,8 @@ public class PurpurWorldConfig {
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
@@ -30,7 +30,7 @@ index af5cc5812ca32d641b57d0889bdc9ff1265919b9..131999b8d456e12a21a995f1cef21181
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1222,6 +1224,8 @@ public class PurpurWorldConfig {
@@ -1236,6 +1238,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/0061-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 131999b8d456e12a21a995f1cef211816a679d23..8e408a7636c7b1fde8d8cb331b0bf776781bd4d9 100644
index b0b4a47ddaaf010466ef771bedd217571eb444d2..bb33cc21ba25ed4f42bb1f3965440ac16d8c4708 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -188,6 +188,13 @@ public class PurpurWorldConfig {
@@ -202,6 +202,13 @@ public class PurpurWorldConfig {
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
}

4
patches/server/0062-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 8e408a7636c7b1fde8d8cb331b0bf776781bd4d9..587192b0509d5ea0724ed09eefb0e98e0a155e09 100644
index bb33cc21ba25ed4f42bb1f3965440ac16d8c4708..2a2803a8c31f7779bd3bfd666885b8e8bbfc838b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -190,9 +190,13 @@ public class PurpurWorldConfig {
@@ -204,9 +204,13 @@ public class PurpurWorldConfig {
public boolean lavaInfinite = false;
public int lavaInfiniteRequiredSources = 2;

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

@@ -40,10 +40,10 @@ index e0544699714fd4c6ef2deb17f49b8246a7021463..3dc2ebc102fe3f575eede672509f3302
return 0;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 587192b0509d5ea0724ed09eefb0e98e0a155e09..39a06008f0947808d2b0f3be6cf0f04a97ed99b0 100644
index 2a2803a8c31f7779bd3bfd666885b8e8bbfc838b..7b3f7ef0df0d0c79c9d133632c57607fa4f3a494 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -142,6 +142,8 @@ public class PurpurWorldConfig {
@@ -156,6 +156,8 @@ public class PurpurWorldConfig {
public boolean idleTimeoutUpdateTabList = false;
public int playerSpawnInvulnerableTicks = 60;
public boolean playerInvulnerableWhileAcceptingResourcePack = false;
@@ -52,7 +52,7 @@ index 587192b0509d5ea0724ed09eefb0e98e0a155e09..39a06008f0947808d2b0f3be6cf0f04a
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -149,6 +151,8 @@ public class PurpurWorldConfig {
@@ -163,6 +165,8 @@ public class PurpurWorldConfig {
idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
playerSpawnInvulnerableTicks = getInt("gameplay-mechanics.player.spawn-invulnerable-ticks", playerSpawnInvulnerableTicks);
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);

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

@@ -31,10 +31,10 @@ index 54bc16b6971259f6083ca530d4109909c86a3e1e..b4640aa8fe8a37a6f27a626862b68b63
protected void updateSwingTime() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 39a06008f0947808d2b0f3be6cf0f04a97ed99b0..bfdb8ea6b6c687b3a10fdc988d630e583713977f 100644
index 7b3f7ef0df0d0c79c9d133632c57607fa4f3a494..6c3fd4120ec84ed00019f765b1ad12b6704292f9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -181,10 +181,14 @@ public class PurpurWorldConfig {
@@ -195,10 +195,14 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean milkCuresBadOmen = true;
public double tridentLoyaltyVoidReturnHeight = 0.0D;

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

@@ -43,10 +43,10 @@ index aab4a63e61aced51b1b6c885fd8b8426a4f14408..ad095c6bc7e00d286c83e37f84d8ed5d
// CraftBukkit start
Level world = pointer.getLevel();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index bfdb8ea6b6c687b3a10fdc988d630e583713977f..b568f01d929718a61bd8e49adbcb9f5ef5bd5dce 100644
index 6c3fd4120ec84ed00019f765b1ad12b6704292f9..9a3fbdfe9f1c963e5df95aded7082ad7f57bb966 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -191,6 +191,11 @@ public class PurpurWorldConfig {
@@ -205,6 +205,11 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

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

@@ -17,10 +17,10 @@ index aa7c022c4faade23bd9061311d4152cf845d3331..d4a19fc38027717e43353bc62ef23e56
} else {
return Boat.Status.IN_AIR;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b568f01d929718a61bd8e49adbcb9f5ef5bd5dce..baccb96be4654f595ae27913588bb69b39092627 100644
index 9a3fbdfe9f1c963e5df95aded7082ad7f57bb966..89be7d21dd0cfea24fa1f4bebf7ffd42d1c910f2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -178,12 +178,14 @@ public class PurpurWorldConfig {
@@ -192,12 +192,14 @@ public class PurpurWorldConfig {
});
}

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

@@ -73,10 +73,10 @@ index e246bf034a86deba5a15e7c639f5e08213fe7eee..585b29a214d0306ac2d6a170125270c1
Entry<EquipmentSlot, ItemStack> entry = getRandomItemWith(enchantment, entityliving);
return entry != null ? entry.getValue() : ItemStack.EMPTY;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index baccb96be4654f595ae27913588bb69b39092627..84a77fc5ee29bbd8cbc72367d5d20fa1a864f128 100644
index 89be7d21dd0cfea24fa1f4bebf7ffd42d1c910f2..f3408e38ab06c60f3369b5795bed6d9efd53fe0f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -178,6 +178,7 @@ public class PurpurWorldConfig {
@@ -192,6 +192,7 @@ public class PurpurWorldConfig {
});
}
@@ -84,7 +84,7 @@ index baccb96be4654f595ae27913588bb69b39092627..84a77fc5ee29bbd8cbc72367d5d20fa1
public boolean boatEjectPlayersOnLand = false;
public boolean disableDropsOnCrammingDeath = false;
public boolean milkCuresBadOmen = true;
@@ -185,6 +186,7 @@ public class PurpurWorldConfig {
@@ -199,6 +200,7 @@ public class PurpurWorldConfig {
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
private void miscGameplayMechanicsSettings() {

4
patches/server/0070-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 84a77fc5ee29bbd8cbc72367d5d20fa1a864f128..41abe076b82aa3f37cfff1d35e6ce79e57e53183 100644
index f3408e38ab06c60f3369b5795bed6d9efd53fe0f..de8e853a34738ab09d887361f9e60cfb7a726ce2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -74,6 +74,19 @@ public class PurpurWorldConfig {
@@ -88,6 +88,19 @@ public class PurpurWorldConfig {
armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
}

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

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

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

@@ -167,10 +167,10 @@ index 04d09123f70a192f1283c0d7e8a8254f3d30889a..43ef93d2c0c59e0d7021ee9aa2b44345
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4187dacabc3ef1995fdaa15da1847ddd5b38e93f..3333c2cc765b6315b604662f8236fa53f1b636ee 100644
index 572db67801321091942bb88bbdd1416ec9864d9c..c4a6af80a2093a261935caac40b702bb827e998a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -492,6 +492,9 @@ public class PurpurWorldConfig {
@@ -506,6 +506,9 @@ public class PurpurWorldConfig {
public boolean drownedRidableInWater = false;
public double drownedMaxHealth = 20.0D;
public double drownedSpawnReinforcements = 0.1D;
@@ -180,7 +180,7 @@ index 4187dacabc3ef1995fdaa15da1847ddd5b38e93f..3333c2cc765b6315b604662f8236fa53
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -502,6 +505,9 @@ public class PurpurWorldConfig {
@@ -516,6 +519,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 4187dacabc3ef1995fdaa15da1847ddd5b38e93f..3333c2cc765b6315b604662f8236fa53
}
public boolean elderGuardianRidable = false;
@@ -714,6 +720,9 @@ public class PurpurWorldConfig {
@@ -728,6 +734,9 @@ public class PurpurWorldConfig {
public boolean huskRidableInWater = false;
public double huskMaxHealth = 20.0D;
public double huskSpawnReinforcements = 0.1D;
@@ -200,7 +200,7 @@ index 4187dacabc3ef1995fdaa15da1847ddd5b38e93f..3333c2cc765b6315b604662f8236fa53
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -724,6 +733,9 @@ public class PurpurWorldConfig {
@@ -738,6 +747,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 4187dacabc3ef1995fdaa15da1847ddd5b38e93f..3333c2cc765b6315b604662f8236fa53
}
public boolean illusionerRidable = false;
@@ -1426,6 +1438,9 @@ public class PurpurWorldConfig {
@@ -1440,6 +1452,9 @@ public class PurpurWorldConfig {
public boolean zombieRidableInWater = false;
public double zombieMaxHealth = 20.0D;
public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index 4187dacabc3ef1995fdaa15da1847ddd5b38e93f..3333c2cc765b6315b604662f8236fa53
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1436,6 +1451,9 @@ public class PurpurWorldConfig {
@@ -1450,6 +1465,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 4187dacabc3ef1995fdaa15da1847ddd5b38e93f..3333c2cc765b6315b604662f8236fa53
}
public boolean zombieHorseRidableInWater = false;
@@ -1469,6 +1487,9 @@ public class PurpurWorldConfig {
@@ -1483,6 +1501,9 @@ public class PurpurWorldConfig {
public boolean zombieVillagerRidableInWater = false;
public double zombieVillagerMaxHealth = 20.0D;
public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index 4187dacabc3ef1995fdaa15da1847ddd5b38e93f..3333c2cc765b6315b604662f8236fa53
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -1479,12 +1500,18 @@ public class PurpurWorldConfig {
@@ -1493,12 +1514,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 4187dacabc3ef1995fdaa15da1847ddd5b38e93f..3333c2cc765b6315b604662f8236fa53
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1495,5 +1522,8 @@ public class PurpurWorldConfig {
@@ -1509,5 +1536,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/0076-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 3333c2cc765b6315b604662f8236fa53f1b636ee..dd6ed02b70b76ffc0872acff6a02e7779ad6c239 100644
index c4a6af80a2093a261935caac40b702bb827e998a..e3bd27513287ba77efd3f2c2418b83b7646ea5e2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -905,6 +905,9 @@ public class PurpurWorldConfig {
@@ -919,6 +919,9 @@ public class PurpurWorldConfig {
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
public double phantomMaxHealth = 20.0D;
@@ -271,7 +271,7 @@ index 3333c2cc765b6315b604662f8236fa53f1b636ee..dd6ed02b70b76ffc0872acff6a02e777
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -918,6 +921,9 @@ public class PurpurWorldConfig {
@@ -932,6 +935,9 @@ public class PurpurWorldConfig {
set("mobs.phantom.attributes.max_health", oldValue);
}
phantomMaxHealth = getDouble("mobs.phantom.attributes.max_health", phantomMaxHealth);

6
patches/server/0077-Add-phantom-spawning-options.patch
View File

@@ -189,10 +189,10 @@ index 79504dc3448402e73b09c4232b1fd0488872cf68..5c7683058b79953aa4f7427d7654b7e4
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index dd6ed02b70b76ffc0872acff6a02e7779ad6c239..85e2fa56c9e111b0716f9907467b2a61bc0f5e5c 100644
index e3bd27513287ba77efd3f2c2418b83b7646ea5e2..506e7198de3a339545bebb508d96ca95f5fc8fc1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -908,6 +908,18 @@ public class PurpurWorldConfig {
@@ -922,6 +922,18 @@ public class PurpurWorldConfig {
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
public double phantomOrbitCrystalRadius = 0.0D;
@@ -211,7 +211,7 @@ index dd6ed02b70b76ffc0872acff6a02e7779ad6c239..85e2fa56c9e111b0716f9907467b2a61
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -924,6 +936,18 @@ public class PurpurWorldConfig {
@@ -938,6 +950,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);

21
patches/server/0078-Implement-bed-explosion-options.patch
View File

@@ -18,27 +18,10 @@ index 163a7861f987c3832aac51cc6df950c768546731..cfe4cdbd28ff11ea2781d47fe6d8c2de
} else if ((Boolean) state.getValue(BedBlock.OCCUPIED)) {
if (!this.kickVillagerOutOfBed(world, pos)) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 85e2fa56c9e111b0716f9907467b2a61bc0f5e5c..af52e400d2ac2d76539271a52676f0910ef45e6b 100644
index 506e7198de3a339545bebb508d96ca95f5fc8fc1..c3ec6d09e952f55e1e098f59d9764bc6cbe7c444 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -5,6 +5,7 @@ import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
+import net.minecraft.world.level.Explosion;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import org.bukkit.configuration.ConfigurationSection;
@@ -13,6 +14,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.logging.Level;
+
import static net.pl3x.purpur.PurpurConfig.log;
public class PurpurWorldConfig {
@@ -251,6 +254,22 @@ public class PurpurWorldConfig {
@@ -265,6 +265,22 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

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

@@ -18,10 +18,10 @@ index af4eb4a8814491afef449a2874521636957d7557..365c28300ecfbe0161716972adf22a8a
public static boolean canSetSpawn(Level world) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index af52e400d2ac2d76539271a52676f0910ef45e6b..b701a6ca68244d2ac2a87a84c3920cc5f90b5b06 100644
index c3ec6d09e952f55e1e098f59d9764bc6cbe7c444..af064d4ea1c64a5cd99b784a04599b650cd83d5d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -291,6 +291,22 @@ public class PurpurWorldConfig {
@@ -302,6 +302,22 @@ public class PurpurWorldConfig {
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
}

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

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

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

@@ -55,10 +55,10 @@ index 7192cc7e5a78af2a611bfd853972ac92a5490f23..d96c4d52282e69180273322cb9a83f73
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c220e1f06e65f945f12b05818e3cffaa756f624e..cad7a47268ac0ded1622e6ff8c033fa403df7ace 100644
index 8ba4f1abcb6832878339bd6bd3e12f5e7f046774..43c8dc815f4e756e270b1a130ec67dba5f4cb453 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -208,6 +208,7 @@ public class PurpurWorldConfig {
@@ -219,6 +219,7 @@ public class PurpurWorldConfig {
public boolean playerInvulnerableWhileAcceptingResourcePack = false;
public String playerDeathExpDropEquation = "expLevel * 7";
public int playerDeathExpDropMax = 100;
@@ -66,7 +66,7 @@ index c220e1f06e65f945f12b05818e3cffaa756f624e..cad7a47268ac0ded1622e6ff8c033fa4
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -217,6 +218,7 @@ public class PurpurWorldConfig {
@@ -228,6 +229,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/0084-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 cad7a47268ac0ded1622e6ff8c033fa403df7ace..dfe9465686878ca22d2a36c872d39f5a5759aa27 100644
index 43c8dc815f4e756e270b1a130ec67dba5f4cb453..c54831d2f24511ee02b38a8e8d35cfb19e998306 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1244,6 +1244,7 @@ public class PurpurWorldConfig {
@@ -1255,6 +1255,7 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public double squidMaxHealth = 10.0D;
@@ -16,7 +16,7 @@ index cad7a47268ac0ded1622e6ff8c033fa403df7ace..dfe9465686878ca22d2a36c872d39f5a
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1252,6 +1253,7 @@ public class PurpurWorldConfig {
@@ -1263,6 +1264,7 @@ public class PurpurWorldConfig {
set("mobs.squid.attributes.max_health", oldValue);
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);

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

@@ -47,10 +47,10 @@ index 916c29d08fbcf245ad6f50f8e8cc173677b01081..c55aba456aa144e58fc35877c61eff30
list.sort(Comparator.<Player, Double>comparing(Entity::getY).reversed()); // Paper - remap fix
Iterator iterator = list.iterator();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index dfe9465686878ca22d2a36c872d39f5a5759aa27..c5bf161afb49eec474968ee112997f6bc902e943 100644
index c54831d2f24511ee02b38a8e8d35cfb19e998306..f508e8fe38fbb01600c221b84690eb12a14f808a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -962,6 +962,9 @@ public class PurpurWorldConfig {
@@ -973,6 +973,9 @@ public class PurpurWorldConfig {
public int phantomSpawnOverheadRadius = 10;
public int phantomSpawnMinPerAttempt = 1;
public int phantomSpawnMaxPerAttempt = -1;
@@ -60,7 +60,7 @@ index dfe9465686878ca22d2a36c872d39f5a5759aa27..c5bf161afb49eec474968ee112997f6b
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -990,6 +993,9 @@ public class PurpurWorldConfig {
@@ -1001,6 +1004,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/0087-Configurable-villager-breeding.patch
View File

@@ -18,10 +18,10 @@ index 5e100dbdbd6cfb4aa34b0d6b1ce0913899f60b7c..1e05cc98a332e5b115c4670e5331e679
private boolean hungry() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c5bf161afb49eec474968ee112997f6bc902e943..2be05180781a75fa2d4cf8271edddf0faa0feea1 100644
index f508e8fe38fbb01600c221b84690eb12a14f808a..27e448c7a490ef186d730ac0212d480eebdc1b88 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1387,6 +1387,7 @@ public class PurpurWorldConfig {
@@ -1398,6 +1398,7 @@ public class PurpurWorldConfig {
public boolean villagerCanBeLeashed = false;
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
@@ -29,7 +29,7 @@ index c5bf161afb49eec474968ee112997f6bc902e943..2be05180781a75fa2d4cf8271edddf0f
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1402,6 +1403,7 @@ public class PurpurWorldConfig {
@@ -1413,6 +1414,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/0088-Redstone-deactivates-spawners.patch
View File

@@ -17,10 +17,10 @@ index 9228c0bc797fb95c8ac949bdc568eadafee84a80..f2c9f841d397f445cd3d0420f19e765c
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2be05180781a75fa2d4cf8271edddf0faa0feea1..517e3f807b3dd8420b9152fd47f24eedf905994a 100644
index 27e448c7a490ef186d730ac0212d480eebdc1b88..edeb6fff3bdd716ed1771705b79853d913cd1bbc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -321,6 +321,11 @@ public class PurpurWorldConfig {
@@ -332,6 +332,11 @@ public class PurpurWorldConfig {
signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
}

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

@@ -29,10 +29,10 @@ index d96c4d52282e69180273322cb9a83f7365667fe3..0fa7a658af3dc1766e06d90d396a426c
event.setCancelled(itemstack == null);
this.level.getCraftServer().getPluginManager().callEvent(event);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 517e3f807b3dd8420b9152fd47f24eedf905994a..bd00932e1dcbd83545be745d0a1d62f7905912f8 100644
index edeb6fff3bdd716ed1771705b79853d913cd1bbc..1a3ea260a5532db2aa14bab3145f3a00d6683cea 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -209,6 +209,7 @@ public class PurpurWorldConfig {
@@ -220,6 +220,7 @@ public class PurpurWorldConfig {
public String playerDeathExpDropEquation = "expLevel * 7";
public int playerDeathExpDropMax = 100;
public boolean teleportIfOutsideBorder = false;
@@ -40,7 +40,7 @@ index 517e3f807b3dd8420b9152fd47f24eedf905994a..bd00932e1dcbd83545be745d0a1d62f7
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -219,6 +220,7 @@ public class PurpurWorldConfig {
@@ -230,6 +231,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/0090-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 bd00932e1dcbd83545be745d0a1d62f7905912f8..82946ea3a5492b540fef3d1a269a229875928c83 100644
index 1a3ea260a5532db2aa14bab3145f3a00d6683cea..591258b3a8cda4cbe50f2bf0d93d25008f4c8a31 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1416,6 +1416,7 @@ public class PurpurWorldConfig {
@@ -1427,6 +1427,7 @@ public class PurpurWorldConfig {
public boolean vindicatorRidable = false;
public boolean vindicatorRidableInWater = false;
public double vindicatorMaxHealth = 24.0D;
@@ -41,7 +41,7 @@ index bd00932e1dcbd83545be745d0a1d62f7905912f8..82946ea3a5492b540fef3d1a269a2298
private void vindicatorSettings() {
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
@@ -1425,6 +1426,7 @@ public class PurpurWorldConfig {
@@ -1436,6 +1437,7 @@ public class PurpurWorldConfig {
set("mobs.vindicator.attributes.max_health", oldValue);
}
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);

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

@@ -41,10 +41,10 @@ index 92623ae25249d63efb92be8bd6c95228f9155ad2..20bf6d01046488eff53a109f5239351a
static void setEntityPokingOutOfBlock(BlockSource pointer, Entity entity, Direction direction) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 82946ea3a5492b540fef3d1a269a229875928c83..accc3e94c8ef3ffb485ef87ddf821b0a0275e81b 100644
index 591258b3a8cda4cbe50f2bf0d93d25008f4c8a31..97b8b8f6c6c9761d06344fa065a573a7bea37ef6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -280,8 +280,10 @@ public class PurpurWorldConfig {
@@ -291,8 +291,10 @@ public class PurpurWorldConfig {
}
public boolean dispenserApplyCursedArmor = true;

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

@@ -37,10 +37,10 @@ index c81af461fa01dac0b7b26becc1a5e7ae31bb5f95..2dbc71a3d76cc87e2683b8f351bd8db0
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index accc3e94c8ef3ffb485ef87ddf821b0a0275e81b..20424aeb972ac8ea81797cc9ce2b5c9615a49b66 100644
index 97b8b8f6c6c9761d06344fa065a573a7bea37ef6..c0dd404357dade5ef61f6c20b143ec46543cfb51 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -263,6 +263,11 @@ public class PurpurWorldConfig {
@@ -274,6 +274,11 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

15
patches/server/0094-Add-no-random-tick-block-list.patch
View File

@@ -35,21 +35,10 @@ index 7538262e14c86e4da9cd4cb887b76f649bfef2e6..f34973be478de4f088a0593b45bd89e5
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 20424aeb972ac8ea81797cc9ce2b5c9615a49b66..9c84e332ccfd430c780edb0bbe7fcb61ea302b15 100644
index c0dd404357dade5ef61f6c20b143ec46543cfb51..6e53ebf9dbac0d1dc387845abe8d47abdf18b9f0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -12,8 +12,10 @@ import org.bukkit.configuration.ConfigurationSection;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.logging.Level;
import static net.pl3x.purpur.PurpurConfig.log;
@@ -263,6 +265,28 @@ public class PurpurWorldConfig {
@@ -274,6 +274,28 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

6
patches/server/0095-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 9c84e332ccfd430c780edb0bbe7fcb61ea302b15..10ad83ad209e0e9e408d112908bb78243cd36a87 100644
index 6e53ebf9dbac0d1dc387845abe8d47abdf18b9f0..91697c96d7133f1815fd6d89b4fc55c24609b2aa 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -531,6 +531,7 @@ public class PurpurWorldConfig {
@@ -540,6 +540,7 @@ public class PurpurWorldConfig {
public float dolphinSpitSpeed = 1.0F;
public float dolphinSpitDamage = 2.0F;
public double dolphinMaxHealth = 10.0D;
@@ -28,7 +28,7 @@ index 9c84e332ccfd430c780edb0bbe7fcb61ea302b15..10ad83ad209e0e9e408d112908bb7824
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinSpitCooldown = getInt("mobs.dolphin.spit.cooldown", dolphinSpitCooldown);
@@ -542,6 +543,7 @@ public class PurpurWorldConfig {
@@ -551,6 +552,7 @@ public class PurpurWorldConfig {
set("mobs.dolphin.attributes.max_health", oldValue);
}
dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);

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

@@ -60,10 +60,10 @@ index 6f7e6429c35eea346517cbf08cf223fc6d838a8c..6a77112180556675af38cb1b3ce0b38a
+ // Purpur
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 10ad83ad209e0e9e408d112908bb78243cd36a87..6b0e3963e7ce797f09d8c19f17eaf28b573f2181 100644
index 91697c96d7133f1815fd6d89b4fc55c24609b2aa..1d804ff002c3736b3c6199130a4c1c27fd048dd3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1291,6 +1291,7 @@ public class PurpurWorldConfig {
@@ -1300,6 +1300,7 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
@@ -71,7 +71,7 @@ index 10ad83ad209e0e9e408d112908bb78243cd36a87..6b0e3963e7ce797f09d8c19f17eaf28b
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1300,6 +1301,7 @@ public class PurpurWorldConfig {
@@ -1309,6 +1310,7 @@ public class PurpurWorldConfig {
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);

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

@@ -27,10 +27,10 @@ index 429f710c6814ad796d78ad6d5dbbffd66c4961df..fce6d351277c2de8eaaaf93e0b166e40
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 6b0e3963e7ce797f09d8c19f17eaf28b573f2181..721510d5d83369116c21e43bcfde01d5eb7ddcd7 100644
index 1d804ff002c3736b3c6199130a4c1c27fd048dd3..f1724c6871e1aff14f784470df71611e576793cf 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -251,6 +251,7 @@ public class PurpurWorldConfig {
@@ -260,6 +260,7 @@ public class PurpurWorldConfig {
public boolean useBetterMending = false;
public boolean boatEjectPlayersOnLand = false;
public boolean disableDropsOnCrammingDeath = false;
@@ -38,7 +38,7 @@ index 6b0e3963e7ce797f09d8c19f17eaf28b573f2181..721510d5d83369116c21e43bcfde01d5
public boolean milkCuresBadOmen = true;
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
@@ -259,6 +260,7 @@ public class PurpurWorldConfig {
@@ -268,6 +269,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/0102-Customizable-wither-health-and-healing.patch
View File

@@ -23,10 +23,10 @@ index 22dd455b3b9c148f38a63f72901009f864e63a4b..689df66281ef84f0cc31d89c6f2e654c
this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth());
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 721510d5d83369116c21e43bcfde01d5eb7ddcd7..d821a0544a4bb3a5f015a81d64e73e3ed10f3bad 100644
index f1724c6871e1aff14f784470df71611e576793cf..093c44cba0675316479f5d96434092821804cfa0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1502,6 +1502,8 @@ public class PurpurWorldConfig {
@@ -1511,6 +1511,8 @@ public class PurpurWorldConfig {
public boolean witherRidableInWater = false;
public double witherMaxY = 256D;
public double witherMaxHealth = 300.0D;
@@ -35,7 +35,7 @@ index 721510d5d83369116c21e43bcfde01d5eb7ddcd7..d821a0544a4bb3a5f015a81d64e73e3e
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1516,6 +1518,8 @@ public class PurpurWorldConfig {
@@ -1525,6 +1527,8 @@ public class PurpurWorldConfig {
set("mobs.wither.attributes.max_health", oldValue);
}
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);

49
patches/server/0103-Allow-toggling-special-MobSpawners-per-world.patch
View File

@@ -93,54 +93,11 @@ index f8ede3588bfda9a7d4d5807311a3e9c2651fd0a3..56967cef0f184def046935e20148574f
if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) {
blockposition1 = blockposition2;
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 19d32ceea05206680b8d9a20f28c618b5817606c..65aba9a17a76e56c0140220ab00645a1e02cc8b5 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -310,7 +310,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), this.spigotConfig); // Paper
this.tuinityConfig = new com.tuinity.tuinity.config.TuinityConfig.WorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData)worlddatamutable).getLevelName()); // Tuinity - Server Config
- this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((ServerLevel) this, ((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Purpur
+ this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((ServerLevel) this, ((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur
this.generator = gen;
this.world = new CraftWorld((ServerLevel) this, gen, env);
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d821a0544a4bb3a5f015a81d64e73e3ed10f3bad..51997b73e5020e722915bce5db18909174d6697d 100644
index 093c44cba0675316479f5d96434092821804cfa0..2e2f5e7ca914abf1a1d22c8ea03f363643f46488 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -8,6 +8,8 @@ import net.minecraft.world.item.Items;
import net.minecraft.world.level.Explosion;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
+import org.apache.commons.lang.BooleanUtils;
+import org.bukkit.World;
import org.bukkit.configuration.ConfigurationSection;
import java.util.ArrayList;
@@ -16,6 +18,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.function.Predicate;
import java.util.logging.Level;
import static net.pl3x.purpur.PurpurConfig.log;
@@ -24,9 +27,11 @@ public class PurpurWorldConfig {
private final ServerLevel level;
private final String worldName;
- public PurpurWorldConfig(ServerLevel level, String worldName) {
+ private final World.Environment environment;
+ public PurpurWorldConfig(ServerLevel level, String worldName, World.Environment environment) {
this.level = level;
this.worldName = worldName;
+ this.environment = environment;
init();
}
@@ -54,6 +59,12 @@ public class PurpurWorldConfig {
@@ -63,6 +63,12 @@ public class PurpurWorldConfig {
return PurpurConfig.config.getBoolean("world-settings." + worldName + "." + path, PurpurConfig.config.getBoolean("world-settings.default." + path));
}
@@ -153,7 +110,7 @@ index d821a0544a4bb3a5f015a81d64e73e3ed10f3bad..51997b73e5020e722915bce5db189091
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));
@@ -202,6 +213,21 @@ public class PurpurWorldConfig {
@@ -211,6 +217,21 @@ public class PurpurWorldConfig {
}
}

6
patches/server/0104-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 51997b73e5020e722915bce5db18909174d6697d..b29acbf963689293daeaefc252f4a73b5ce0d65a 100644
index 2e2f5e7ca914abf1a1d22c8ea03f363643f46488..c53852320909c7481f23b33433c771b96ae8557b 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 {
@@ -286,6 +286,7 @@ public class PurpurWorldConfig {
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -63,7 +63,7 @@ index 51997b73e5020e722915bce5db18909174d6697d..b29acbf963689293daeaefc252f4a73b
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
@@ -291,6 +292,7 @@ public class PurpurWorldConfig {
@@ -295,6 +296,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);

4
patches/server/0105-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 b29acbf963689293daeaefc252f4a73b5ce0d65a..c99e0f3572cb8f52343cd31f7574608d84d82c0d 100644
index c53852320909c7481f23b33433c771b96ae8557b..401621a9a9592558efd7c3aa043822a857ab6b41 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -251,6 +251,35 @@ public class PurpurWorldConfig {
@@ -255,6 +255,35 @@ public class PurpurWorldConfig {
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
}

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

@@ -71,10 +71,10 @@ index 77002a4c3b03e0397515fd922f14e56b8e81074a..b80f7c71cbf7b10bda6fac3cfe673ac7
this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c99e0f3572cb8f52343cd31f7574608d84d82c0d..18ea23e93dedeb578cdf2a94bc3ec959f9c8863e 100644
index 401621a9a9592558efd7c3aa043822a857ab6b41..96c242bba2dc7309ed9878687694193f0ee70bd7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1630,6 +1630,7 @@ public class PurpurWorldConfig {
@@ -1634,6 +1634,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyOnlyBaby = true;
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
@@ -82,7 +82,7 @@ index c99e0f3572cb8f52343cd31f7574608d84d82c0d..18ea23e93dedeb578cdf2a94bc3ec959
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1643,6 +1644,7 @@ public class PurpurWorldConfig {
@@ -1647,6 +1648,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/0107-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 18ea23e93dedeb578cdf2a94bc3ec959f9c8863e..ed2cd6fd49ff64fe9bda7429003481dc705a2edb 100644
index 96c242bba2dc7309ed9878687694193f0ee70bd7..9231ec35dbca08c5bb58cb6c288e493ea8036b95 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -308,6 +308,7 @@ public class PurpurWorldConfig {
@@ -312,6 +312,7 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesCanUsePortals = true;
public boolean milkCuresBadOmen = true;
@@ -200,7 +200,7 @@ index 18ea23e93dedeb578cdf2a94bc3ec959f9c8863e..ed2cd6fd49ff64fe9bda7429003481dc
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -318,6 +319,7 @@ public class PurpurWorldConfig {
@@ -322,6 +323,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/0109-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 ed2cd6fd49ff64fe9bda7429003481dc705a2edb..4905bc50ed99b22cbb89cb1f192c055575242e43 100644
index 9231ec35dbca08c5bb58cb6c288e493ea8036b95..f7baead9f97d680c45dd4e87e1e017bddd313494 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -795,9 +795,11 @@ public class PurpurWorldConfig {
@@ -799,9 +799,11 @@ public class PurpurWorldConfig {
public boolean glowSquidRidable = false;
public double glowSquidMaxHealth = 10.0D;
@@ -73,7 +73,7 @@ index ed2cd6fd49ff64fe9bda7429003481dc705a2edb..4905bc50ed99b22cbb89cb1f192c0555
}
public boolean goatRidable = false;
@@ -1353,6 +1355,7 @@ public class PurpurWorldConfig {
@@ -1357,6 +1359,7 @@ public class PurpurWorldConfig {
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
public double squidOffsetWaterCheck = 0.0D;
@@ -81,7 +81,7 @@ index ed2cd6fd49ff64fe9bda7429003481dc705a2edb..4905bc50ed99b22cbb89cb1f192c0555
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1363,6 +1366,7 @@ public class PurpurWorldConfig {
@@ -1367,6 +1370,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/0110-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 4905bc50ed99b22cbb89cb1f192c055575242e43..351e6936f8e44ff00404884ba5ae339d15a37017 100644
index f7baead9f97d680c45dd4e87e1e017bddd313494..18ffce02b1301659e898d5c7e656d6a90f6568df 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -108,6 +108,17 @@ public class PurpurWorldConfig {
@@ -112,6 +112,17 @@ public class PurpurWorldConfig {
entityLifeSpan = getInt("gameplay-mechanics.entity-lifespan", entityLifeSpan);
}

4
patches/server/0111-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 351e6936f8e44ff00404884ba5ae339d15a37017..b44c049afb115fe3fe6e4c567012211a7af93876 100644
index 18ffce02b1301659e898d5c7e656d6a90f6568df..2cf088cc750aad13001859bbc8b49343e5459567 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -431,6 +431,11 @@ public class PurpurWorldConfig {
@@ -435,6 +435,11 @@ public class PurpurWorldConfig {
spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
}

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

@@ -81,10 +81,10 @@ index 13bee6ce45fd718484a9cf08645556717c9934e8..dbdaadfaeea555904556136a7cca02aa
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 b44c049afb115fe3fe6e4c567012211a7af93876..edc850edd034d547e29bf58f3c4d718f33c8b656 100644
index 2cf088cc750aad13001859bbc8b49343e5459567..71d3d41eab2fc5068f34e8e1b20b43a19caa958e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -90,6 +90,13 @@ public class PurpurWorldConfig {
@@ -94,6 +94,13 @@ public class PurpurWorldConfig {
armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
}

4
patches/server/0114-Infinite-fuel-furnace.patch
View File

@@ -48,10 +48,10 @@ index 348e485897c34cca19113cc35f055a58778ca38b..1eab83cefdf1484b8cf80072d9a0ee61
private static boolean canBurn(@Nullable Recipe<?> recipe, NonNullList<ItemStack> slots, int count) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index edc850edd034d547e29bf58f3c4d718f33c8b656..c50eb36531f1926cf2ae2cc855b1c1e66fc9841a 100644
index 71d3d41eab2fc5068f34e8e1b20b43a19caa958e..638000f9acb937e9a3093c1c7f74a47f9ce7b13d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -399,6 +399,11 @@ public class PurpurWorldConfig {
@@ -403,6 +403,11 @@ public class PurpurWorldConfig {
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
}

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

@@ -24,10 +24,10 @@ index 5d9d77cb382c8075af2713a0ce26c28a35a0aaa8..2d4d59eb5a534e4c283933b734c44776
return;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c50eb36531f1926cf2ae2cc855b1c1e66fc9841a..dbea3485a528c49873b7d7fb83fb498edeabd66e 100644
index 638000f9acb937e9a3093c1c7f74a47f9ce7b13d..b4a6fe5acd5f6bb536e35bfe6d1d0df790c52cea 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -395,8 +395,10 @@ public class PurpurWorldConfig {
@@ -399,8 +399,10 @@ public class PurpurWorldConfig {
}
public boolean farmlandGetsMoistFromBelow = false;

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

@@ -95,10 +95,10 @@ index 65aba9a17a76e56c0140220ab00645a1e02cc8b5..bfac7888f71232ac095e2615bddf05d7
this.world = new CraftWorld((ServerLevel) this, gen, env);
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index dbea3485a528c49873b7d7fb83fb498edeabd66e..897db98ad82b8168908018f5fce30f661a00fe72 100644
index b4a6fe5acd5f6bb536e35bfe6d1d0df790c52cea..dd93c5252cf0b53b23fca410e856852bbfda3d39 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 {
@@ -335,6 +335,7 @@ public class PurpurWorldConfig {
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
public int raidCooldownSeconds = 0;
@@ -106,7 +106,7 @@ index dbea3485a528c49873b7d7fb83fb498edeabd66e..897db98ad82b8168908018f5fce30f66
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
@@ -342,6 +343,7 @@ public class PurpurWorldConfig {
@@ -346,6 +347,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/0118-Make-entity-breeding-times-configurable.patch
View File

@@ -474,10 +474,10 @@ index 5d289be8f0ef003abbce992e7662f6ddce4f4a99..5e3d7321a73144c3e4c43c18c5b748b2
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200f40d07ff 100644
index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e7e8938ae 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -463,9 +463,11 @@ public class PurpurWorldConfig {
@@ -467,9 +467,11 @@ public class PurpurWorldConfig {
public boolean axolotlRidable = false;
public double axolotlMaxHealth = 14.0D;
@@ -489,7 +489,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean batRidable = false;
@@ -495,6 +497,7 @@ public class PurpurWorldConfig {
@@ -499,6 +501,7 @@ public class PurpurWorldConfig {
public boolean beeRidableInWater = false;
public double beeMaxY = 256D;
public double beeMaxHealth = 10.0D;
@@ -497,7 +497,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -505,6 +508,7 @@ public class PurpurWorldConfig {
@@ -509,6 +512,7 @@ public class PurpurWorldConfig {
set("mobs.bee.attributes.max_health", oldValue);
}
beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
@@ -505,7 +505,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean blazeRidable = false;
@@ -529,6 +533,7 @@ public class PurpurWorldConfig {
@@ -533,6 +537,7 @@ public class PurpurWorldConfig {
public int catSpawnDelay = 1200;
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
@@ -513,7 +513,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -541,6 +546,7 @@ public class PurpurWorldConfig {
@@ -545,6 +550,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 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean caveSpiderRidable = false;
@@ -561,6 +567,7 @@ public class PurpurWorldConfig {
@@ -565,6 +571,7 @@ public class PurpurWorldConfig {
public boolean chickenRidableInWater = false;
public double chickenMaxHealth = 4.0D;
public boolean chickenRetaliate = false;
@@ -529,7 +529,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -571,6 +578,7 @@ public class PurpurWorldConfig {
@@ -575,6 +582,7 @@ public class PurpurWorldConfig {
}
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
@@ -537,7 +537,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean codRidable = false;
@@ -589,6 +597,7 @@ public class PurpurWorldConfig {
@@ -593,6 +601,7 @@ public class PurpurWorldConfig {
public boolean cowRidableInWater = false;
public double cowMaxHealth = 10.0D;
public int cowFeedMushrooms = 0;
@@ -545,7 +545,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -599,6 +608,7 @@ public class PurpurWorldConfig {
@@ -603,6 +612,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 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean creeperRidable = false;
@@ -646,6 +656,7 @@ public class PurpurWorldConfig {
@@ -650,6 +660,7 @@ public class PurpurWorldConfig {
public double donkeyJumpStrengthMax = 0.5D;
public double donkeyMovementSpeedMin = 0.175D;
public double donkeyMovementSpeedMax = 0.175D;
@@ -561,7 +561,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
if (PurpurConfig.version < 10) {
@@ -661,6 +672,7 @@ public class PurpurWorldConfig {
@@ -665,6 +676,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 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean drownedRidable = false;
@@ -767,6 +779,7 @@ public class PurpurWorldConfig {
@@ -771,6 +783,7 @@ public class PurpurWorldConfig {
public boolean foxRidableInWater = false;
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
@@ -577,7 +577,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -777,6 +790,7 @@ public class PurpurWorldConfig {
@@ -781,6 +794,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 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean ghastRidable = false;
@@ -837,10 +851,12 @@ public class PurpurWorldConfig {
@@ -841,10 +855,12 @@ public class PurpurWorldConfig {
public boolean goatRidable = false;
public boolean goatRidableInWater = false;
public double goatMaxHealth = 10.0D;
@@ -598,7 +598,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean guardianRidable = false;
@@ -858,6 +874,7 @@ public class PurpurWorldConfig {
@@ -862,6 +878,7 @@ public class PurpurWorldConfig {
public boolean hoglinRidable = false;
public boolean hoglinRidableInWater = false;
public double hoglinMaxHealth = 40.0D;
@@ -606,7 +606,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void hoglinSettings() {
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
@@ -867,6 +884,7 @@ public class PurpurWorldConfig {
@@ -871,6 +888,7 @@ public class PurpurWorldConfig {
set("mobs.hoglin.attributes.max_health", oldValue);
}
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
@@ -614,7 +614,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean horseRidableInWater = false;
@@ -876,6 +894,7 @@ public class PurpurWorldConfig {
@@ -880,6 +898,7 @@ public class PurpurWorldConfig {
public double horseJumpStrengthMax = 1.0D;
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
@@ -622,7 +622,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -891,6 +910,7 @@ public class PurpurWorldConfig {
@@ -895,6 +914,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 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean huskRidable = false;
@@ -961,6 +981,7 @@ public class PurpurWorldConfig {
@@ -965,6 +985,7 @@ public class PurpurWorldConfig {
public double llamaJumpStrengthMax = 0.5D;
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
@@ -638,7 +638,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -977,6 +998,7 @@ public class PurpurWorldConfig {
@@ -981,6 +1002,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 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean magmaCubeRidable = false;
@@ -996,6 +1018,7 @@ public class PurpurWorldConfig {
@@ -1000,6 +1022,7 @@ public class PurpurWorldConfig {
public boolean mooshroomRidable = false;
public boolean mooshroomRidableInWater = false;
public double mooshroomMaxHealth = 10.0D;
@@ -654,7 +654,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1005,6 +1028,7 @@ public class PurpurWorldConfig {
@@ -1009,6 +1032,7 @@ public class PurpurWorldConfig {
set("mobs.mooshroom.attributes.max_health", oldValue);
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -662,7 +662,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean muleRidableInWater = false;
@@ -1014,6 +1038,7 @@ public class PurpurWorldConfig {
@@ -1018,6 +1042,7 @@ public class PurpurWorldConfig {
public double muleJumpStrengthMax = 0.5D;
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
@@ -670,7 +670,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1029,11 +1054,13 @@ public class PurpurWorldConfig {
@@ -1033,11 +1058,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 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1043,11 +1070,13 @@ public class PurpurWorldConfig {
@@ -1047,11 +1074,13 @@ public class PurpurWorldConfig {
set("mobs.ocelot.attributes.max_health", oldValue);
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -698,7 +698,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1057,6 +1086,7 @@ public class PurpurWorldConfig {
@@ -1061,6 +1090,7 @@ public class PurpurWorldConfig {
set("mobs.panda.attributes.max_health", oldValue);
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -706,7 +706,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean parrotRidable = false;
@@ -1137,6 +1167,7 @@ public class PurpurWorldConfig {
@@ -1141,6 +1171,7 @@ public class PurpurWorldConfig {
public boolean pigRidableInWater = false;
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
@@ -714,7 +714,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1147,6 +1178,7 @@ public class PurpurWorldConfig {
@@ -1151,6 +1182,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 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean piglinRidable = false;
@@ -1196,6 +1228,7 @@ public class PurpurWorldConfig {
@@ -1200,6 +1232,7 @@ public class PurpurWorldConfig {
public double polarBearMaxHealth = 30.0D;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -730,7 +730,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1208,6 +1241,7 @@ public class PurpurWorldConfig {
@@ -1212,6 +1245,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 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean pufferfishRidable = false;
@@ -1227,6 +1261,7 @@ public class PurpurWorldConfig {
@@ -1231,6 +1265,7 @@ public class PurpurWorldConfig {
public double rabbitMaxHealth = 3.0D;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -746,7 +746,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1238,6 +1273,7 @@ public class PurpurWorldConfig {
@@ -1242,6 +1277,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 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean ravagerRidable = false;
@@ -1269,6 +1305,7 @@ public class PurpurWorldConfig {
@@ -1273,6 +1309,7 @@ public class PurpurWorldConfig {
public boolean sheepRidable = false;
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
@@ -762,7 +762,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1278,6 +1315,7 @@ public class PurpurWorldConfig {
@@ -1282,6 +1319,7 @@ public class PurpurWorldConfig {
set("mobs.sheep.attributes.max_health", oldValue);
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -770,7 +770,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean shulkerRidable = false;
@@ -1432,6 +1470,7 @@ public class PurpurWorldConfig {
@@ -1436,6 +1474,7 @@ public class PurpurWorldConfig {
public boolean striderRidable = false;
public boolean striderRidableInWater = false;
public double striderMaxHealth = 20.0D;
@@ -778,7 +778,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1441,6 +1480,7 @@ public class PurpurWorldConfig {
@@ -1445,6 +1484,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -786,7 +786,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean traderLlamaRidable = false;
@@ -1451,6 +1491,7 @@ public class PurpurWorldConfig {
@@ -1455,6 +1495,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -794,7 +794,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1467,6 +1508,7 @@ public class PurpurWorldConfig {
@@ -1471,6 +1512,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 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean tropicalFishRidable = false;
@@ -1487,6 +1529,7 @@ public class PurpurWorldConfig {
@@ -1491,6 +1533,7 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromExpOrbs = true;
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;
@@ -810,7 +810,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void turtleEggSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1499,6 +1542,7 @@ public class PurpurWorldConfig {
@@ -1503,6 +1546,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 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean vexRidable = false;
@@ -1527,6 +1571,7 @@ public class PurpurWorldConfig {
@@ -1531,6 +1575,7 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
@@ -826,7 +826,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1543,6 +1588,7 @@ public class PurpurWorldConfig {
@@ -1547,6 +1592,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 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
}
public boolean vindicatorRidable = false;
@@ -1636,6 +1682,7 @@ public class PurpurWorldConfig {
@@ -1640,6 +1686,7 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -842,7 +842,7 @@ index 897db98ad82b8168908018f5fce30f661a00fe72..87dbb11dbad933689c7b574964d7d200
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1645,6 +1692,7 @@ public class PurpurWorldConfig {
@@ -1649,6 +1696,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

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

@@ -142,10 +142,10 @@ index 282bfe4904637aaff1bd29e30ed18ba843c07cab..ddd50db8bb92c147d7c1eef4d1df3ac5
if (((HangingEntity) object).survives()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 87dbb11dbad933689c7b574964d7d200f40d07ff..30943421f23908d481e77434413baa599a9fc883 100644
index 8b4656abb11787573bcadb79e2f7070e7e8938ae..8d79d5737cf21f0f85d2110c77a045b033a9d7b9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -86,8 +86,10 @@ public class PurpurWorldConfig {
@@ -90,8 +90,10 @@ public class PurpurWorldConfig {
}
public float armorstandStepHeight = 0.0F;
@@ -156,7 +156,7 @@ index 87dbb11dbad933689c7b574964d7d200f40d07ff..30943421f23908d481e77434413baa59
}
public int daytimeTicks = 12000;
@@ -327,6 +329,7 @@ public class PurpurWorldConfig {
@@ -331,6 +333,7 @@ public class PurpurWorldConfig {
public boolean entitiesCanUsePortals = true;
public boolean milkCuresBadOmen = true;
public boolean persistentTileEntityDisplayNames = false;
@@ -164,7 +164,7 @@ index 87dbb11dbad933689c7b574964d7d200f40d07ff..30943421f23908d481e77434413baa59
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -339,6 +342,7 @@ public class PurpurWorldConfig {
@@ -343,6 +346,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/0120-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 30943421f23908d481e77434413baa599a9fc883..a15aa128d8f128ea6fdd1974dba3236d1223a614 100644
index 8d79d5737cf21f0f85d2110c77a045b033a9d7b9..2634fef87b0535e048f51e53a351540ab0c23584 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -87,9 +87,11 @@ public class PurpurWorldConfig {
@@ -91,9 +91,11 @@ public class PurpurWorldConfig {
public float armorstandStepHeight = 0.0F;
public boolean armorstandSetNameVisible = false;

6
patches/server/0121-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 a15aa128d8f128ea6fdd1974dba3236d1223a614..4b57c5dbc9ab0d78df5eb6600e649ad14446ecde 100644
index 2634fef87b0535e048f51e53a351540ab0c23584..6d28d0f324ff174d8392059d34597da8316f62bc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -395,6 +395,11 @@ public class PurpurWorldConfig {
@@ -399,6 +399,11 @@ public class PurpurWorldConfig {
}
}
@@ -97,7 +97,7 @@ index a15aa128d8f128ea6fdd1974dba3236d1223a614..4b57c5dbc9ab0d78df5eb6600e649ad1
public boolean dispenserApplyCursedArmor = true;
public boolean dispenserPlaceAnvils = false;
private void dispenserSettings() {
@@ -458,6 +463,16 @@ public class PurpurWorldConfig {
@@ -462,6 +467,16 @@ public class PurpurWorldConfig {
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
}

8
patches/server/0122-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 4b57c5dbc9ab0d78df5eb6600e649ad14446ecde..1f7c0b8d3efee6e68bb3d22334550efd98193053 100644
index 6d28d0f324ff174d8392059d34597da8316f62bc..c62d3619559efadf0fb2b9085b8c5a05208fb0cc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -396,8 +396,10 @@ public class PurpurWorldConfig {
@@ -400,8 +400,10 @@ public class PurpurWorldConfig {
}
public double caveVinesGrowthModifier = 0.10D;
@@ -117,7 +117,7 @@ index 4b57c5dbc9ab0d78df5eb6600e649ad14446ecde..1f7c0b8d3efee6e68bb3d22334550efd
}
public boolean dispenserApplyCursedArmor = true;
@@ -430,6 +432,11 @@ public class PurpurWorldConfig {
@@ -434,6 +436,11 @@ public class PurpurWorldConfig {
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
}
@@ -129,7 +129,7 @@ index 4b57c5dbc9ab0d78df5eb6600e649ad14446ecde..1f7c0b8d3efee6e68bb3d22334550efd
public boolean respawnAnchorExplode = true;
public double respawnAnchorExplosionPower = 5.0D;
public boolean respawnAnchorExplosionFire = true;
@@ -464,13 +471,17 @@ public class PurpurWorldConfig {
@@ -468,13 +475,17 @@ public class PurpurWorldConfig {
}
public double twistingVinesGrowthModifier = 0.10D;

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

@@ -21,10 +21,10 @@ index 5ebedd6a156b06e98aded57c817f63429a1ae380..c99d295b999a28dd1eb504179250445d
private static class EndermanFreezeWhenLookedAt extends Goal {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1f7c0b8d3efee6e68bb3d22334550efd98193053..fd7c9a8a2dc8080158b73e57eec8d8f40b13b82d 100644
index c62d3619559efadf0fb2b9085b8c5a05208fb0cc..147681048f24ea75ba7ddb0a019a83703a191e74 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -767,6 +767,7 @@ public class PurpurWorldConfig {
@@ -771,6 +771,7 @@ public class PurpurWorldConfig {
public boolean endermanRidableInWater = false;
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
@@ -32,7 +32,7 @@ index 1f7c0b8d3efee6e68bb3d22334550efd98193053..fd7c9a8a2dc8080158b73e57eec8d8f4
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -777,6 +778,7 @@ public class PurpurWorldConfig {
@@ -781,6 +782,7 @@ public class PurpurWorldConfig {
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);

4
patches/server/0125-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 fd7c9a8a2dc8080158b73e57eec8d8f40b13b82d..63edaa4e36b842676a83c9664ff2eb8991689267 100644
index 147681048f24ea75ba7ddb0a019a83703a191e74..aaca5c8007ce8a33ecec0b9ff057c59a4c2778a3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -273,6 +273,11 @@ public class PurpurWorldConfig {
@@ -277,6 +277,11 @@ public class PurpurWorldConfig {
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
}

14
patches/server/0126-Zombie-break-door-minimum-difficulty-option.patch
View File

@@ -44,18 +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 63edaa4e36b842676a83c9664ff2eb8991689267..b69d7eb4f79984123ebbee7de1a2fb0c7ad90655 100644
index aaca5c8007ce8a33ecec0b9ff057c59a4c2778a3..ef742c14be5920db31fb291f1b93b671c5f59e30 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -3,6 +3,7 @@ package net.pl3x.purpur;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.Difficulty;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.Explosion;
@@ -1756,6 +1757,7 @@ public class PurpurWorldConfig {
@@ -1760,6 +1760,7 @@ public class PurpurWorldConfig {
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -63,7 +55,7 @@ index 63edaa4e36b842676a83c9664ff2eb8991689267..b69d7eb4f79984123ebbee7de1a2fb0c
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1770,6 +1772,11 @@ public class PurpurWorldConfig {
@@ -1774,6 +1775,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/0128-Changeable-Mob-Left-Handed-Chance.patch
View File

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

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

@@ -27,10 +27,10 @@ index 045bdac43418ff34381e5908cb666e616c77ece2..d362c9efbad593a7cd7efbcdba4acf14
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 86ae04b462b43c9f7ff4a1c515cf5b8f5b6cd794..e262aaa65dd668ee9279231888282a4cc70d2866 100644
index 3572f04b329be012172451f552df3d0a0aaf72ae..995abae6515eedf4c2737bf9e080b5ed6a541f7f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -335,6 +335,7 @@ public class PurpurWorldConfig {
@@ -338,6 +338,7 @@ public class PurpurWorldConfig {
public boolean useBetterMending = false;
public boolean boatEjectPlayersOnLand = false;
@@ -38,7 +38,7 @@ index 86ae04b462b43c9f7ff4a1c515cf5b8f5b6cd794..e262aaa65dd668ee9279231888282a4c
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesCanUsePortals = true;
public boolean milkCuresBadOmen = true;
@@ -348,6 +349,7 @@ public class PurpurWorldConfig {
@@ -351,6 +352,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/0130-Snow-Golem-rate-of-fire-config.patch
View File

@@ -23,10 +23,10 @@ index 0733f9c057fef17fd79a4769f19b78f4c83a7784..1697b573ffd0c5d17d2d538c40f5ce4b
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 e262aaa65dd668ee9279231888282a4cc70d2866..3308066e65f835bd916d91bfd100e713cd508710 100644
index 995abae6515eedf4c2737bf9e080b5ed6a541f7f..607d569f73e41dafc0c0f0f27fa9e2edbc247626 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1451,6 +1451,10 @@ public class PurpurWorldConfig {
@@ -1454,6 +1454,10 @@ public class PurpurWorldConfig {
public double snowGolemMaxHealth = 4.0D;
public boolean snowGolemDropsPumpkin = true;
public boolean snowGolemPutPumpkinBack = false;
@@ -37,7 +37,7 @@ index e262aaa65dd668ee9279231888282a4cc70d2866..3308066e65f835bd916d91bfd100e713
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1463,6 +1467,10 @@ public class PurpurWorldConfig {
@@ -1466,6 +1470,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

@@ -53,10 +53,10 @@ index 1e05cc98a332e5b115c4670e5331e679117c6629..84142a42111ff03827297c522b7ce164
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 3308066e65f835bd916d91bfd100e713cd508710..d6729a1fd7449dcd6ae57ec52affa059b7a30031 100644
index 607d569f73e41dafc0c0f0f27fa9e2edbc247626..c313fce9497908fcbdff4148f20bbb8ab0d5864b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1624,6 +1624,8 @@ public class PurpurWorldConfig {
@@ -1627,6 +1627,8 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
public int villagerBreedingTicks = 6000;
@@ -65,7 +65,7 @@ index 3308066e65f835bd916d91bfd100e713cd508710..d6729a1fd7449dcd6ae57ec52affa059
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1641,6 +1643,13 @@ public class PurpurWorldConfig {
@@ -1644,6 +1646,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 d6729a1fd7449dcd6ae57ec52affa059b7a30031..37379782788f1c2509c0e1c57a7c6ee760122e8c 100644
index c313fce9497908fcbdff4148f20bbb8ab0d5864b..5cc4a0acf25af20262da4885af7c6119eb134742 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1626,6 +1626,8 @@ public class PurpurWorldConfig {
@@ -1629,6 +1629,8 @@ public class PurpurWorldConfig {
public int villagerBreedingTicks = 6000;
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheck = 60;
@@ -197,7 +197,7 @@ index d6729a1fd7449dcd6ae57ec52affa059b7a30031..37379782788f1c2509c0e1c57a7c6ee7
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1650,6 +1652,8 @@ public class PurpurWorldConfig {
@@ -1653,6 +1655,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 43ef93d2c0c59e0d7021ee9aa2b44345192cc0a9..ce780a2ba7dcbd9c1c9dc24c07387861
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 37379782788f1c2509c0e1c57a7c6ee760122e8c..13ffd0e4d74502e6ae0c638d9e074e29a1804ec9 100644
index 5cc4a0acf25af20262da4885af7c6119eb134742..516e8cde32951fe825865e5814ddbe62d52f86a6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1860,6 +1860,7 @@ public class PurpurWorldConfig {
@@ -1863,6 +1863,7 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinJockeyOnlyBaby = true;
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
@@ -46,7 +46,7 @@ index 37379782788f1c2509c0e1c57a7c6ee760122e8c..13ffd0e4d74502e6ae0c638d9e074e29
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1873,5 +1874,6 @@ public class PurpurWorldConfig {
@@ -1876,5 +1877,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 13ffd0e4d74502e6ae0c638d9e074e29a1804ec9..fef0887d77de7df7b3814147203f4ab18d4f2367 100644
index 516e8cde32951fe825865e5814ddbe62d52f86a6..37ece27cee2202236373ae3031e56869b3f073eb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1747,6 +1747,8 @@ public class PurpurWorldConfig {
@@ -1750,6 +1750,8 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -213,7 +213,7 @@ index 13ffd0e4d74502e6ae0c638d9e074e29a1804ec9..fef0887d77de7df7b3814147203f4ab1
public int wolfBreedingTicks = 6000;
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
@@ -1757,6 +1759,8 @@ public class PurpurWorldConfig {
@@ -1760,6 +1762,8 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

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

@@ -24,18 +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 fef0887d77de7df7b3814147203f4ab18d4f2367..ff97331171f8167a1f0ff86dbf99d19410b917ce 100644
index 37ece27cee2202236373ae3031e56869b3f073eb..ed0f3531e11e5742a6a72acc0cea0bb741505fb6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -4,6 +4,7 @@ import net.minecraft.server.level.ServerLevel;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.Difficulty;
+import net.minecraft.world.item.DyeColor;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.Explosion;
@@ -1747,6 +1748,7 @@ public class PurpurWorldConfig {
@@ -1750,6 +1750,7 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -43,7 +35,7 @@ index fef0887d77de7df7b3814147203f4ab18d4f2367..ff97331171f8167a1f0ff86dbf99d194
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -1759,6 +1761,11 @@ public class PurpurWorldConfig {
@@ -1762,6 +1763,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 c55aba456aa144e58fc35877c61eff309eaa391f..c39e2d05fa81279a684532ee796880b1
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ff97331171f8167a1f0ff86dbf99d19410b917ce..c7248c71ebc08acb0437ee2d9419311984dfad51 100644
index ed0f3531e11e5742a6a72acc0cea0bb741505fb6..8b9955408d846db69268ddf1698009994c3e6cee 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1156,6 +1156,7 @@ public class PurpurWorldConfig {
@@ -1158,6 +1158,7 @@ public class PurpurWorldConfig {
public float phantomFlameDamage = 1.0F;
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
@@ -28,7 +28,7 @@ index ff97331171f8167a1f0ff86dbf99d19410b917ce..c7248c71ebc08acb0437ee2d94193119
public double phantomMaxHealth = 20.0D;
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
@@ -1182,6 +1183,7 @@ public class PurpurWorldConfig {
@@ -1184,6 +1185,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 d980a556785b52fe827310b83638139df0816b11..3c8c02fc92374def12254f7ffad604b2
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 c7248c71ebc08acb0437ee2d9419311984dfad51..44c6e3273dd69022aa66c3fbe100ac8a015083d2 100644
index 8b9955408d846db69268ddf1698009994c3e6cee..c9567e29dcd272e8a5e1cd40ed37beea3ce01a34 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -413,6 +413,11 @@ public class PurpurWorldConfig {
@@ -415,6 +415,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 294f276fa8d2d754abde11ebc3d39e5e68996b05..b3928617f732b49cfc124e9bdb879110
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 44c6e3273dd69022aa66c3fbe100ac8a015083d2..c557ea186824df0777e482ea97b2050ffc0b1023 100644
index c9567e29dcd272e8a5e1cd40ed37beea3ce01a34..4309aff1fed072f63ed466fcd0dfb9872f0e91ea 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1531,6 +1531,7 @@ public class PurpurWorldConfig {
@@ -1533,6 +1533,7 @@ public class PurpurWorldConfig {
public boolean striderRidableInWater = false;
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
@@ -39,7 +39,7 @@ index 44c6e3273dd69022aa66c3fbe100ac8a015083d2..c557ea186824df0777e482ea97b2050f
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1541,6 +1542,7 @@ public class PurpurWorldConfig {
@@ -1543,6 +1544,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 e15155c01b94d2f52182d28bebf2b5db65acdb97..1109abd6ba6eeac9b81d23816efd7319
protected ItemCooldowns createItemCooldowns() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c557ea186824df0777e482ea97b2050ffc0b1023..472a493599a1263dfb0be6167cda164cc02d83e0 100644
index 4309aff1fed072f63ed466fcd0dfb9872f0e91ea..cfff7b76f993d5bf134d1de27052d6e33dd03a66 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -254,6 +254,19 @@ public class PurpurWorldConfig {
@@ -256,6 +256,19 @@ public class PurpurWorldConfig {
villageSiegeSpawning = getBoolean("gameplay-mechanics.mob-spawning.village-sieges", predicate);
}

70
patches/server/0147-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 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad617025e5e 100644
index cfff7b76f993d5bf134d1de27052d6e33dd03a66..5179c9f5d874908e4af64d34f65dac2b50dde50f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -352,9 +352,12 @@ public class PurpurWorldConfig {
@@ -354,9 +354,12 @@ public class PurpurWorldConfig {
public boolean boatsDoFallDamage = true;
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesCanUsePortals = true;
@@ -409,7 +409,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -366,9 +369,12 @@ public class PurpurWorldConfig {
@@ -368,9 +371,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 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
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);
@@ -438,9 +444,11 @@ public class PurpurWorldConfig {
@@ -440,9 +446,11 @@ public class PurpurWorldConfig {
dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
}
@@ -434,7 +434,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
farmlandAlpha = getBoolean("blocks.farmland.use-alpha-farmland", farmlandAlpha);
}
@@ -466,6 +474,11 @@ public class PurpurWorldConfig {
@@ -468,6 +476,11 @@ public class PurpurWorldConfig {
kelpMaxGrowthAge = getInt("blocks.kelp.max-growth-age", kelpMaxGrowthAge);
}
@@ -446,7 +446,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
public boolean respawnAnchorExplode = true;
public double respawnAnchorExplosionPower = 5.0D;
public boolean respawnAnchorExplosionFire = true;
@@ -499,6 +512,11 @@ public class PurpurWorldConfig {
@@ -501,6 +514,11 @@ public class PurpurWorldConfig {
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
}
@@ -458,7 +458,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
public double twistingVinesGrowthModifier = 0.10D;
public int twistingVinesMaxGrowthAge = 25;
private void twistingVinesSettings() {
@@ -677,6 +695,7 @@ public class PurpurWorldConfig {
@@ -679,6 +697,7 @@ public class PurpurWorldConfig {
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
public boolean creeperAllowGriefing = true;
@@ -466,7 +466,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -688,6 +707,7 @@ public class PurpurWorldConfig {
@@ -690,6 +709,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 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
}
public boolean dolphinRidable = false;
@@ -775,6 +795,7 @@ public class PurpurWorldConfig {
@@ -777,6 +797,7 @@ public class PurpurWorldConfig {
public double enderDragonMaxY = 256D;
public double enderDragonMaxHealth = 200.0D;
public boolean enderDragonAlwaysDropsFullExp = false;
@@ -482,7 +482,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -790,6 +811,7 @@ public class PurpurWorldConfig {
@@ -792,6 +813,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 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
}
public boolean endermanRidable = false;
@@ -797,6 +819,7 @@ public class PurpurWorldConfig {
@@ -799,6 +821,7 @@ public class PurpurWorldConfig {
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
@@ -498,7 +498,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -808,6 +831,7 @@ public class PurpurWorldConfig {
@@ -810,6 +833,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 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
}
public boolean endermiteRidable = false;
@@ -827,6 +851,7 @@ public class PurpurWorldConfig {
@@ -829,6 +853,7 @@ public class PurpurWorldConfig {
public boolean evokerRidable = false;
public boolean evokerRidableInWater = false;
public double evokerMaxHealth = 24.0D;
@@ -514,7 +514,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
private void evokerSettings() {
evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
@@ -836,6 +861,7 @@ public class PurpurWorldConfig {
@@ -838,6 +863,7 @@ public class PurpurWorldConfig {
set("mobs.evoker.attributes.max_health", oldValue);
}
evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
@@ -522,7 +522,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
}
public boolean foxRidable = false;
@@ -843,6 +869,7 @@ public class PurpurWorldConfig {
@@ -845,6 +871,7 @@ public class PurpurWorldConfig {
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
public int foxBreedingTicks = 6000;
@@ -530,7 +530,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -854,6 +881,7 @@ public class PurpurWorldConfig {
@@ -856,6 +883,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 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
}
public boolean ghastRidable = false;
@@ -1249,6 +1277,7 @@ public class PurpurWorldConfig {
@@ -1251,6 +1279,7 @@ public class PurpurWorldConfig {
public boolean piglinRidable = false;
public boolean piglinRidableInWater = false;
public double piglinMaxHealth = 16.0D;
@@ -546,7 +546,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1258,6 +1287,7 @@ public class PurpurWorldConfig {
@@ -1260,6 +1289,7 @@ public class PurpurWorldConfig {
set("mobs.piglin.attributes.max_health", oldValue);
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -554,7 +554,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
}
public boolean piglinBruteRidable = false;
@@ -1277,6 +1307,7 @@ public class PurpurWorldConfig {
@@ -1279,6 +1309,7 @@ public class PurpurWorldConfig {
public boolean pillagerRidable = false;
public boolean pillagerRidableInWater = false;
public double pillagerMaxHealth = 24.0D;
@@ -562,7 +562,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1286,6 +1317,7 @@ public class PurpurWorldConfig {
@@ -1288,6 +1319,7 @@ public class PurpurWorldConfig {
set("mobs.pillager.attributes.max_health", oldValue);
}
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -570,7 +570,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
}
public boolean polarBearRidable = false;
@@ -1327,6 +1359,7 @@ public class PurpurWorldConfig {
@@ -1329,6 +1361,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -578,7 +578,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1339,11 +1372,13 @@ public class PurpurWorldConfig {
@@ -1341,11 +1374,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 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1353,6 +1388,7 @@ public class PurpurWorldConfig {
@@ -1355,6 +1390,7 @@ public class PurpurWorldConfig {
set("mobs.ravager.attributes.max_health", oldValue);
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -600,7 +600,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
}
public boolean salmonRidable = false;
@@ -1371,6 +1407,7 @@ public class PurpurWorldConfig {
@@ -1373,6 +1409,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
@@ -608,7 +608,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1381,6 +1418,7 @@ public class PurpurWorldConfig {
@@ -1383,6 +1420,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 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
}
public boolean shulkerRidable = false;
@@ -1400,6 +1438,7 @@ public class PurpurWorldConfig {
@@ -1402,6 +1440,7 @@ public class PurpurWorldConfig {
public boolean silverfishRidable = false;
public boolean silverfishRidableInWater = false;
public double silverfishMaxHealth = 8.0D;
@@ -624,7 +624,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1409,6 +1448,7 @@ public class PurpurWorldConfig {
@@ -1411,6 +1450,7 @@ public class PurpurWorldConfig {
set("mobs.silverfish.attributes.max_health", oldValue);
}
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -632,7 +632,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
}
public boolean skeletonRidable = false;
@@ -1476,6 +1516,7 @@ public class PurpurWorldConfig {
@@ -1478,6 +1518,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -640,7 +640,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1492,6 +1533,7 @@ public class PurpurWorldConfig {
@@ -1494,6 +1535,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 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
}
public boolean squidRidable = false;
@@ -1651,6 +1693,7 @@ public class PurpurWorldConfig {
@@ -1653,6 +1695,7 @@ public class PurpurWorldConfig {
public int villagerLobotomizeCheck = 60;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -656,7 +656,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1677,6 +1720,7 @@ public class PurpurWorldConfig {
@@ -1679,6 +1722,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 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
}
public boolean vindicatorRidable = false;
@@ -1733,6 +1777,7 @@ public class PurpurWorldConfig {
@@ -1735,6 +1779,7 @@ public class PurpurWorldConfig {
public double witherMaxHealth = 300.0D;
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
@@ -672,7 +672,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1749,6 +1794,7 @@ public class PurpurWorldConfig {
@@ -1751,6 +1796,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 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
}
public boolean witherSkeletonRidable = false;
@@ -1816,6 +1862,7 @@ public class PurpurWorldConfig {
@@ -1818,6 +1864,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD;
@@ -688,7 +688,7 @@ index 472a493599a1263dfb0be6167cda164cc02d83e0..8f6589574f8ff7e2ad6676611e6a6ad6
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1835,6 +1882,7 @@ public class PurpurWorldConfig {
@@ -1837,6 +1884,7 @@ public class PurpurWorldConfig {
} catch (IllegalArgumentException ignore) {
zombieBreakDoorMinDifficulty = Difficulty.HARD;
}

6
patches/server/0148-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 8f6589574f8ff7e2ad6676611e6a6ad617025e5e..7c15dd5766ffadc0a9bfaf8212fe1e461a37b081 100644
index 5179c9f5d874908e4af64d34f65dac2b50dde50f..e443db4ef1e5d747533659fbb7f86006e0ebdf73 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -355,6 +355,7 @@ public class PurpurWorldConfig {
@@ -357,6 +357,7 @@ public class PurpurWorldConfig {
public boolean entitiesPickUpLootBypassMobGriefing = false;
public boolean fireballsBypassMobGriefing = false;
public boolean milkCuresBadOmen = true;
@@ -33,7 +33,7 @@ index 8f6589574f8ff7e2ad6676611e6a6ad617025e5e..7c15dd5766ffadc0a9bfaf8212fe1e46
public boolean persistentTileEntityDisplayNames = false;
public boolean persistentDroppableEntityDisplayNames = false;
public boolean projectilesBypassMobGriefing = false;
@@ -372,6 +373,7 @@ public class PurpurWorldConfig {
@@ -374,6 +375,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/0149-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 7c15dd5766ffadc0a9bfaf8212fe1e461a37b081..9501cae78f17fabbc61cdf63621997f5f6f96110 100644
index e443db4ef1e5d747533659fbb7f86006e0ebdf73..830077db284376d2ab5987a059d609f160765e03 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 {
@@ -356,6 +356,7 @@ public class PurpurWorldConfig {
public boolean entitiesCanUsePortals = true;
public boolean entitiesPickUpLootBypassMobGriefing = false;
public boolean fireballsBypassMobGriefing = false;
@@ -89,7 +89,7 @@ index 7c15dd5766ffadc0a9bfaf8212fe1e461a37b081..9501cae78f17fabbc61cdf63621997f5
public boolean milkCuresBadOmen = true;
public boolean noteBlockIgnoreAbove = false;
public boolean persistentTileEntityDisplayNames = false;
@@ -372,6 +373,7 @@ public class PurpurWorldConfig {
@@ -374,6 +375,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/0151-Farmland-trampling-changes.patch
View File

@@ -37,10 +37,10 @@ index aad204181c4f54ee533bfe3fc04a8705b847e371..16eb80e7926cf4fe421c17d7d851d457
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 9501cae78f17fabbc61cdf63621997f5f6f96110..68dde603c638bd19b37e6795b1ace4e122bd9110 100644
index 830077db284376d2ab5987a059d609f160765e03..d360245d421adf0972573a455d00f5b3e1ae46cb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -451,10 +451,16 @@ public class PurpurWorldConfig {
@@ -453,10 +453,16 @@ public class PurpurWorldConfig {
public boolean farmlandBypassMobGriefing = false;
public boolean farmlandGetsMoistFromBelow = false;
public boolean farmlandAlpha = false;

4
patches/server/0152-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 68dde603c638bd19b37e6795b1ace4e122bd9110..5826c389fc8febc5c25458f1458d90eb351207ec 100644
index d360245d421adf0972573a455d00f5b3e1ae46cb..20ba8faadf79fe8edf18a37579dcda791ea91fa1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -90,10 +90,16 @@ public class PurpurWorldConfig {
@@ -92,10 +92,16 @@ public class PurpurWorldConfig {
public float armorstandStepHeight = 0.0F;
public boolean armorstandSetNameVisible = false;
public boolean armorstandFixNametags = false;

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

@@ -37,10 +37,10 @@ index e3d6be3c3ac94b683acfdba9b1feea88f80c5707..158691a1912155390751698a833b1375
this.isInsidePortal = true;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5826c389fc8febc5c25458f1458d90eb351207ec..3d4f3ea65836ae44eb91468b43a7cdbf08140b6f 100644
index 20ba8faadf79fe8edf18a37579dcda791ea91fa1..13cf662db2278b321ad9c66b94a440fe3587cf57 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -283,6 +283,7 @@ public class PurpurWorldConfig {
@@ -285,6 +285,7 @@ public class PurpurWorldConfig {
public int playerDeathExpDropMax = 100;
public boolean teleportIfOutsideBorder = false;
public boolean totemOfUndyingWorksInInventory = false;
@@ -48,7 +48,7 @@ index 5826c389fc8febc5c25458f1458d90eb351207ec..3d4f3ea65836ae44eb91468b43a7cdbf
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -294,6 +295,7 @@ public class PurpurWorldConfig {
@@ -296,6 +297,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