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

Fix #462 - also renamed option for clarity

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-03 08:00:18 -05:00
parent 1ca029cdcc
commit c69c0bcadf
46 changed files with 225 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0003-Purpur-config-files.patch
View File

@@ -122,7 +122,7 @@ index 8196be52af4a5ea1bf280d646dc2db15d9ad6ea2..beb845128b0ef8eef254afa7141af280
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..1d76057b1b2dc9f0fc8e3fe5a5f6bfee23128007
index 0000000000000000000000000000000000000000..fcf5f32c32eb17f7580b3c8c9190e36725f793ad
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,157 @@
@@ -187,8 +187,8 @@ index 0000000000000000000000000000000000000000..1d76057b1b2dc9f0fc8e3fe5a5f6bfee
+ commands = new HashMap<>();
+ commands.put("purpur", new PurpurCommand("purpur"));
+
+ version = getInt("config-version", 16);
+ set("config-version", 16);
+ version = getInt("config-version", 17);
+ set("config-version", 17);
+
+ readConfig(PurpurConfig.class, null);
+ }

38
patches/server/0116-Infinite-fuel-furnace.patch → patches/server/0116-Furnace-uses-lava-from-underneath.patch
View File

@@ -1,11 +1,11 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Mon, 19 Oct 2020 15:14:01 -0500
Subject: [PATCH] Infinite fuel furnace
Subject: [PATCH] Furnace uses lava from underneath
diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
index 348e485897c34cca19113cc35f055a58778ca38b..1eab83cefdf1484b8cf80072d9a0ee61dea4fd6c 100644
index 348e485897c34cca19113cc35f055a58778ca38b..fb3f7e821224889b08c0f424d79e122cba9d0645 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
@@ -40,6 +40,7 @@ import net.minecraft.world.level.Level;
@@ -21,16 +21,16 @@ index 348e485897c34cca19113cc35f055a58778ca38b..1eab83cefdf1484b8cf80072d9a0ee61
ItemStack itemstack = (ItemStack) blockEntity.items.get(1);
+ // Purpur start
+ boolean infiniteFuel = false;
+ if (world.purpurConfig.furnaceInfiniteFuel && !blockEntity.isLit() && itemstack.isEmpty() && !blockEntity.items.get(0).isEmpty() && world.getGameTime() % 20 == 0) {
+ BlockPos position = blockEntity.getBlockPos().below();
+ BlockState blockState = world.getTypeIfLoaded(pos);
+ if (blockState != null && blockState.is(Blocks.LAVA)) {
+ FluidState fluid = state.getFluidState();
+ if (fluid != null && fluid.isSource()) {
+ world.setBlock(pos, Blocks.AIR.defaultBlockState(), 3);
+ boolean usedLavaFromUnderneath = false;
+ if (world.purpurConfig.furnaceUseLavaFromUnderneath && !blockEntity.isLit() && itemstack.isEmpty() && !blockEntity.items.get(0).isEmpty() && world.getGameTime() % 20 == 0) {
+ BlockPos below = blockEntity.getBlockPos().below();
+ BlockState belowState = world.getTypeIfLoaded(below);
+ if (belowState != null && belowState.is(Blocks.LAVA)) {
+ FluidState fluidState = belowState.getFluidState();
+ if (fluidState != null && fluidState.isSource()) {
+ world.setBlock(below, Blocks.AIR.defaultBlockState(), 3);
+ itemstack = Items.LAVA_BUCKET.getDefaultInstance();
+ infiniteFuel = true;
+ usedLavaFromUnderneath = true;
+ }
+ }
+ }
@@ -43,21 +43,27 @@ index 348e485897c34cca19113cc35f055a58778ca38b..1eab83cefdf1484b8cf80072d9a0ee61
setChanged(world, pos, state);
}
+ if (infiniteFuel) blockEntity.items.set(1, ItemStack.EMPTY); // Purpur
+ if (usedLavaFromUnderneath) blockEntity.items.set(1, ItemStack.EMPTY); // Purpur
}
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 e23b646a5f2661a26e069021bebaa06706185d80..8131cbb602e809770acbdb32a78b2ca36f310689 100644
index e23b646a5f2661a26e069021bebaa06706185d80..48de223ccbe114cbada5964535ea2bf6ffff18fe 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -412,6 +412,11 @@ public class PurpurWorldConfig {
@@ -412,6 +412,17 @@ public class PurpurWorldConfig {
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
}
+ public boolean furnaceInfiniteFuel = false;
+ public boolean furnaceUseLavaFromUnderneath = false;
+ private void furnaceSettings() {
+ furnaceInfiniteFuel = getBoolean("blocks.furnace.infinite-fuel", furnaceInfiniteFuel);
+ if (PurpurConfig.version < 17) {
+ furnaceUseLavaFromUnderneath = getBoolean("blocks.furnace.infinite-fuel", furnaceUseLavaFromUnderneath);
+ boolean oldValue = getBoolean("blocks.furnace.infinite-fuel", furnaceUseLavaFromUnderneath);
+ set("blocks.furnace.infinite-fuel", null);
+ set("blocks.furnace.use-lava-from-underneath", oldValue);
+ }
+ furnaceUseLavaFromUnderneath = getBoolean("blocks.furnace.use-lava-from-underneath", furnaceUseLavaFromUnderneath);
+ }
+
public boolean lavaInfinite = false;

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

@@ -24,7 +24,7 @@ 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 8131cbb602e809770acbdb32a78b2ca36f310689..a87f6bc71dfa8f5f98f592e13152a5a8384a445d 100644
index 48de223ccbe114cbada5964535ea2bf6ffff18fe..5da65533393bde613635969e5333749a03a04a3b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -408,8 +408,10 @@ public class PurpurWorldConfig {
@@ -37,4 +37,4 @@ index 8131cbb602e809770acbdb32a78b2ca36f310689..a87f6bc71dfa8f5f98f592e13152a5a8
+ farmlandAlpha = getBoolean("blocks.farmland.use-alpha-farmland", farmlandAlpha);
}
public boolean furnaceInfiniteFuel = false;
public boolean furnaceUseLavaFromUnderneath = false;

90
patches/server/0120-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 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07455bff74 100644
index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e0632db088a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -476,9 +476,11 @@ public class PurpurWorldConfig {
@@ -482,9 +482,11 @@ public class PurpurWorldConfig {
public boolean axolotlRidable = false;
public double axolotlMaxHealth = 14.0D;
@@ -489,7 +489,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean batRidable = false;
@@ -508,6 +510,7 @@ public class PurpurWorldConfig {
@@ -514,6 +516,7 @@ public class PurpurWorldConfig {
public boolean beeRidableInWater = false;
public double beeMaxY = 256D;
public double beeMaxHealth = 10.0D;
@@ -497,7 +497,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -518,6 +521,7 @@ public class PurpurWorldConfig {
@@ -524,6 +527,7 @@ public class PurpurWorldConfig {
set("mobs.bee.attributes.max_health", oldValue);
}
beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
@@ -505,7 +505,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean blazeRidable = false;
@@ -542,6 +546,7 @@ public class PurpurWorldConfig {
@@ -548,6 +552,7 @@ public class PurpurWorldConfig {
public int catSpawnDelay = 1200;
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
@@ -513,7 +513,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -554,6 +559,7 @@ public class PurpurWorldConfig {
@@ -560,6 +565,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 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean caveSpiderRidable = false;
@@ -574,6 +580,7 @@ public class PurpurWorldConfig {
@@ -580,6 +586,7 @@ public class PurpurWorldConfig {
public boolean chickenRidableInWater = false;
public double chickenMaxHealth = 4.0D;
public boolean chickenRetaliate = false;
@@ -529,7 +529,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -584,6 +591,7 @@ public class PurpurWorldConfig {
@@ -590,6 +597,7 @@ public class PurpurWorldConfig {
}
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
@@ -537,7 +537,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean codRidable = false;
@@ -602,6 +610,7 @@ public class PurpurWorldConfig {
@@ -608,6 +616,7 @@ public class PurpurWorldConfig {
public boolean cowRidableInWater = false;
public double cowMaxHealth = 10.0D;
public int cowFeedMushrooms = 0;
@@ -545,7 +545,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -612,6 +621,7 @@ public class PurpurWorldConfig {
@@ -618,6 +627,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 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean creeperRidable = false;
@@ -659,6 +669,7 @@ public class PurpurWorldConfig {
@@ -665,6 +675,7 @@ public class PurpurWorldConfig {
public double donkeyJumpStrengthMax = 0.5D;
public double donkeyMovementSpeedMin = 0.175D;
public double donkeyMovementSpeedMax = 0.175D;
@@ -561,7 +561,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
if (PurpurConfig.version < 10) {
@@ -674,6 +685,7 @@ public class PurpurWorldConfig {
@@ -680,6 +691,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 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean drownedRidable = false;
@@ -780,6 +792,7 @@ public class PurpurWorldConfig {
@@ -786,6 +798,7 @@ public class PurpurWorldConfig {
public boolean foxRidableInWater = false;
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
@@ -577,7 +577,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -790,6 +803,7 @@ public class PurpurWorldConfig {
@@ -796,6 +809,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 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean ghastRidable = false;
@@ -850,10 +864,12 @@ public class PurpurWorldConfig {
@@ -856,10 +870,12 @@ public class PurpurWorldConfig {
public boolean goatRidable = false;
public boolean goatRidableInWater = false;
public double goatMaxHealth = 10.0D;
@@ -598,7 +598,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean guardianRidable = false;
@@ -871,6 +887,7 @@ public class PurpurWorldConfig {
@@ -877,6 +893,7 @@ public class PurpurWorldConfig {
public boolean hoglinRidable = false;
public boolean hoglinRidableInWater = false;
public double hoglinMaxHealth = 40.0D;
@@ -606,7 +606,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void hoglinSettings() {
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
@@ -880,6 +897,7 @@ public class PurpurWorldConfig {
@@ -886,6 +903,7 @@ public class PurpurWorldConfig {
set("mobs.hoglin.attributes.max_health", oldValue);
}
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
@@ -614,7 +614,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean horseRidableInWater = false;
@@ -889,6 +907,7 @@ public class PurpurWorldConfig {
@@ -895,6 +913,7 @@ public class PurpurWorldConfig {
public double horseJumpStrengthMax = 1.0D;
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
@@ -622,7 +622,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -904,6 +923,7 @@ public class PurpurWorldConfig {
@@ -910,6 +929,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 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean huskRidable = false;
@@ -974,6 +994,7 @@ public class PurpurWorldConfig {
@@ -980,6 +1000,7 @@ public class PurpurWorldConfig {
public double llamaJumpStrengthMax = 0.5D;
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
@@ -638,7 +638,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -990,6 +1011,7 @@ public class PurpurWorldConfig {
@@ -996,6 +1017,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 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean magmaCubeRidable = false;
@@ -1009,6 +1031,7 @@ public class PurpurWorldConfig {
@@ -1015,6 +1037,7 @@ public class PurpurWorldConfig {
public boolean mooshroomRidable = false;
public boolean mooshroomRidableInWater = false;
public double mooshroomMaxHealth = 10.0D;
@@ -654,7 +654,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1018,6 +1041,7 @@ public class PurpurWorldConfig {
@@ -1024,6 +1047,7 @@ public class PurpurWorldConfig {
set("mobs.mooshroom.attributes.max_health", oldValue);
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -662,7 +662,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean muleRidableInWater = false;
@@ -1027,6 +1051,7 @@ public class PurpurWorldConfig {
@@ -1033,6 +1057,7 @@ public class PurpurWorldConfig {
public double muleJumpStrengthMax = 0.5D;
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
@@ -670,7 +670,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1042,11 +1067,13 @@ public class PurpurWorldConfig {
@@ -1048,11 +1073,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 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1056,11 +1083,13 @@ public class PurpurWorldConfig {
@@ -1062,11 +1089,13 @@ public class PurpurWorldConfig {
set("mobs.ocelot.attributes.max_health", oldValue);
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -698,7 +698,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1070,6 +1099,7 @@ public class PurpurWorldConfig {
@@ -1076,6 +1105,7 @@ public class PurpurWorldConfig {
set("mobs.panda.attributes.max_health", oldValue);
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -706,7 +706,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean parrotRidable = false;
@@ -1150,6 +1180,7 @@ public class PurpurWorldConfig {
@@ -1156,6 +1186,7 @@ public class PurpurWorldConfig {
public boolean pigRidableInWater = false;
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
@@ -714,7 +714,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1160,6 +1191,7 @@ public class PurpurWorldConfig {
@@ -1166,6 +1197,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 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean piglinRidable = false;
@@ -1209,6 +1241,7 @@ public class PurpurWorldConfig {
@@ -1215,6 +1247,7 @@ public class PurpurWorldConfig {
public double polarBearMaxHealth = 30.0D;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -730,7 +730,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1221,6 +1254,7 @@ public class PurpurWorldConfig {
@@ -1227,6 +1260,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 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean pufferfishRidable = false;
@@ -1240,6 +1274,7 @@ public class PurpurWorldConfig {
@@ -1246,6 +1280,7 @@ public class PurpurWorldConfig {
public double rabbitMaxHealth = 3.0D;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -746,7 +746,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1251,6 +1286,7 @@ public class PurpurWorldConfig {
@@ -1257,6 +1292,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 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean ravagerRidable = false;
@@ -1282,6 +1318,7 @@ public class PurpurWorldConfig {
@@ -1288,6 +1324,7 @@ public class PurpurWorldConfig {
public boolean sheepRidable = false;
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
@@ -762,7 +762,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1291,6 +1328,7 @@ public class PurpurWorldConfig {
@@ -1297,6 +1334,7 @@ public class PurpurWorldConfig {
set("mobs.sheep.attributes.max_health", oldValue);
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -770,7 +770,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean shulkerRidable = false;
@@ -1445,6 +1483,7 @@ public class PurpurWorldConfig {
@@ -1451,6 +1489,7 @@ public class PurpurWorldConfig {
public boolean striderRidable = false;
public boolean striderRidableInWater = false;
public double striderMaxHealth = 20.0D;
@@ -778,7 +778,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1454,6 +1493,7 @@ public class PurpurWorldConfig {
@@ -1460,6 +1499,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -786,7 +786,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean traderLlamaRidable = false;
@@ -1464,6 +1504,7 @@ public class PurpurWorldConfig {
@@ -1470,6 +1510,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -794,7 +794,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1480,6 +1521,7 @@ public class PurpurWorldConfig {
@@ -1486,6 +1527,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 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean tropicalFishRidable = false;
@@ -1500,6 +1542,7 @@ public class PurpurWorldConfig {
@@ -1506,6 +1548,7 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromExpOrbs = true;
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;
@@ -810,7 +810,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void turtleEggSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1512,6 +1555,7 @@ public class PurpurWorldConfig {
@@ -1518,6 +1561,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 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean vexRidable = false;
@@ -1540,6 +1584,7 @@ public class PurpurWorldConfig {
@@ -1546,6 +1590,7 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
@@ -826,7 +826,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1556,6 +1601,7 @@ public class PurpurWorldConfig {
@@ -1562,6 +1607,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 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
}
public boolean vindicatorRidable = false;
@@ -1649,6 +1695,7 @@ public class PurpurWorldConfig {
@@ -1655,6 +1701,7 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -842,7 +842,7 @@ index 4dcff94e8ccf1af911be322c04871b8d561f60ca..f40cc359bb7f68e3332014c43c747b07
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1658,6 +1705,7 @@ public class PurpurWorldConfig {
@@ -1664,6 +1711,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

4
patches/server/0123-Add-twisting-and-weeping-vines-growth-rates.patch
View File

@@ -82,7 +82,7 @@ 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 bc5b6c99697fd8fc31d5ec545756fa1d7a161176..97c50c0d0f2f5466f56f32afd544c7d85181d20e 100644
index a251595d3a495867717305e88f60d9c6acf90021..b82fc63a86174cc1f75068d23a2fb3c92b807e88 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -408,6 +408,11 @@ public class PurpurWorldConfig {
@@ -97,7 +97,7 @@ index bc5b6c99697fd8fc31d5ec545756fa1d7a161176..97c50c0d0f2f5466f56f32afd544c7d8
public boolean dispenserApplyCursedArmor = true;
public boolean dispenserPlaceAnvils = false;
private void dispenserSettings() {
@@ -471,6 +476,16 @@ public class PurpurWorldConfig {
@@ -477,6 +482,16 @@ public class PurpurWorldConfig {
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
}

6
patches/server/0124-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
View File

@@ -103,7 +103,7 @@ 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 97c50c0d0f2f5466f56f32afd544c7d85181d20e..241377857a5ba67b22300b1be407c8322b089f52 100644
index b82fc63a86174cc1f75068d23a2fb3c92b807e88..e272136f138613cdd792d5b42eb9d3647d149270 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -409,8 +409,10 @@ public class PurpurWorldConfig {
@@ -117,7 +117,7 @@ index 97c50c0d0f2f5466f56f32afd544c7d85181d20e..241377857a5ba67b22300b1be407c832
}
public boolean dispenserApplyCursedArmor = true;
@@ -443,6 +445,11 @@ public class PurpurWorldConfig {
@@ -449,6 +451,11 @@ public class PurpurWorldConfig {
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
}
@@ -129,7 +129,7 @@ index 97c50c0d0f2f5466f56f32afd544c7d85181d20e..241377857a5ba67b22300b1be407c832
public boolean respawnAnchorExplode = true;
public double respawnAnchorExplosionPower = 5.0D;
public boolean respawnAnchorExplosionFire = true;
@@ -477,13 +484,17 @@ public class PurpurWorldConfig {
@@ -483,13 +490,17 @@ public class PurpurWorldConfig {
}
public double twistingVinesGrowthModifier = 0.10D;

6
patches/server/0125-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 241377857a5ba67b22300b1be407c8322b089f52..b38a2ed581653fcd17995a66fb509a449390bc02 100644
index e272136f138613cdd792d5b42eb9d3647d149270..fd380a51f0b84bcced096defc37b2e0f6222cfe9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -780,6 +780,7 @@ public class PurpurWorldConfig {
@@ -786,6 +786,7 @@ public class PurpurWorldConfig {
public boolean endermanRidableInWater = false;
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
@@ -32,7 +32,7 @@ index 241377857a5ba67b22300b1be407c8322b089f52..b38a2ed581653fcd17995a66fb509a44
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -790,6 +791,7 @@ public class PurpurWorldConfig {
@@ -796,6 +797,7 @@ public class PurpurWorldConfig {
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);

6
patches/server/0128-Zombie-break-door-minimum-difficulty-option.patch
View File

@@ -44,10 +44,10 @@ index fe045f8e35fe2aac51032a67ce52b27a53a8eff0..03bc86c776596ca5964c22adb757115d
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5628b807c63f371c2fddf544b24bd31d5a7fb452..7658c497c374412df0b862c520036d9916d7a845 100644
index e18da294f2eb93a956c7006466aaebb2fd0f8ca3..d179d46ac3120e644b5f67b1867f6ae0a5c3cae5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1769,6 +1769,7 @@ public class PurpurWorldConfig {
@@ -1775,6 +1775,7 @@ public class PurpurWorldConfig {
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -55,7 +55,7 @@ index 5628b807c63f371c2fddf544b24bd31d5a7fb452..7658c497c374412df0b862c520036d99
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1783,6 +1784,11 @@ public class PurpurWorldConfig {
@@ -1789,6 +1790,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);

6
patches/server/0132-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 9ca45be8960b08368057f2a1adae2fb7dea1346b..4cdb6bbd43dad2e5e2504373cd50304dfc8cc28b 100644
index 743c8fe9fa34b6e1fc8f46cde000295001704599..491fe8f19ae497cd1fd75b087ce08c74739c4df7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1463,6 +1463,10 @@ public class PurpurWorldConfig {
@@ -1469,6 +1469,10 @@ public class PurpurWorldConfig {
public double snowGolemMaxHealth = 4.0D;
public boolean snowGolemDropsPumpkin = true;
public boolean snowGolemPutPumpkinBack = false;
@@ -37,7 +37,7 @@ index 9ca45be8960b08368057f2a1adae2fb7dea1346b..4cdb6bbd43dad2e5e2504373cd50304d
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1475,6 +1479,10 @@ public class PurpurWorldConfig {
@@ -1481,6 +1485,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/0135-Lobotomize-stuck-villagers.patch
View File

@@ -53,10 +53,10 @@ index bb3572370a86519a92b7b3dab0482cd1527de19d..9a460eeb48c14590d28d071cfa5a9251
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 4cdb6bbd43dad2e5e2504373cd50304dfc8cc28b..9deea399542b17539db47dcfad778bafe57f0fd1 100644
index 491fe8f19ae497cd1fd75b087ce08c74739c4df7..716b982d6a6030328988989f1a9919b13a4c090f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1636,6 +1636,8 @@ public class PurpurWorldConfig {
@@ -1642,6 +1642,8 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
public int villagerBreedingTicks = 6000;
@@ -65,7 +65,7 @@ index 4cdb6bbd43dad2e5e2504373cd50304dfc8cc28b..9deea399542b17539db47dcfad778baf
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1653,6 +1655,13 @@ public class PurpurWorldConfig {
@@ -1659,6 +1661,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/0136-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 9deea399542b17539db47dcfad778bafe57f0fd1..46370a67f9da9f62949249fb00b74f33b51685e5 100644
index 716b982d6a6030328988989f1a9919b13a4c090f..75df5d23c72b557bd3827f96dd4db75b8def9c9d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1638,6 +1638,8 @@ public class PurpurWorldConfig {
@@ -1644,6 +1644,8 @@ public class PurpurWorldConfig {
public int villagerBreedingTicks = 6000;
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheck = 60;
@@ -197,7 +197,7 @@ index 9deea399542b17539db47dcfad778bafe57f0fd1..46370a67f9da9f62949249fb00b74f33
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1662,6 +1664,8 @@ public class PurpurWorldConfig {
@@ -1668,6 +1670,8 @@ public class PurpurWorldConfig {
}
villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck);

6
patches/server/0137-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 46370a67f9da9f62949249fb00b74f33b51685e5..5da92d2fba132cf48cd726da54fa51c487d434e0 100644
index 75df5d23c72b557bd3827f96dd4db75b8def9c9d..2db665335028ea92d918862ff378905ded13a8bf 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1872,6 +1872,7 @@ public class PurpurWorldConfig {
@@ -1878,6 +1878,7 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinJockeyOnlyBaby = true;
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
@@ -46,7 +46,7 @@ index 46370a67f9da9f62949249fb00b74f33b51685e5..5da92d2fba132cf48cd726da54fa51c4
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1885,5 +1886,6 @@ public class PurpurWorldConfig {
@@ -1891,5 +1892,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/0139-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 5da92d2fba132cf48cd726da54fa51c487d434e0..3250e597d9cf9a7d9d98ed728049169786f94c71 100644
index 2db665335028ea92d918862ff378905ded13a8bf..6a66297871fae48c47aa8dd5bcef18e879d62b0f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1759,6 +1759,8 @@ public class PurpurWorldConfig {
@@ -1765,6 +1765,8 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -213,7 +213,7 @@ index 5da92d2fba132cf48cd726da54fa51c487d434e0..3250e597d9cf9a7d9d98ed7280491697
public int wolfBreedingTicks = 6000;
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
@@ -1769,6 +1771,8 @@ public class PurpurWorldConfig {
@@ -1775,6 +1777,8 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

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

@@ -24,10 +24,10 @@ index 3e7409ebf1f94b9cf55f2d0b0fe17ca8ec44659f..518dd0e6b4889c049e438b393baa795a
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3250e597d9cf9a7d9d98ed728049169786f94c71..e4b61a59f497eb7749883e67a05303c457f8fb44 100644
index 6a66297871fae48c47aa8dd5bcef18e879d62b0f..c6daa9720fb1b2b692d1c752f0e9dd6fb092c0a8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1759,6 +1759,7 @@ public class PurpurWorldConfig {
@@ -1765,6 +1765,7 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -35,7 +35,7 @@ index 3250e597d9cf9a7d9d98ed728049169786f94c71..e4b61a59f497eb7749883e67a05303c4
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -1771,6 +1772,11 @@ public class PurpurWorldConfig {
@@ -1777,6 +1778,11 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

6
patches/server/0141-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 e4b61a59f497eb7749883e67a05303c457f8fb44..97e3ac74041572bbb34e5327133eb3249b334f6a 100644
index c6daa9720fb1b2b692d1c752f0e9dd6fb092c0a8..3e473dd83f7552155f58b7ab623b06464ac2010d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1167,6 +1167,7 @@ public class PurpurWorldConfig {
@@ -1173,6 +1173,7 @@ public class PurpurWorldConfig {
public float phantomFlameDamage = 1.0F;
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
@@ -28,7 +28,7 @@ index e4b61a59f497eb7749883e67a05303c457f8fb44..97e3ac74041572bbb34e5327133eb324
public double phantomMaxHealth = 20.0D;
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
@@ -1193,6 +1194,7 @@ public class PurpurWorldConfig {
@@ -1199,6 +1200,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);

6
patches/server/0144-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 675bf59fc4762f2675cd17cc2429e297da8d458e..2b7e0928ef466157cc701f9f919ac72a4c3558ee 100644
index 0ff62f81db0f771a5d6340158cc1d1dc3641361e..73fec55dec19bdb6a2c6c2302dc7776a7f1a859a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1542,6 +1542,7 @@ public class PurpurWorldConfig {
@@ -1548,6 +1548,7 @@ public class PurpurWorldConfig {
public boolean striderRidableInWater = false;
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
@@ -39,7 +39,7 @@ index 675bf59fc4762f2675cd17cc2429e297da8d458e..2b7e0928ef466157cc701f9f919ac72a
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1552,6 +1553,7 @@ public class PurpurWorldConfig {
@@ -1558,6 +1559,7 @@ public class PurpurWorldConfig {
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);

64
patches/server/0149-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -393,7 +393,7 @@ 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 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d092fb96cc 100644
index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa73759e8b656 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -363,9 +363,12 @@ public class PurpurWorldConfig {
@@ -434,7 +434,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
farmlandAlpha = getBoolean("blocks.farmland.use-alpha-farmland", farmlandAlpha);
}
@@ -477,6 +485,11 @@ public class PurpurWorldConfig {
@@ -483,6 +491,11 @@ public class PurpurWorldConfig {
kelpMaxGrowthAge = getInt("blocks.kelp.max-growth-age", kelpMaxGrowthAge);
}
@@ -446,7 +446,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
public boolean respawnAnchorExplode = true;
public double respawnAnchorExplosionPower = 5.0D;
public boolean respawnAnchorExplosionFire = true;
@@ -510,6 +523,11 @@ public class PurpurWorldConfig {
@@ -516,6 +529,11 @@ public class PurpurWorldConfig {
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
}
@@ -458,7 +458,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
public double twistingVinesGrowthModifier = 0.10D;
public int twistingVinesMaxGrowthAge = 25;
private void twistingVinesSettings() {
@@ -688,6 +706,7 @@ public class PurpurWorldConfig {
@@ -694,6 +712,7 @@ public class PurpurWorldConfig {
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
public boolean creeperAllowGriefing = true;
@@ -466,7 +466,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -699,6 +718,7 @@ public class PurpurWorldConfig {
@@ -705,6 +724,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 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean dolphinRidable = false;
@@ -786,6 +806,7 @@ public class PurpurWorldConfig {
@@ -792,6 +812,7 @@ public class PurpurWorldConfig {
public double enderDragonMaxY = 256D;
public double enderDragonMaxHealth = 200.0D;
public boolean enderDragonAlwaysDropsFullExp = false;
@@ -482,7 +482,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -801,6 +822,7 @@ public class PurpurWorldConfig {
@@ -807,6 +828,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 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean endermanRidable = false;
@@ -808,6 +830,7 @@ public class PurpurWorldConfig {
@@ -814,6 +836,7 @@ public class PurpurWorldConfig {
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
@@ -498,7 +498,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -819,6 +842,7 @@ public class PurpurWorldConfig {
@@ -825,6 +848,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 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean endermiteRidable = false;
@@ -838,6 +862,7 @@ public class PurpurWorldConfig {
@@ -844,6 +868,7 @@ public class PurpurWorldConfig {
public boolean evokerRidable = false;
public boolean evokerRidableInWater = false;
public double evokerMaxHealth = 24.0D;
@@ -514,7 +514,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void evokerSettings() {
evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
@@ -847,6 +872,7 @@ public class PurpurWorldConfig {
@@ -853,6 +878,7 @@ public class PurpurWorldConfig {
set("mobs.evoker.attributes.max_health", oldValue);
}
evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
@@ -522,7 +522,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean foxRidable = false;
@@ -854,6 +880,7 @@ public class PurpurWorldConfig {
@@ -860,6 +886,7 @@ public class PurpurWorldConfig {
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
public int foxBreedingTicks = 6000;
@@ -530,7 +530,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -865,6 +892,7 @@ public class PurpurWorldConfig {
@@ -871,6 +898,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 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean ghastRidable = false;
@@ -1260,6 +1288,7 @@ public class PurpurWorldConfig {
@@ -1266,6 +1294,7 @@ public class PurpurWorldConfig {
public boolean piglinRidable = false;
public boolean piglinRidableInWater = false;
public double piglinMaxHealth = 16.0D;
@@ -546,7 +546,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1269,6 +1298,7 @@ public class PurpurWorldConfig {
@@ -1275,6 +1304,7 @@ public class PurpurWorldConfig {
set("mobs.piglin.attributes.max_health", oldValue);
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -554,7 +554,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean piglinBruteRidable = false;
@@ -1288,6 +1318,7 @@ public class PurpurWorldConfig {
@@ -1294,6 +1324,7 @@ public class PurpurWorldConfig {
public boolean pillagerRidable = false;
public boolean pillagerRidableInWater = false;
public double pillagerMaxHealth = 24.0D;
@@ -562,7 +562,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1297,6 +1328,7 @@ public class PurpurWorldConfig {
@@ -1303,6 +1334,7 @@ public class PurpurWorldConfig {
set("mobs.pillager.attributes.max_health", oldValue);
}
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -570,7 +570,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean polarBearRidable = false;
@@ -1338,6 +1370,7 @@ public class PurpurWorldConfig {
@@ -1344,6 +1376,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -578,7 +578,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1350,11 +1383,13 @@ public class PurpurWorldConfig {
@@ -1356,11 +1389,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 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1364,6 +1399,7 @@ public class PurpurWorldConfig {
@@ -1370,6 +1405,7 @@ public class PurpurWorldConfig {
set("mobs.ravager.attributes.max_health", oldValue);
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -600,7 +600,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean salmonRidable = false;
@@ -1382,6 +1418,7 @@ public class PurpurWorldConfig {
@@ -1388,6 +1424,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
@@ -608,7 +608,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1392,6 +1429,7 @@ public class PurpurWorldConfig {
@@ -1398,6 +1435,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 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean shulkerRidable = false;
@@ -1411,6 +1449,7 @@ public class PurpurWorldConfig {
@@ -1417,6 +1455,7 @@ public class PurpurWorldConfig {
public boolean silverfishRidable = false;
public boolean silverfishRidableInWater = false;
public double silverfishMaxHealth = 8.0D;
@@ -624,7 +624,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1420,6 +1459,7 @@ public class PurpurWorldConfig {
@@ -1426,6 +1465,7 @@ public class PurpurWorldConfig {
set("mobs.silverfish.attributes.max_health", oldValue);
}
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -632,7 +632,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean skeletonRidable = false;
@@ -1487,6 +1527,7 @@ public class PurpurWorldConfig {
@@ -1493,6 +1533,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -640,7 +640,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1503,6 +1544,7 @@ public class PurpurWorldConfig {
@@ -1509,6 +1550,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 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean squidRidable = false;
@@ -1662,6 +1704,7 @@ public class PurpurWorldConfig {
@@ -1668,6 +1710,7 @@ public class PurpurWorldConfig {
public int villagerLobotomizeCheck = 60;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -656,7 +656,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1688,6 +1731,7 @@ public class PurpurWorldConfig {
@@ -1694,6 +1737,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 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean vindicatorRidable = false;
@@ -1744,6 +1788,7 @@ public class PurpurWorldConfig {
@@ -1750,6 +1794,7 @@ public class PurpurWorldConfig {
public double witherMaxHealth = 300.0D;
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
@@ -672,7 +672,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1760,6 +1805,7 @@ public class PurpurWorldConfig {
@@ -1766,6 +1811,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 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean witherSkeletonRidable = false;
@@ -1827,6 +1873,7 @@ public class PurpurWorldConfig {
@@ -1833,6 +1879,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD;
@@ -688,7 +688,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1846,6 +1893,7 @@ public class PurpurWorldConfig {
@@ -1852,6 +1899,7 @@ public class PurpurWorldConfig {
} catch (IllegalArgumentException ignore) {
zombieBreakDoorMinDifficulty = Difficulty.HARD;
}

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

@@ -37,7 +37,7 @@ 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 c25a85c7e167207b21bf53a802921fc54d21c1a8..7bdab60d4437acdbfb54787e4c62bb935d3b7651 100644
index 7ff29701790a46d0ea8d58e54cc3f0e9b7999105..34ee48033c1c751ec905da04f69627749cef5ee0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -462,10 +462,16 @@ public class PurpurWorldConfig {
@@ -56,4 +56,4 @@ index c25a85c7e167207b21bf53a802921fc54d21c1a8..7bdab60d4437acdbfb54787e4c62bb93
+ farmlandTramplingFeatherFalling = getBoolean("blocks.farmland.feather-fall-distance-affects-trampling", farmlandTramplingFeatherFalling);
}
public boolean furnaceInfiniteFuel = false;
public boolean furnaceUseLavaFromUnderneath = false;

18
patches/server/0156-Toggle-for-water-sensitive-mob-damage.patch
View File

@@ -70,10 +70,10 @@ index b3928617f732b49cfc124e9bdb879110413defd7..1c6d29a30df66e9971cd50e264bb4455
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e1aca2c5253f26125e1154e75c8c2cbcd98af496..5507cf137dfc3167efdb19a550148e88e96c4a6b 100644
index e755455ebf9c10cabea88a7bab29d0da2189717e..caa8f3780b5c939d7b692d455cf5b8d9a6a9c903 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -623,6 +623,7 @@ public class PurpurWorldConfig {
@@ -629,6 +629,7 @@ public class PurpurWorldConfig {
public boolean blazeRidableInWater = false;
public double blazeMaxY = 256D;
public double blazeMaxHealth = 20.0D;
@@ -81,7 +81,7 @@ index e1aca2c5253f26125e1154e75c8c2cbcd98af496..5507cf137dfc3167efdb19a550148e88
private void blazeSettings() {
blazeRidable = getBoolean("mobs.blaze.ridable", blazeRidable);
blazeRidableInWater = getBoolean("mobs.blaze.ridable-in-water", blazeRidableInWater);
@@ -633,6 +634,7 @@ public class PurpurWorldConfig {
@@ -639,6 +640,7 @@ public class PurpurWorldConfig {
set("mobs.blaze.attributes.max_health", oldValue);
}
blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
@@ -89,7 +89,7 @@ index e1aca2c5253f26125e1154e75c8c2cbcd98af496..5507cf137dfc3167efdb19a550148e88
}
public boolean catRidable = false;
@@ -849,6 +851,7 @@ public class PurpurWorldConfig {
@@ -855,6 +857,7 @@ public class PurpurWorldConfig {
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
public boolean endermanBypassMobGriefing = false;
@@ -97,7 +97,7 @@ index e1aca2c5253f26125e1154e75c8c2cbcd98af496..5507cf137dfc3167efdb19a550148e88
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -861,6 +864,7 @@ public class PurpurWorldConfig {
@@ -867,6 +870,7 @@ public class PurpurWorldConfig {
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
endermanBypassMobGriefing = getBoolean("mobs.enderman.bypass-mob-griefing", endermanBypassMobGriefing);
@@ -105,7 +105,7 @@ index e1aca2c5253f26125e1154e75c8c2cbcd98af496..5507cf137dfc3167efdb19a550148e88
}
public boolean endermiteRidable = false;
@@ -1546,6 +1550,7 @@ public class PurpurWorldConfig {
@@ -1552,6 +1556,7 @@ public class PurpurWorldConfig {
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
public boolean snowGolemBypassMobGriefing = false;
@@ -113,7 +113,7 @@ index e1aca2c5253f26125e1154e75c8c2cbcd98af496..5507cf137dfc3167efdb19a550148e88
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1563,6 +1568,7 @@ public class PurpurWorldConfig {
@@ -1569,6 +1574,7 @@ public class PurpurWorldConfig {
snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
snowGolemBypassMobGriefing = getBoolean("mobs.snow_golem.bypass-mob-griefing", snowGolemBypassMobGriefing);
@@ -121,7 +121,7 @@ index e1aca2c5253f26125e1154e75c8c2cbcd98af496..5507cf137dfc3167efdb19a550148e88
}
public boolean squidRidable = false;
@@ -1616,6 +1622,7 @@ public class PurpurWorldConfig {
@@ -1622,6 +1628,7 @@ public class PurpurWorldConfig {
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
@@ -129,7 +129,7 @@ index e1aca2c5253f26125e1154e75c8c2cbcd98af496..5507cf137dfc3167efdb19a550148e88
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1627,6 +1634,7 @@ public class PurpurWorldConfig {
@@ -1633,6 +1640,7 @@ public class PurpurWorldConfig {
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);
striderGiveSaddleBack = getBoolean("mobs.strider.give-saddle-back", striderGiveSaddleBack);

10
patches/server/0160-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
View File

@@ -29,10 +29,10 @@ index 15d35d325b66e1a417eb7ba699597d627bd4eb54..36745f845f33c877595d572e46bd8e96
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 031745f64c3e79f5a0067bf09c069c65496652d1..5b9998121d52d2b8390b95f1a4449ddadf543c22 100644
index 4eb8c5ba7a8f05c1e83a6f9b92928e3796e2173d..d22e391f27f0d0ce41c4429ac36211739b6164d8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -858,6 +858,7 @@ public class PurpurWorldConfig {
@@ -864,6 +864,7 @@ public class PurpurWorldConfig {
public double enderDragonMaxHealth = 200.0D;
public boolean enderDragonAlwaysDropsFullExp = false;
public boolean enderDragonBypassMobGriefing = false;
@@ -40,7 +40,7 @@ index 031745f64c3e79f5a0067bf09c069c65496652d1..5b9998121d52d2b8390b95f1a4449dda
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -874,6 +875,7 @@ public class PurpurWorldConfig {
@@ -880,6 +881,7 @@ public class PurpurWorldConfig {
enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
enderDragonBypassMobGriefing = getBoolean("mobs.ender_dragon.bypass-mob-griefing", enderDragonBypassMobGriefing);
@@ -48,7 +48,7 @@ index 031745f64c3e79f5a0067bf09c069c65496652d1..5b9998121d52d2b8390b95f1a4449dda
}
public boolean endermanRidable = false;
@@ -1846,6 +1848,7 @@ public class PurpurWorldConfig {
@@ -1852,6 +1854,7 @@ public class PurpurWorldConfig {
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
public boolean witherBypassMobGriefing = false;
@@ -56,7 +56,7 @@ index 031745f64c3e79f5a0067bf09c069c65496652d1..5b9998121d52d2b8390b95f1a4449dda
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1863,6 +1866,7 @@ public class PurpurWorldConfig {
@@ -1869,6 +1872,7 @@ public class PurpurWorldConfig {
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);

6
patches/server/0163-Add-config-for-snow-on-blue-ice.patch
View File

@@ -29,11 +29,11 @@ index 0169d874247a96c2e10a65ecb9c0c093f5a6ecfb..b760e2d014b3ae70671878082bb853b7
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5b056cd60d13100980f50b56217207e160562701..bfd78fd1c8877558d40aab90644fad1266450e3f 100644
index dd475d9722e5292cbcdcfe65892b3c047b5d320e..7f4605244f31b43274b4caa7bbb827e28f3c5bfb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -524,6 +524,11 @@ public class PurpurWorldConfig {
furnaceInfiniteFuel = getBoolean("blocks.furnace.infinite-fuel", furnaceInfiniteFuel);
@@ -530,6 +530,11 @@ public class PurpurWorldConfig {
furnaceUseLavaFromUnderneath = getBoolean("blocks.furnace.use-lava-from-underneath", furnaceUseLavaFromUnderneath);
}
+ public boolean snowOnBlueIce = true;

6
patches/server/0167-Config-Enderman-aggressiveness-towards-Endermites.patch
View File

@@ -18,10 +18,10 @@ index 3907b7cb559dabdd3cc347678d42071215c66a6c..e8779b23b5e1a399dde19fc66d820101
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0086dd4f784cfe8d8f3fb7c531b32091f7f19b0a..04bfce54196b1a05ffcd5950c96922153082b7ff 100644
index d313e93f85d02f930c59ae8214fdc7752d2bc3e5..7d15830798c1aca78c40c72a4ecbf8cec2cbf730 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -906,6 +906,8 @@ public class PurpurWorldConfig {
@@ -912,6 +912,8 @@ public class PurpurWorldConfig {
public boolean endermanDespawnEvenWithBlock = false;
public boolean endermanBypassMobGriefing = false;
public boolean endermanTakeDamageFromWater = true;
@@ -30,7 +30,7 @@ index 0086dd4f784cfe8d8f3fb7c531b32091f7f19b0a..04bfce54196b1a05ffcd5950c9692215
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -914,11 +916,17 @@ public class PurpurWorldConfig {
@@ -920,11 +922,17 @@ public class PurpurWorldConfig {
set("mobs.enderman.attributes.max-health", null);
set("mobs.enderman.attributes.max_health", oldValue);
}

6
patches/server/0168-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
View File

@@ -20,10 +20,10 @@ index e8779b23b5e1a399dde19fc66d820101d61f36bc..ba61f78874d8578b862f317fe00a3162
} else {
Vec3 vec3d = player.getViewVector(1.0F).normalize();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 04bfce54196b1a05ffcd5950c96922153082b7ff..b9e3ddb7905dbbd91b856e7265f5dde9ecea3857 100644
index 7d15830798c1aca78c40c72a4ecbf8cec2cbf730..0d9c4112b0a3d3d76f9545b4a66716ace9dc8f26 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -908,6 +908,8 @@ public class PurpurWorldConfig {
@@ -914,6 +914,8 @@ public class PurpurWorldConfig {
public boolean endermanTakeDamageFromWater = true;
public boolean endermanAggroEndermites = true;
public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
@@ -32,7 +32,7 @@ index 04bfce54196b1a05ffcd5950c96922153082b7ff..b9e3ddb7905dbbd91b856e7265f5dde9
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -927,6 +929,8 @@ public class PurpurWorldConfig {
@@ -933,6 +935,8 @@ public class PurpurWorldConfig {
endermanTakeDamageFromWater = getBoolean("mobs.enderman.takes-damage-from-water", endermanTakeDamageFromWater);
endermanAggroEndermites = getBoolean("mobs.enderman.aggressive-towards-endermites", endermanAggroEndermites);
endermanAggroEndermitesOnlyIfPlayerSpawned = getBoolean("mobs.enderman.aggressive-towards-endermites-only-spawned-by-player-thrown-ender-pearls", endermanAggroEndermitesOnlyIfPlayerSpawned);

6
patches/server/0170-Config-to-disable-Llama-caravans.patch
View File

@@ -32,10 +32,10 @@ index 93a05b945ac248df0ea7a0b9d7264a9c129c3bcf..8f12851f220bb23102f52f523a4c5d98
this.caravanHead.caravanTail = this;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1a0fd073cc4264a9bb1d2788bc36791d9d64c3aa..c0065c0f3269b68c724b0d1771cf0b1473049c15 100644
index b59c39d0aa9693e648920d23d055e970e7e08cf9..44a8fe9b633ce512c4ad45fe5edb72afc842f8ee 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1174,6 +1174,7 @@ public class PurpurWorldConfig {
@@ -1180,6 +1180,7 @@ public class PurpurWorldConfig {
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
public int llamaBreedingTicks = 6000;
@@ -43,7 +43,7 @@ index 1a0fd073cc4264a9bb1d2788bc36791d9d64c3aa..c0065c0f3269b68c724b0d1771cf0b14
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1191,6 +1192,7 @@ public class PurpurWorldConfig {
@@ -1197,6 +1198,7 @@ public class PurpurWorldConfig {
llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks);

6
patches/server/0171-Config-to-make-Creepers-explode-on-death.patch
View File

@@ -50,10 +50,10 @@ index c550b8c19837ed9bf730a3eb777bc00de4e7ceb2..02494dcc8a342f65b2855612aebeb019
private void spawnLingeringCloud() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c0065c0f3269b68c724b0d1771cf0b1473049c15..3e83426a6c3e0c836726fb487da7bc5cb7e4166c 100644
index 44a8fe9b633ce512c4ad45fe5edb72afc842f8ee..e01a4d1de37535c189694097c37427f61e9eef86 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -781,6 +781,7 @@ public class PurpurWorldConfig {
@@ -787,6 +787,7 @@ public class PurpurWorldConfig {
public double creeperChargedChance = 0.0D;
public boolean creeperAllowGriefing = true;
public boolean creeperBypassMobGriefing = false;
@@ -61,7 +61,7 @@ index c0065c0f3269b68c724b0d1771cf0b1473049c15..3e83426a6c3e0c836726fb487da7bc5c
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -793,6 +794,7 @@ public class PurpurWorldConfig {
@@ -799,6 +800,7 @@ public class PurpurWorldConfig {
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing);

6
patches/server/0172-Configurable-ravager-griefable-blocks-list.patch
View File

@@ -31,10 +31,10 @@ index 3c51e6d419a244b9270119590aa299527163c331..b466b0430dd94777975a1e7ab9792166
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3e83426a6c3e0c836726fb487da7bc5cb7e4166c..6a7827fd7f47dd4a6d46b7769ac9d0da3a108b3b 100644
index e01a4d1de37535c189694097c37427f61e9eef86..f4e2e13591948e4f20d17670279d7f8dc30d6fb3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1484,6 +1484,7 @@ public class PurpurWorldConfig {
@@ -1490,6 +1490,7 @@ public class PurpurWorldConfig {
public boolean ravagerRidableInWater = false;
public double ravagerMaxHealth = 100.0D;
public boolean ravagerBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index 3e83426a6c3e0c836726fb487da7bc5cb7e4166c..6a7827fd7f47dd4a6d46b7769ac9d0da
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1494,6 +1495,23 @@ public class PurpurWorldConfig {
@@ -1500,6 +1501,23 @@ public class PurpurWorldConfig {
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
ravagerBypassMobGriefing = getBoolean("mobs.ravager.bypass-mob-griefing", ravagerBypassMobGriefing);

10
patches/server/0175-Add-config-for-villager-trading.patch
View File

@@ -31,10 +31,10 @@ index c48935d35a6141c41db22e3ec172d5994fd317a2..fa4644c11cbb252734a6f5dc21c861d2
this.openTradingScreen(player, this.getDisplayName(), 1);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fa9c318e229b74b5aabf1a43245d1a125f55c4c6..294211ce6652726b4b71e2c3c537b7dd26ac9a3d 100644
index 51dee2334645564520e1caadeb84513df38d4b3d..8db9f5a20a3cfffcb89f9fb0b1e664cc3ef45d13 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1828,6 +1828,7 @@ public class PurpurWorldConfig {
@@ -1834,6 +1834,7 @@ public class PurpurWorldConfig {
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index fa9c318e229b74b5aabf1a43245d1a125f55c4c6..294211ce6652726b4b71e2c3c537b7dd
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1855,6 +1856,7 @@ public class PurpurWorldConfig {
@@ -1861,6 +1862,7 @@ public class PurpurWorldConfig {
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
@@ -50,7 +50,7 @@ index fa9c318e229b74b5aabf1a43245d1a125f55c4c6..294211ce6652726b4b71e2c3c537b7dd
}
public boolean vindicatorRidable = false;
@@ -1878,6 +1880,7 @@ public class PurpurWorldConfig {
@@ -1884,6 +1886,7 @@ public class PurpurWorldConfig {
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
@@ -58,7 +58,7 @@ index fa9c318e229b74b5aabf1a43245d1a125f55c4c6..294211ce6652726b4b71e2c3c537b7dd
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1889,6 +1892,7 @@ public class PurpurWorldConfig {
@@ -1895,6 +1898,7 @@ public class PurpurWorldConfig {
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);

4
patches/server/0178-Break-individual-slabs-when-sneaking.patch
View File

@@ -47,10 +47,10 @@ index eb7f8907bb362c0461194bbaf62917ce71c669f3..89f5e0d26500f1806dff9f91390546cd
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2924f2751239bde6ab0ae5c130720e73cb410ce0..823b905771dcba1e565c2b2fac85d9d8335c2452 100644
index a49d208bbda78012db46ed13c4fe14bc3425f94d..bf482183eb820e0e0c01d98d27d8d99ad69e5309 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -601,6 +601,11 @@ public class PurpurWorldConfig {
@@ -607,6 +607,11 @@ public class PurpurWorldConfig {
signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
}

4
patches/server/0179-Config-to-disable-hostile-mob-spawn-on-ice.patch
View File

@@ -22,10 +22,10 @@ index fc34cfa8bfb3b82a8e1b28d261f0e901d837467e..35d47bb0d8c4a2b8374564133f040899
return false;
} else {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 823b905771dcba1e565c2b2fac85d9d8335c2452..3b2aac804f0230fcf39523c62240de3ea1eed672 100644
index bf482183eb820e0e0c01d98d27d8d99ad69e5309..dd067671dfdcf0baaf8ff171bc4e0ef92ccc669c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -553,8 +553,12 @@ public class PurpurWorldConfig {
@@ -559,8 +559,12 @@ public class PurpurWorldConfig {
}
public boolean snowOnBlueIce = true;

4
patches/server/0183-Configurable-sponge-absorption.patch
View File

@@ -43,10 +43,10 @@ index 1ef8eadd4e59f2e5d2bbd84f6f9bcf37b59db5bd..5b10e1110f938745c8f9ed0b55960566
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 87d4f1efd11f4e6e0e1559085ea72664158e827b..543fcbaa0f1f4f26386b9e1528c85afc5715b519 100644
index 831e4ec10f4221f5be053a9b4c77cf29454e2068..ab9934c48fc6d43fd3b8762bd9978290a2db7d19 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -627,6 +627,13 @@ public class PurpurWorldConfig {
@@ -633,6 +633,13 @@ public class PurpurWorldConfig {
spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
}

4
patches/server/0185-Config-for-powered-rail-activation-distance.patch
View File

@@ -18,10 +18,10 @@ index 7fddb6fa8fd30ef88346a59f7867aae792f13772..40893e71fe8447b695350273bef9623b
} else {
int j = pos.getX();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1e00048d25ef3b977a65a58bd58f962e377f08d9..ec439090f6d1f58490e6a76d85c520ab997e3fc0 100644
index 5c3c2b0cbc27db807a6722a7d30548c2f35dea91..763467124c35ad3ce88b0197bca476a79b5bf9d7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -639,6 +639,11 @@ public class PurpurWorldConfig {
@@ -645,6 +645,11 @@ public class PurpurWorldConfig {
slabHalfBreak = getBoolean("blocks.slab.break-individual-slabs-when-sneaking", slabHalfBreak);
}

6
patches/server/0186-Piglin-portal-spawn-modifier.patch
View File

@@ -31,10 +31,10 @@ index fef1027829c44957e23c0a121033bfb7640d06f0..c42349d0f6b0025525278295b36f4030
pos = pos.below();
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ec439090f6d1f58490e6a76d85c520ab997e3fc0..c2320195e330a5402b12ea653a9f300c904be159 100644
index 763467124c35ad3ce88b0197bca476a79b5bf9d7..7b15f53b618815ea20bc2b31cb5a42aa2cd4b049 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1449,6 +1449,7 @@ public class PurpurWorldConfig {
@@ -1455,6 +1455,7 @@ public class PurpurWorldConfig {
public boolean piglinRidableInWater = false;
public double piglinMaxHealth = 16.0D;
public boolean piglinBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index ec439090f6d1f58490e6a76d85c520ab997e3fc0..c2320195e330a5402b12ea653a9f300c
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1459,6 +1460,7 @@ public class PurpurWorldConfig {
@@ -1465,6 +1466,7 @@ public class PurpurWorldConfig {
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
piglinBypassMobGriefing = getBoolean("mobs.piglin.bypass-mob-griefing", piglinBypassMobGriefing);

4
patches/server/0188-Configurable-damage-settings-for-magma-blocks.patch
View File

@@ -31,10 +31,10 @@ index 5d844ed98b916298a657d5e9766ab7f383a304e0..0129460ce1ca199a47b6657f824c75fd
entity.hurt(DamageSource.HOT_FLOOR, 1.0F);
org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c2320195e330a5402b12ea653a9f300c904be159..00a1fb7beb8d95ec74d0f11c75cf1f189817c1bf 100644
index 7b15f53b618815ea20bc2b31cb5a42aa2cd4b049..32794e051182f0e5f4fffb47e33fa983e7ca53ae 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -606,6 +606,13 @@ public class PurpurWorldConfig {
@@ -612,6 +612,13 @@ public class PurpurWorldConfig {
kelpMaxGrowthAge = getInt("blocks.kelp.max-growth-age", kelpMaxGrowthAge);
}

6
patches/server/0189-Config-for-wither-explosion-radius.patch
View File

@@ -18,10 +18,10 @@ index 430aa10101d9f21561155941ff24441fd0c4103a..de91f0dd7f9a62e5a96b4cc3e4f505ec
if (!event.isCancelled()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 00a1fb7beb8d95ec74d0f11c75cf1f189817c1bf..21b93ca575cd33ccd29699a2f93a635b4ec48de8 100644
index 32794e051182f0e5f4fffb47e33fa983e7ca53ae..b52e0bf5e971c6a9dba36a2a822fb2ae923f05c8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1985,6 +1985,7 @@ public class PurpurWorldConfig {
@@ -1991,6 +1991,7 @@ public class PurpurWorldConfig {
public int witherHealthRegenDelay = 20;
public boolean witherBypassMobGriefing = false;
public boolean witherCanRideVehicles = false;
@@ -29,7 +29,7 @@ index 00a1fb7beb8d95ec74d0f11c75cf1f189817c1bf..21b93ca575cd33ccd29699a2f93a635b
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2003,6 +2004,7 @@ public class PurpurWorldConfig {
@@ -2009,6 +2010,7 @@ public class PurpurWorldConfig {
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);

4
patches/server/0192-Configurable-piston-push-limit.patch
View File

@@ -36,10 +36,10 @@ index 744d91546d1a810f60a43c15ed74b4158f341a4a..354538daefa603f6df5a139b6bff87db
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3b18239e5389e91142f71e799c1826a252e4a1ce..8ac0465f3576b47a18e3fd5a70a4ed091fa4f57d 100644
index 6f4b7688d3530a421ff92a328069f39dd2cea6a6..58f52e054f80ece6ffd98cdd9b7df70c8c53dc47 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -628,6 +628,11 @@ public class PurpurWorldConfig {
@@ -634,6 +634,11 @@ public class PurpurWorldConfig {
magmaBlockDamageWithFrostWalker = getBoolean("blocks.magma-block.damage-with-frost-walker", magmaBlockDamageWithFrostWalker);
}

6
patches/server/0197-Config-for-health-to-impact-Creeper-explosion-radius.patch
View File

@@ -21,10 +21,10 @@ index 02494dcc8a342f65b2855612aebeb019095abf65..d66c8866f3c6b1412a6c1876c62e3b29
if (!event.isCancelled()) {
this.dead = true;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 38800a6f2b272c1963a7dae218e888c40f4235e6..81af18ead6adeb276736a800b479cedac874f9b7 100644
index 1adb54ed0a8aa57fad12cd96b24cebc27566a864..d47156fd8be225852cc321c6d956e25ff3da120e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -877,6 +877,7 @@ public class PurpurWorldConfig {
@@ -883,6 +883,7 @@ public class PurpurWorldConfig {
public boolean creeperAllowGriefing = true;
public boolean creeperBypassMobGriefing = false;
public boolean creeperExplodeWhenKilled = false;
@@ -32,7 +32,7 @@ index 38800a6f2b272c1963a7dae218e888c40f4235e6..81af18ead6adeb276736a800b479ceda
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -890,6 +891,7 @@ public class PurpurWorldConfig {
@@ -896,6 +897,7 @@ public class PurpurWorldConfig {
creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing);
creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);

6
patches/server/0198-Iron-golem-poppy-calms-anger.patch
View File

@@ -17,10 +17,10 @@ index f4e983da7206923ee0b0f984e65a6c2b3a6a8aeb..cea3725009af1bc746a593c4db63ed63
this.goalSelector.addGoal(2, new MoveTowardsTargetGoal(this, 0.9D, 32.0F));
this.goalSelector.addGoal(2, new MoveBackToVillageGoal(this, 0.6D, false));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 81af18ead6adeb276736a800b479cedac874f9b7..b8f71bbca8fae048cc26ec1228cfab3a4a5bfabd 100644
index d47156fd8be225852cc321c6d956e25ff3da120e..4889ab24ad48fe958e29b634980c69191a7dbd32 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1252,6 +1252,7 @@ public class PurpurWorldConfig {
@@ -1258,6 +1258,7 @@ public class PurpurWorldConfig {
public boolean ironGolemRidableInWater = false;
public boolean ironGolemCanSwim = false;
public double ironGolemMaxHealth = 100.0D;
@@ -28,7 +28,7 @@ index 81af18ead6adeb276736a800b479cedac874f9b7..b8f71bbca8fae048cc26ec1228cfab3a
private void ironGolemSettings() {
ironGolemRidable = getBoolean("mobs.iron_golem.ridable", ironGolemRidable);
ironGolemRidableInWater = getBoolean("mobs.iron_golem.ridable-in-water", ironGolemRidableInWater);
@@ -1262,6 +1263,7 @@ public class PurpurWorldConfig {
@@ -1268,6 +1269,7 @@ public class PurpurWorldConfig {
set("mobs.iron_golem.attributes.max_health", oldValue);
}
ironGolemMaxHealth = getDouble("mobs.iron_golem.attributes.max_health", ironGolemMaxHealth);

6
patches/server/0199-Breedable-parrots.patch
View File

@@ -50,10 +50,10 @@ index 553b0aff0ccc5baf41d5faae1a2fd88249dd5a74..3da2b68fb03a80676d7a5eed271499f6
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b8f71bbca8fae048cc26ec1228cfab3a4a5bfabd..414f9f1ea859736d9bd23a35bf28752dfed8e1c7 100644
index 4889ab24ad48fe958e29b634980c69191a7dbd32..3332180fa9489622f4fc94c0906fd1afa7a269f5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1388,6 +1388,7 @@ public class PurpurWorldConfig {
@@ -1394,6 +1394,7 @@ public class PurpurWorldConfig {
public boolean parrotRidableInWater = false;
public double parrotMaxY = 256D;
public double parrotMaxHealth = 6.0D;
@@ -61,7 +61,7 @@ index b8f71bbca8fae048cc26ec1228cfab3a4a5bfabd..414f9f1ea859736d9bd23a35bf28752d
private void parrotSettings() {
parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable);
parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater);
@@ -1398,6 +1399,7 @@ public class PurpurWorldConfig {
@@ -1404,6 +1405,7 @@ public class PurpurWorldConfig {
set("mobs.parrot.attributes.max_health", oldValue);
}
parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth);

4
patches/server/0205-ShulkerBox-allow-oversized-stacks.patch
View File

@@ -35,10 +35,10 @@ index b9c558060024d380e89116489c7fc12ad88db8ad..0a0a4be15bed899812fcd4af0e311f5f
CompoundTag compoundTag = shulkerBoxBlockEntity.saveToTag(new CompoundTag());
if (!compoundTag.isEmpty()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 33d71c3d9c657ce8ce113eae8f4a8f39b2a65dd8..3b33312333005a370157c14267972facceea2cc5 100644
index 439103c27befdec5e2f41c94d4c3f1346a49725d..525e3f398c2c7b7ea9ececa11705bae33d68dcf2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -665,6 +665,11 @@ public class PurpurWorldConfig {
@@ -671,6 +671,11 @@ public class PurpurWorldConfig {
}
}

6
patches/server/0206-Bee-can-work-when-raining-or-at-night.patch
View File

@@ -31,10 +31,10 @@ index ffacc4b8cc3ab8285c4131aec58e48ffa9e1952e..e0e039e2f614f2df48d8d1b6e8bbbe7a
return false;
} else {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3b33312333005a370157c14267972facceea2cc5..4a4f1e80f1636949c3699b1718dea81656865bca 100644
index 525e3f398c2c7b7ea9ececa11705bae33d68dcf2..d5422db5695ec3f2b9381cdbd936a56865a21830 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -769,6 +769,8 @@ public class PurpurWorldConfig {
@@ -775,6 +775,8 @@ public class PurpurWorldConfig {
public double beeMaxY = 256D;
public double beeMaxHealth = 10.0D;
public int beeBreedingTicks = 6000;
@@ -43,7 +43,7 @@ index 3b33312333005a370157c14267972facceea2cc5..4a4f1e80f1636949c3699b1718dea816
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -780,6 +782,8 @@ public class PurpurWorldConfig {
@@ -786,6 +788,8 @@ public class PurpurWorldConfig {
}
beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
beeBreedingTicks = getInt("mobs.bee.breeding-delay-ticks", beeBreedingTicks);

4
patches/server/0211-Add-toggle-for-sand-duping-fix.patch
View File

@@ -27,10 +27,10 @@ index 8336ea928faa92c6f58f8cdfb9faf1d8e26c9ccf..c765c182081fe83eb0f30dcbf97d8126
}
// Paper end - fix sand duping
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c38cd5ead9a3832971a2e859ba8758586d637a66..9d2187b4def519aa6ea4bebdca37ea4095fe07d4 100644
index b6e38e85baaf63a3501fa844fcabbad8a5f57451..740bf4c342acacab7ff389c25424cf0fd7ea2ac7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -691,6 +691,11 @@ public class PurpurWorldConfig {
@@ -697,6 +697,11 @@ public class PurpurWorldConfig {
}
}

6
patches/server/0212-Add-toggle-for-end-portal-safe-teleporting.patch
View File

@@ -45,11 +45,11 @@ index 197482e1ace23c3de002242097a68c6cc297cd3f..428875a6a99a619d337e2a7bbd2cb182
entity.portalWorld = ((ServerLevel)world);
entity.portalBlock = pos.immutable();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9d2187b4def519aa6ea4bebdca37ea4095fe07d4..7b99fcf3e05677ff1754fa33275dbe456d28082d 100644
index 740bf4c342acacab7ff389c25424cf0fd7ea2ac7..fad3ab8de457b2f8061979b9841718b3bfbd58bb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -633,6 +633,11 @@ public class PurpurWorldConfig {
furnaceInfiniteFuel = getBoolean("blocks.furnace.infinite-fuel", furnaceInfiniteFuel);
@@ -639,6 +639,11 @@ public class PurpurWorldConfig {
furnaceUseLavaFromUnderneath = getBoolean("blocks.furnace.use-lava-from-underneath", furnaceUseLavaFromUnderneath);
}
+ public boolean endPortalSafeTeleporting = true;

4
patches/server/0217-Populator-seed-controls.patch
View File

@@ -39,10 +39,10 @@ index a7a7e6cd87270e64a92448f03f8b0b0c7e375ec7..9fb19162c0e436122087d03d37b502a1
try {
region.setCurrentlyGenerating(supplier3);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0c6da1dba56019126736e2860bc5db24bd6e6551..854a02059cd1c859682daeb1a5add5b4ed86fde2 100644
index d5c3a6c353213ea99e311dfe248331275939e933..d46c0a0bf6c1fee92858f961705301c3c49ace2c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -2251,4 +2251,20 @@ public class PurpurWorldConfig {
@@ -2257,4 +2257,20 @@ public class PurpurWorldConfig {
zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
}

6
patches/server/0219-Shulker-spawn-from-bullet-options.patch
View File

@@ -61,10 +61,10 @@ index f812a75985d26785639491c9a980387a3f261f2d..b11fb39b69f5225ca7da72ca1a2200c7
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 854a02059cd1c859682daeb1a5add5b4ed86fde2..6d6e8931451554b3b21da546be7ee42bbdf804af 100644
index d46c0a0bf6c1fee92858f961705301c3c49ace2c..fc1186076cfc7f46b1cc5e7cc0ff4284af180766 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1706,6 +1706,11 @@ public class PurpurWorldConfig {
@@ -1712,6 +1712,11 @@ public class PurpurWorldConfig {
public boolean shulkerRidable = false;
public boolean shulkerRidableInWater = false;
public double shulkerMaxHealth = 30.0D;
@@ -76,7 +76,7 @@ index 854a02059cd1c859682daeb1a5add5b4ed86fde2..6d6e8931451554b3b21da546be7ee42b
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -1715,6 +1720,11 @@ public class PurpurWorldConfig {
@@ -1721,6 +1726,11 @@ public class PurpurWorldConfig {
set("mobs.shulker.attributes.max_health", oldValue);
}
shulkerMaxHealth = getDouble("mobs.shulker.attributes.max_health", shulkerMaxHealth);

6
patches/server/0221-Option-to-make-drowned-break-doors.patch
View File

@@ -34,10 +34,10 @@ index 8d3ce6c97a8734c0d13844cafca251a3f4dce8a4..a004d59483dc3ffb404ae28daf76c807
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b959560ab95b506cf7bde1c638008e8ac61a0ca4..684e5c0931b2f5c0f528c3126c3dd1d624f774a5 100644
index f8fb5349965ad8d12ccfccdbc11bd3662b297edb..e43c40b49f7947fa0b102099774bfebd493c2756 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1005,6 +1005,7 @@ public class PurpurWorldConfig {
@@ -1011,6 +1011,7 @@ public class PurpurWorldConfig {
public boolean drownedJockeyOnlyBaby = true;
public double drownedJockeyChance = 0.05D;
public boolean drownedJockeyTryExistingChickens = true;
@@ -45,7 +45,7 @@ index b959560ab95b506cf7bde1c638008e8ac61a0ca4..684e5c0931b2f5c0f528c3126c3dd1d6
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -1018,6 +1019,7 @@ public class PurpurWorldConfig {
@@ -1024,6 +1025,7 @@ public class PurpurWorldConfig {
drownedJockeyOnlyBaby = getBoolean("mobs.drowned.jockey.only-babies", drownedJockeyOnlyBaby);
drownedJockeyChance = getDouble("mobs.drowned.jockey.chance", drownedJockeyChance);
drownedJockeyTryExistingChickens = getBoolean("mobs.drowned.jockey.try-existing-chickens", drownedJockeyTryExistingChickens);

4
patches/server/0222-Configurable-hunger-starvation-damage.patch
View File

@@ -18,10 +18,10 @@ index c1130952e3fa22abaa27fcc1c4761c831dc56cc3..1ac08eca469739cb52abd38483c431b6
this.tickTimer = 0;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 684e5c0931b2f5c0f528c3126c3dd1d624f774a5..b33f637908ca086efdd1a474043a1258c821d99a 100644
index e43c40b49f7947fa0b102099774bfebd493c2756..6c529f1667d67b818ccc5058686ee7c75de9d216 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -2281,4 +2281,9 @@ public class PurpurWorldConfig {
@@ -2287,4 +2287,9 @@ public class PurpurWorldConfig {
}
randomPopulatorSeed = getBoolean("seed.random-populator-seed", randomPopulatorSeed);
}