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

remove one patch cause they removed the save function wtf mojang

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-11-25 08:39:51 -05:00
parent 3e81bd3fc9
commit a7f145d54c
209 changed files with 495 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@ index 5d95f3cce8f5190bc2172a1fe0e83166062f0f3d..603e621b16deb63b0d6d7e59e05a8de1
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ea387b513f86249a6ceaa67cb6358dc56ed4b16d..35fbc48c6396f23add351063a9df12f15643a3a8 100644
index 5cfccc5a7ee50b24151d6886a1f336c6b217c24e..2bb17be22ec6a89c8090657cd5093d6a376d5064 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -153,6 +153,11 @@ public class PurpurWorldConfig {
@@ -30,6 +30,6 @@ index ea387b513f86249a6ceaa67cb6358dc56ed4b16d..35fbc48c6396f23add351063a9df12f1
+ farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
+ }
+
public boolean signAllowColors = false;
public boolean signRightClickEdit = false;
private void signSettings() {
signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);

4
patches/server/0047-Minecart-settings-and-WASD-controls.patch → patches/server/0046-Minecart-settings-and-WASD-controls.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Minecart settings and WASD controls
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 45084be6e8ebced2029dbca57f288b0e01b07311..11ebb94eb26836231cdd81514a5639e756876e09 100644
index 52fd2d08783bbba4c262bb297a31b373b3bcfacc..d37aa315753ffff5601d42987beae7af4a267ce1 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1018,6 +1018,7 @@ public class ServerPlayer extends Player {
@@ -148,7 +148,7 @@ index ce4848bdd00c091b9eb5fa2d47b03378d43c91b2..2edf760182312a36dc7d0fc7378135a2
protected final float explosionResistance;
protected final boolean isRandomlyTicking;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 35fbc48c6396f23add351063a9df12f15643a3a8..77d19b9bea9fce62c1438f399574393f7282e849 100644
index 2bb17be22ec6a89c8090657cd5093d6a376d5064..b9257b444a9fae83cd42757eec84559185fe4971 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -99,6 +99,68 @@ public class PurpurWorldConfig {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable loot drops on death by cramming
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index aa39670f465ce4687dd443d564a119d59461aae1..8a141a02a8fc3615ec1b52f062e17ed881d671cf 100644
index ed11d49f27fdb85f3682b0b79ec4d1fb68ef0466..5ae294293cd9d813e22d251e567d1fc0929edc49 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1704,8 +1704,10 @@ public abstract class LivingEntity extends Entity {
@@ -20,7 +20,7 @@ index aa39670f465ce4687dd443d564a119d59461aae1..8a141a02a8fc3615ec1b52f062e17ed8
// CraftBukkit start - Call death event
org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 77d19b9bea9fce62c1438f399574393f7282e849..209c269d0a5351a206451ab9724307d811c16a11 100644
index b9257b444a9fae83cd42757eec84559185fe4971..1533c1a126b4602db25772662d313d5b0b4eab15 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -215,6 +215,11 @@ public class PurpurWorldConfig {

2
patches/server/0049-Option-to-toggle-milk-curing-bad-omen.patch → patches/server/0048-Option-to-toggle-milk-curing-bad-omen.patch
View File

@@ -28,7 +28,7 @@ index f33977d95b6db473be4f95075ba99caf90ad0220..56dc04d8875971ee9a5d077a695509af
return stack.isEmpty() ? new ItemStack(Items.BUCKET) : stack;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 209c269d0a5351a206451ab9724307d811c16a11..ba2d49771e317d52b46868372572f59bf2fc3394 100644
index 1533c1a126b4602db25772662d313d5b0b4eab15..9a1a942b6f4ad15a6e664f5a774a6aef254eb0d7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -216,8 +216,10 @@ public class PurpurWorldConfig {

0
patches/server/0050-End-gateway-should-check-if-entity-can-use-portal.patch → patches/server/0049-End-gateway-should-check-if-entity-can-use-portal.patch
View File

0
patches/server/0051-Fix-the-dead-lagging-the-server.patch → patches/server/0050-Fix-the-dead-lagging-the-server.patch
View File

0
patches/server/0052-Skip-events-if-there-s-no-listeners.patch → patches/server/0051-Skip-events-if-there-s-no-listeners.patch
View File

0
patches/server/0053-Add-permission-for-F3-N-debug.patch → patches/server/0052-Add-permission-for-F3-N-debug.patch
View File

0
patches/server/0054-Configurable-TPS-Catchup.patch → patches/server/0053-Configurable-TPS-Catchup.patch
View File

2
patches/server/0055-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch → patches/server/0054-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
View File

@@ -18,7 +18,7 @@ index a367f50b0e3fe9e7a1b87892a8c98e88bd678f6f..52d41fb8d0495f61346c718c8f2395bc
if (!this.level.isClientSide && this.pickup == AbstractArrow.Pickup.ALLOWED) {
this.spawnAtLocation(this.getPickupItem(), 0.1F);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ba2d49771e317d52b46868372572f59bf2fc3394..1ff4e926accf8029315d5d2ffd209f62b16fd729 100644
index 9a1a942b6f4ad15a6e664f5a774a6aef254eb0d7..df553af2e0a7c9b411a2ba0ed2fd530a537e4bcd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -217,9 +217,11 @@ public class PurpurWorldConfig {

10
patches/server/0056-Add-enderman-and-creeper-griefing-controls.patch → patches/server/0055-Add-enderman-and-creeper-griefing-controls.patch
View File

@@ -38,10 +38,10 @@ index 66ff0e3aa1a7dfb233a459516c4c596c1bbe033e..71b472e3fefe549fe959fda1702213ba
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1ff4e926accf8029315d5d2ffd209f62b16fd729..cd77b51e3cc64f34e0f1cb163c17d2f3bf054880 100644
index df553af2e0a7c9b411a2ba0ed2fd530a537e4bcd..ea072b32e1c92424d6e1cee5a92c86e460e11c5d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -389,6 +389,7 @@ public class PurpurWorldConfig {
@@ -387,6 +387,7 @@ public class PurpurWorldConfig {
public boolean creeperRidableInWater = false;
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
@@ -49,7 +49,7 @@ index 1ff4e926accf8029315d5d2ffd209f62b16fd729..cd77b51e3cc64f34e0f1cb163c17d2f3
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -399,6 +400,7 @@ public class PurpurWorldConfig {
@@ -397,6 +398,7 @@ public class PurpurWorldConfig {
}
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
@@ -57,7 +57,7 @@ index 1ff4e926accf8029315d5d2ffd209f62b16fd729..cd77b51e3cc64f34e0f1cb163c17d2f3
}
public boolean dolphinRidable = false;
@@ -496,6 +498,7 @@ public class PurpurWorldConfig {
@@ -494,6 +496,7 @@ public class PurpurWorldConfig {
public boolean endermanRidable = false;
public boolean endermanRidableInWater = false;
public double endermanMaxHealth = 40.0D;
@@ -65,7 +65,7 @@ index 1ff4e926accf8029315d5d2ffd209f62b16fd729..cd77b51e3cc64f34e0f1cb163c17d2f3
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -505,6 +508,7 @@ public class PurpurWorldConfig {
@@ -503,6 +506,7 @@ public class PurpurWorldConfig {
set("mobs.enderman.attributes.max_health", oldValue);
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);

10
patches/server/0057-Villagers-follow-emerald-blocks.patch → patches/server/0056-Villagers-follow-emerald-blocks.patch
View File

@@ -54,10 +54,10 @@ index 0bcfece84ac11f04671ed38a99b31da9f8b03858..2f0bcf917af26fb7628bda134b650a8b
this.goalSelector.addGoal(8, new WaterAvoidingRandomStrollGoal(this, 0.35D));
this.goalSelector.addGoal(9, new InteractGoal(this, Player.class, 3.0F, 1.0F));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index cd77b51e3cc64f34e0f1cb163c17d2f3bf054880..714ad964c90d8fb8244787899be1338c8ab445f8 100644
index ea072b32e1c92424d6e1cee5a92c86e460e11c5d..eeb678ce1922d5e8fe8745ffcbfaefd82b93eeaa 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1248,6 +1248,7 @@ public class PurpurWorldConfig {
@@ -1246,6 +1246,7 @@ public class PurpurWorldConfig {
public double villagerMaxHealth = 20.0D;
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
@@ -65,7 +65,7 @@ index cd77b51e3cc64f34e0f1cb163c17d2f3bf054880..714ad964c90d8fb8244787899be1338c
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1259,6 +1260,7 @@ public class PurpurWorldConfig {
@@ -1257,6 +1258,7 @@ public class PurpurWorldConfig {
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
@@ -73,7 +73,7 @@ index cd77b51e3cc64f34e0f1cb163c17d2f3bf054880..714ad964c90d8fb8244787899be1338c
}
public boolean vindicatorRidable = false;
@@ -1278,6 +1280,7 @@ public class PurpurWorldConfig {
@@ -1276,6 +1278,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderRidable = false;
public boolean wanderingTraderRidableInWater = false;
public double wanderingTraderMaxHealth = 20.0D;
@@ -81,7 +81,7 @@ index cd77b51e3cc64f34e0f1cb163c17d2f3bf054880..714ad964c90d8fb8244787899be1338c
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1287,6 +1290,7 @@ public class PurpurWorldConfig {
@@ -1285,6 +1288,7 @@ public class PurpurWorldConfig {
set("mobs.wandering_trader.attributes.max_health", oldValue);
}
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);

10
patches/server/0058-Allow-leashing-villagers.patch → patches/server/0057-Allow-leashing-villagers.patch
View File

@@ -49,10 +49,10 @@ index 2f0bcf917af26fb7628bda134b650a8b296091ea..c5dbb1c8210b71f7d9d91089cb139f65
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 714ad964c90d8fb8244787899be1338c8ab445f8..66198aa053072cf95b6d8f988ae839ec72fa67f0 100644
index eeb678ce1922d5e8fe8745ffcbfaefd82b93eeaa..d14d525a50b154baed229da5269ed491f082dc40 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1249,6 +1249,7 @@ public class PurpurWorldConfig {
@@ -1247,6 +1247,7 @@ public class PurpurWorldConfig {
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
public boolean villagerFollowEmeraldBlock = false;
@@ -60,7 +60,7 @@ index 714ad964c90d8fb8244787899be1338c8ab445f8..66198aa053072cf95b6d8f988ae839ec
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1261,6 +1262,7 @@ public class PurpurWorldConfig {
@@ -1259,6 +1260,7 @@ public class PurpurWorldConfig {
villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
@@ -68,7 +68,7 @@ index 714ad964c90d8fb8244787899be1338c8ab445f8..66198aa053072cf95b6d8f988ae839ec
}
public boolean vindicatorRidable = false;
@@ -1281,6 +1283,7 @@ public class PurpurWorldConfig {
@@ -1279,6 +1281,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderRidableInWater = false;
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
@@ -76,7 +76,7 @@ index 714ad964c90d8fb8244787899be1338c8ab445f8..66198aa053072cf95b6d8f988ae839ec
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1291,6 +1294,7 @@ public class PurpurWorldConfig {
@@ -1289,6 +1292,7 @@ public class PurpurWorldConfig {
}
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);

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

@@ -18,10 +18,10 @@ index a44a0eaa5f8b1f6dc0b2570fafc5a20c669f07bd..d195212838e253d7a479a89c6650bb00
for (int i = 0; i < 10; ++i) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 66198aa053072cf95b6d8f988ae839ec72fa67f0..999d98cb67fa14427b5a16a46ea047fc90444f7c 100644
index d14d525a50b154baed229da5269ed491f082dc40..f2ea8d40ee8d238c1cd93b600d377e544b9c53e8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1250,6 +1250,8 @@ public class PurpurWorldConfig {
@@ -1248,6 +1248,8 @@ public class PurpurWorldConfig {
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
@@ -30,7 +30,7 @@ index 66198aa053072cf95b6d8f988ae839ec72fa67f0..999d98cb67fa14427b5a16a46ea047fc
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1263,6 +1265,8 @@ public class PurpurWorldConfig {
@@ -1261,6 +1263,8 @@ public class PurpurWorldConfig {
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);

8
patches/server/0060-Implement-infinite-liquids.patch → patches/server/0059-Implement-infinite-liquids.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement infinite liquids
diff --git a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
index 7fda7da544b2d0bbd3803d88ee34c92350a8b8ef..cf3f08e9dd65b88e1377bbf96cf2beb0888ca864 100644
index 1aab936f9f57bd2dda4444d6bd36e064809e5915..8ecbe2e27f8f9d97c81a0e866b5224487747cd14 100644
--- a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
+++ b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
@@ -217,7 +217,7 @@ public abstract class FlowingFluid extends Fluid {
@@ -35,7 +35,7 @@ index 7fda7da544b2d0bbd3803d88ee34c92350a8b8ef..cf3f08e9dd65b88e1377bbf96cf2beb0
protected void spreadTo(LevelAccessor world, BlockPos pos, BlockState state, Direction direction, FluidState fluidState) {
diff --git a/src/main/java/net/minecraft/world/level/material/LavaFluid.java b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
index 695783e64564b1d2a178d57a89737d2a97ab9014..cd1a33a1f10d04a91358f51d736bda34110324c4 100644
index 8e15976c83c71b8f335511e6747d56d3c8ff6856..9fc7bc3141c0fe6b65d78edf6bac3c45d46ae4fe 100644
--- a/src/main/java/net/minecraft/world/level/material/LavaFluid.java
+++ b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
@@ -199,6 +199,18 @@ public abstract class LavaFluid extends FlowingFluid {
@@ -81,7 +81,7 @@ index 56d50b9310d30e0f81f3d2549ff5c256eb07cc2a..4cc6d665c7d52b6edcaaa5f9ed131407
@Override
protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state, BlockPos source) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 999d98cb67fa14427b5a16a46ea047fc90444f7c..078899d049fc0cc9b8823764dd2a3cf57b60ed40 100644
index f2ea8d40ee8d238c1cd93b600d377e544b9c53e8..54d72b8b0386443137155fcc0e60c57d38c3e5b3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -229,6 +229,20 @@ public class PurpurWorldConfig {
@@ -102,6 +102,6 @@ index 999d98cb67fa14427b5a16a46ea047fc90444f7c..078899d049fc0cc9b8823764dd2a3cf5
+ waterInfiniteRequiredSources = getInt("blocks.water.infinite-required-sources", waterInfiniteRequiredSources);
+ }
+
public boolean signAllowColors = false;
public boolean signRightClickEdit = false;
private void signSettings() {
signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);

4
patches/server/0061-Make-lava-flow-speed-configurable.patch → patches/server/0060-Make-lava-flow-speed-configurable.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Make lava flow speed configurable
diff --git a/src/main/java/net/minecraft/world/level/material/LavaFluid.java b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
index cd1a33a1f10d04a91358f51d736bda34110324c4..b0d671ba015d1ad37fdf600b8e70def2d7a0fa2e 100644
index 9fc7bc3141c0fe6b65d78edf6bac3c45d46ae4fe..a7d2fcad13f1f9b7055732636cd5803981f5eab8 100644
--- a/src/main/java/net/minecraft/world/level/material/LavaFluid.java
+++ b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
@@ -181,7 +181,7 @@ public abstract class LavaFluid extends FlowingFluid {
@@ -18,7 +18,7 @@ index cd1a33a1f10d04a91358f51d736bda34110324c4..b0d671ba015d1ad37fdf600b8e70def2
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 078899d049fc0cc9b8823764dd2a3cf57b60ed40..41550ce0b5577ae80761732144e908325bb04695 100644
index 54d72b8b0386443137155fcc0e60c57d38c3e5b3..4d0952bb0f98cdf9482bec98bd22710558bb0181 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -231,9 +231,13 @@ public class PurpurWorldConfig {

2
patches/server/0062-Add-player-death-exp-control-options.patch → patches/server/0061-Add-player-death-exp-control-options.patch
View File

@@ -31,7 +31,7 @@ index adc094f20ed8bb4c531b06eb2e78bebd3faff578..42becbb21eee4e1b0a14e2fc3e226f0d
return 0;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 41550ce0b5577ae80761732144e908325bb04695..61e417c7c3113ce2515da09761d977a4fc766e64 100644
index 4d0952bb0f98cdf9482bec98bd22710558bb0181..6f286a16a91b368bdfd98a738be13ec7e468de30 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -168,6 +168,8 @@ public class PurpurWorldConfig {

2
patches/server/0063-Configurable-void-damage-height-and-damage.patch → patches/server/0062-Configurable-void-damage-height-and-damage.patch
View File

@@ -31,7 +31,7 @@ index dfbb53ddf9255351b44259d0016b362a3a4625b3..2eea21644321fa07950b44cddfe72c4d
protected void updateSwingTime() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 61e417c7c3113ce2515da09761d977a4fc766e64..c86f1d00b7ae613f2575a98ce6824c72c60c0f47 100644
index 6f286a16a91b368bdfd98a738be13ec7e468de30..794c6adf2a4af7fe59b5b1067c1337275b941760 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -222,10 +222,14 @@ public class PurpurWorldConfig {

0
patches/server/0064-Add-canSaveToDisk-to-Entity.patch → patches/server/0063-Add-canSaveToDisk-to-Entity.patch
View File

2
patches/server/0065-Dispenser-curse-of-binding-protection.patch → patches/server/0064-Dispenser-curse-of-binding-protection.patch
View File

@@ -43,7 +43,7 @@ index baa7e055d8ee4a153842128b07984b9f6deac6ca..014dd3aa8a7313d978d4781a1b7c6f53
// CraftBukkit start
Level world = pointer.getLevel();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c86f1d00b7ae613f2575a98ce6824c72c60c0f47..573904ac2403496c31af399b3f3bbb61d43e7a08 100644
index 794c6adf2a4af7fe59b5b1067c1337275b941760..0868835769e4d85fbac81fbb0dbd27e6ae5f8020 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -232,6 +232,11 @@ public class PurpurWorldConfig {

2
patches/server/0066-Add-option-for-boats-to-eject-players-on-land.patch → patches/server/0065-Add-option-for-boats-to-eject-players-on-land.patch
View File

@@ -17,7 +17,7 @@ index b967177cb10041f96831322c311579e409050e88..4b38f8186dcd9a98a5413a51c5563c49
} else {
return Boat.Status.IN_AIR;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 573904ac2403496c31af399b3f3bbb61d43e7a08..4894b0654a81950ec926e448757a2fb379f70daa 100644
index 0868835769e4d85fbac81fbb0dbd27e6ae5f8020..6380c028150c3012f5da45c644cd5f590c00e862 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -219,12 +219,14 @@ public class PurpurWorldConfig {

2
patches/server/0067-Mending-mends-most-damages-equipment-first.patch → patches/server/0066-Mending-mends-most-damages-equipment-first.patch
View File

@@ -73,7 +73,7 @@ index 7bc5aa35b52de0027cf58a6127a9903464ccaf47..f3ec99d2eae31ba7ce7d4b8e7399a56d
Entry<EquipmentSlot, ItemStack> entry = getRandomItemWith(enchantment, entityliving);
return entry != null ? entry.getValue() : ItemStack.EMPTY;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4894b0654a81950ec926e448757a2fb379f70daa..42e4c17030054fa75619c3db7c5f4db113b8f6e8 100644
index 6380c028150c3012f5da45c644cd5f590c00e862..f2807fac5533e995975cf35e014b7fc361576d32 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -219,6 +219,7 @@ public class PurpurWorldConfig {

0
patches/server/0068-Add-5-second-tps-average-in-tps.patch → patches/server/0067-Add-5-second-tps-average-in-tps.patch
View File

2
patches/server/0069-Implement-elytra-settings.patch → patches/server/0068-Implement-elytra-settings.patch
View File

@@ -99,7 +99,7 @@ index 998758be827efbcb7693ed36ab1dffc0ef0369bf..5beaafec0759543d3bddf99028c97d0d
entityhuman.startAutoSpinAttack(20);
if (entityhuman.isOnGround()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 42e4c17030054fa75619c3db7c5f4db113b8f6e8..c80a13bce7998f8dbcd1684724bb5aa4b07d9479 100644
index f2807fac5533e995975cf35e014b7fc361576d32..3163d930237291d4a80e5b36e15b4880e3933a4e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -99,6 +99,19 @@ public class PurpurWorldConfig {

2
patches/server/0070-Item-entity-immunities.patch → patches/server/0069-Item-entity-immunities.patch
View File

@@ -96,7 +96,7 @@ index 0ac107d7a360a5812a43488c611498d12546eed9..c2b0add36da8ad1bfb3fbfdd180a8606
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c80a13bce7998f8dbcd1684724bb5aa4b07d9479..3d88ccc1ff7c87815bac2e9f573333e63caea223 100644
index 3163d930237291d4a80e5b36e15b4880e3933a4e..1e0896ed38cf0d861f25d23c6ebe6a0be4742132 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -112,6 +112,49 @@ public class PurpurWorldConfig {

0
patches/server/0071-Add-ping-command.patch → patches/server/0070-Add-ping-command.patch
View File

0
patches/server/0072-Add-demo-command.patch → patches/server/0071-Add-demo-command.patch
View File

0
patches/server/0073-Add-credits-command.patch → patches/server/0072-Add-credits-command.patch
View File

20
patches/server/0074-Configurable-jockey-options.patch → patches/server/0073-Configurable-jockey-options.patch
View File

@@ -167,10 +167,10 @@ index f30b36b3f1153e1cbd9b8242909d9ba8c995df1d..76f1bbec2b8ebe037de65ee5ec718e17
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3d88ccc1ff7c87815bac2e9f573333e63caea223..f15963106c5592e1ea7ef715ed79d7c62e35d308 100644
index 1e0896ed38cf0d861f25d23c6ebe6a0be4742132..ccf64226afaf2242be106935ae57ab88450ae0ec 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -540,6 +540,9 @@ public class PurpurWorldConfig {
@@ -538,6 +538,9 @@ public class PurpurWorldConfig {
public boolean drownedRidableInWater = false;
public double drownedMaxHealth = 20.0D;
public double drownedSpawnReinforcements = 0.1D;
@@ -180,7 +180,7 @@ index 3d88ccc1ff7c87815bac2e9f573333e63caea223..f15963106c5592e1ea7ef715ed79d7c6
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -550,6 +553,9 @@ public class PurpurWorldConfig {
@@ -548,6 +551,9 @@ public class PurpurWorldConfig {
}
drownedMaxHealth = getDouble("mobs.drowned.attributes.max_health", drownedMaxHealth);
drownedSpawnReinforcements = getDouble("mobs.drowned.attributes.spawn_reinforcements", drownedSpawnReinforcements);
@@ -190,7 +190,7 @@ index 3d88ccc1ff7c87815bac2e9f573333e63caea223..f15963106c5592e1ea7ef715ed79d7c6
}
public boolean elderGuardianRidable = false;
@@ -762,6 +768,9 @@ public class PurpurWorldConfig {
@@ -760,6 +766,9 @@ public class PurpurWorldConfig {
public boolean huskRidableInWater = false;
public double huskMaxHealth = 20.0D;
public double huskSpawnReinforcements = 0.1D;
@@ -200,7 +200,7 @@ index 3d88ccc1ff7c87815bac2e9f573333e63caea223..f15963106c5592e1ea7ef715ed79d7c6
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -772,6 +781,9 @@ public class PurpurWorldConfig {
@@ -770,6 +779,9 @@ public class PurpurWorldConfig {
}
huskMaxHealth = getDouble("mobs.husk.attributes.max_health", huskMaxHealth);
huskSpawnReinforcements = getDouble("mobs.husk.attributes.spawn_reinforcements", huskSpawnReinforcements);
@@ -210,7 +210,7 @@ index 3d88ccc1ff7c87815bac2e9f573333e63caea223..f15963106c5592e1ea7ef715ed79d7c6
}
public boolean illusionerRidable = false;
@@ -1472,6 +1484,9 @@ public class PurpurWorldConfig {
@@ -1470,6 +1482,9 @@ public class PurpurWorldConfig {
public boolean zombieRidableInWater = false;
public double zombieMaxHealth = 20.0D;
public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index 3d88ccc1ff7c87815bac2e9f573333e63caea223..f15963106c5592e1ea7ef715ed79d7c6
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1482,6 +1497,9 @@ public class PurpurWorldConfig {
@@ -1480,6 +1495,9 @@ public class PurpurWorldConfig {
}
zombieMaxHealth = getDouble("mobs.zombie.attributes.max_health", zombieMaxHealth);
zombieSpawnReinforcements = getDouble("mobs.zombie.attributes.spawn_reinforcements", zombieSpawnReinforcements);
@@ -230,7 +230,7 @@ index 3d88ccc1ff7c87815bac2e9f573333e63caea223..f15963106c5592e1ea7ef715ed79d7c6
}
public boolean zombieHorseRidableInWater = false;
@@ -1515,6 +1533,9 @@ public class PurpurWorldConfig {
@@ -1513,6 +1531,9 @@ public class PurpurWorldConfig {
public boolean zombieVillagerRidableInWater = false;
public double zombieVillagerMaxHealth = 20.0D;
public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index 3d88ccc1ff7c87815bac2e9f573333e63caea223..f15963106c5592e1ea7ef715ed79d7c6
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -1525,12 +1546,18 @@ public class PurpurWorldConfig {
@@ -1523,12 +1544,18 @@ public class PurpurWorldConfig {
}
zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
@@ -259,7 +259,7 @@ index 3d88ccc1ff7c87815bac2e9f573333e63caea223..f15963106c5592e1ea7ef715ed79d7c6
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1541,5 +1568,8 @@ public class PurpurWorldConfig {
@@ -1539,5 +1566,8 @@ public class PurpurWorldConfig {
}
zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);

6
patches/server/0075-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch → patches/server/0074-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -258,10 +258,10 @@ index 7e0affe953585b19686bb21b31a6a2b9534aba10..b651ff470853c1c6af2f2c56848a002b
private float speed = 0.1F;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f15963106c5592e1ea7ef715ed79d7c62e35d308..96bb947390a3d9e0d37ddbce2ff621c53e2c3f58 100644
index ccf64226afaf2242be106935ae57ab88450ae0ec..3e5bfd0acdc99c6fcf929d3b244080a4c9df99d4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -953,6 +953,9 @@ public class PurpurWorldConfig {
@@ -951,6 +951,9 @@ public class PurpurWorldConfig {
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
public double phantomMaxHealth = 20.0D;
@@ -271,7 +271,7 @@ index f15963106c5592e1ea7ef715ed79d7c62e35d308..96bb947390a3d9e0d37ddbce2ff621c5
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -966,6 +969,9 @@ public class PurpurWorldConfig {
@@ -964,6 +967,9 @@ public class PurpurWorldConfig {
set("mobs.phantom.attributes.max_health", oldValue);
}
phantomMaxHealth = getDouble("mobs.phantom.attributes.max_health", phantomMaxHealth);

6
patches/server/0076-Add-phantom-spawning-options.patch → patches/server/0075-Add-phantom-spawning-options.patch
View File

@@ -48,10 +48,10 @@ index 1e21d6cf2f03219fb2b7217c9a72bdd83c2146f7..dad5d3c754395b39e96be1e35a99c8bf
for (int l = 0; l < k; ++l) {
// Paper start
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 96bb947390a3d9e0d37ddbce2ff621c53e2c3f58..e92c0c732af5581c266b146f360bce05364d8a28 100644
index 3e5bfd0acdc99c6fcf929d3b244080a4c9df99d4..688a6a8c2e587a27e8c9c684feb06a68354a7921 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -956,6 +956,18 @@ public class PurpurWorldConfig {
@@ -954,6 +954,18 @@ public class PurpurWorldConfig {
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
public double phantomOrbitCrystalRadius = 0.0D;
@@ -70,7 +70,7 @@ index 96bb947390a3d9e0d37ddbce2ff621c53e2c3f58..e92c0c732af5581c266b146f360bce05
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -972,6 +984,18 @@ public class PurpurWorldConfig {
@@ -970,6 +982,18 @@ public class PurpurWorldConfig {
phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
phantomOrbitCrystalRadius = getDouble("mobs.phantom.orbit-crystal-radius", phantomOrbitCrystalRadius);

2
patches/server/0077-Implement-bed-explosion-options.patch → patches/server/0076-Implement-bed-explosion-options.patch
View File

@@ -27,7 +27,7 @@ index 20c0030d566012146021613325c6a979f392740e..340e5dee8bf5d8a865c19a8fe63399ae
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e92c0c732af5581c266b146f360bce05364d8a28..4405108543e36b74be2678d6e5b1de9363db5151 100644
index 688a6a8c2e587a27e8c9c684feb06a68354a7921..0f312498ca942f152d8a4aa385b4840097660330 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -292,6 +292,22 @@ public class PurpurWorldConfig {

4
patches/server/0078-Implement-respawn-anchor-explosion-options.patch → patches/server/0077-Implement-respawn-anchor-explosion-options.patch
View File

@@ -18,7 +18,7 @@ index 07e893f1859abe3c2a765694c21309d60346ca82..0fabe3ec1e9d7dae952db1f1e3dd3af8
public static boolean canSetSpawn(Level world) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4405108543e36b74be2678d6e5b1de9363db5151..45e2c201f4d6768e029d075dfcb3716c92d394a4 100644
index 0f312498ca942f152d8a4aa385b4840097660330..f871295169e6ea75a3e6da9bc9cc15b48835dd4c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -336,6 +336,22 @@ public class PurpurWorldConfig {
@@ -41,6 +41,6 @@ index 4405108543e36b74be2678d6e5b1de9363db5151..45e2c201f4d6768e029d075dfcb3716c
+ }
+ }
+
public boolean signAllowColors = false;
public boolean signRightClickEdit = false;
private void signSettings() {
signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);

0
patches/server/0079-Add-allow-water-in-end-world-option.patch → patches/server/0078-Add-allow-water-in-end-world-option.patch
View File

2
patches/server/0080-Allow-color-codes-in-books.patch → patches/server/0079-Allow-color-codes-in-books.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 7047a77b6f6b9b15145dd8c54e978d81b1f4e998..3e5bb0075766c826995807b4b16cf12f3b06a755 100644
index bb0f8dbc0746283ff7670dee24dd932254aeec0d..6627214ddab3a8b7080ead964a44a367b0c34a05 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1185,13 +1185,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

2
patches/server/0081-Entity-lifespan.patch → patches/server/0080-Entity-lifespan.patch
View File

@@ -89,7 +89,7 @@ index d936cf11ece70d528e5a0d1176fdbafd9b8f9d93..198fe041d20e7ed21b47d5c22dcc121a
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 45e2c201f4d6768e029d075dfcb3716c92d394a4..a16797934b4c803828996c7a7f1b18f6b4925250 100644
index f871295169e6ea75a3e6da9bc9cc15b48835dd4c..48d207b696acebb9be35b43f46e98dd11448f0e6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -112,6 +112,11 @@ public class PurpurWorldConfig {

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 11ebb94eb26836231cdd81514a5639e756876e09..48f19d3cfbf310344bf062b269a5f5eecc2887a5 100644
index d37aa315753ffff5601d42987beae7af4a267ce1..299e628db2ddb0f36294c12dd5b55db6c519ac22 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2538,5 +2538,25 @@ public class ServerPlayer extends Player {
@@ -2537,5 +2537,25 @@ public class ServerPlayer extends Player {
}
// CraftBukkit end
@@ -55,7 +55,7 @@ index 782c49ebd9574aa68de4693fec20c6130f656c23..17828733fff18cb3159dd75280aa1f1b
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a16797934b4c803828996c7a7f1b18f6b4925250..213950f1d36c504824d0053843c3fe869f9eed84 100644
index 48d207b696acebb9be35b43f46e98dd11448f0e6..0936ed03cf94cf534535524561791ef454b1df7e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -231,6 +231,7 @@ public class PurpurWorldConfig {

6
patches/server/0083-Squid-EAR-immunity.patch → patches/server/0082-Squid-EAR-immunity.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Squid EAR immunity
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 213950f1d36c504824d0053843c3fe869f9eed84..1c1a1ed14a1e2a80b3a26cb990b2577904d73b0b 100644
index 0936ed03cf94cf534535524561791ef454b1df7e..49817bb4fb106bccde979bd2a854d24ede409d56 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1289,6 +1289,7 @@ public class PurpurWorldConfig {
@@ -1287,6 +1287,7 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public double squidMaxHealth = 10.0D;
@@ -16,7 +16,7 @@ index 213950f1d36c504824d0053843c3fe869f9eed84..1c1a1ed14a1e2a80b3a26cb990b25779
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1297,6 +1298,7 @@ public class PurpurWorldConfig {
@@ -1295,6 +1296,7 @@ public class PurpurWorldConfig {
set("mobs.squid.attributes.max_health", oldValue);
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);

6
patches/server/0084-Phantoms-burn-in-light.patch → patches/server/0083-Phantoms-burn-in-light.patch
View File

@@ -47,10 +47,10 @@ index b651ff470853c1c6af2f2c56848a002b066802f5..edb28f9424af0d1973231729785b6ec6
list.sort(Comparator.comparing((Entity e) -> { return e.getY(); }).reversed()); // CraftBukkit - decompile error
Iterator iterator = list.iterator();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1c1a1ed14a1e2a80b3a26cb990b2577904d73b0b..f06fb11df26f7a7e3fdb1f7ce21aa67e3ed5a07d 100644
index 49817bb4fb106bccde979bd2a854d24ede409d56..52741957c8b9572c22185f89e05cd5724975cc6b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1007,6 +1007,9 @@ public class PurpurWorldConfig {
@@ -1005,6 +1005,9 @@ public class PurpurWorldConfig {
public int phantomSpawnOverheadRadius = 10;
public int phantomSpawnMinPerAttempt = 1;
public int phantomSpawnMaxPerAttempt = -1;
@@ -60,7 +60,7 @@ index 1c1a1ed14a1e2a80b3a26cb990b2577904d73b0b..f06fb11df26f7a7e3fdb1f7ce21aa67e
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1035,6 +1038,9 @@ public class PurpurWorldConfig {
@@ -1033,6 +1036,9 @@ public class PurpurWorldConfig {
phantomSpawnOverheadRadius = getInt("mobs.phantom.spawn.overhead.radius", phantomSpawnOverheadRadius);
phantomSpawnMinPerAttempt = getInt("mobs.phantom.spawn.per-attempt.min", phantomSpawnMinPerAttempt);
phantomSpawnMaxPerAttempt = getInt("mobs.phantom.spawn.per-attempt.max", phantomSpawnMaxPerAttempt);

6
patches/server/0085-Configurable-villager-breeding.patch → patches/server/0084-Configurable-villager-breeding.patch
View File

@@ -18,10 +18,10 @@ index d195212838e253d7a479a89c6650bb008c5daadd..145607300ed953e88b0f9fc1fc61bc34
private boolean hungry() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f06fb11df26f7a7e3fdb1f7ce21aa67e3ed5a07d..970fee2f23d79ca702e6e2ca22afac434945cf9f 100644
index 52741957c8b9572c22185f89e05cd5724975cc6b..8da468573da0743a4869cfae8b72182d7e231cc5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1432,6 +1432,7 @@ public class PurpurWorldConfig {
@@ -1430,6 +1430,7 @@ public class PurpurWorldConfig {
public boolean villagerCanBeLeashed = false;
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
@@ -29,7 +29,7 @@ index f06fb11df26f7a7e3fdb1f7ce21aa67e3ed5a07d..970fee2f23d79ca702e6e2ca22afac43
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1447,6 +1448,7 @@ public class PurpurWorldConfig {
@@ -1445,6 +1446,7 @@ public class PurpurWorldConfig {
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);

4
patches/server/0086-Redstone-deactivates-spawners.patch → patches/server/0085-Redstone-deactivates-spawners.patch
View File

@@ -17,10 +17,10 @@ index 03726227fdd60e9cf77213d50184abff438e01ef..76979991d2ded84161e8a0fc72cbb2d2
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 970fee2f23d79ca702e6e2ca22afac434945cf9f..932dc1b97ae84244f1c8fd8e9c49b655a0c8b62c 100644
index 8da468573da0743a4869cfae8b72182d7e231cc5..7d41d9c5e35bb451f214b67b20c05e30f63ab9d4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -366,6 +366,11 @@ public class PurpurWorldConfig {
@@ -364,6 +364,11 @@ public class PurpurWorldConfig {
signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
}

2
patches/server/0087-Totems-work-in-inventory.patch → patches/server/0086-Totems-work-in-inventory.patch
View File

@@ -29,7 +29,7 @@ index 17828733fff18cb3159dd75280aa1f1b32ac088f..4904abec73580eee50c12a8edcb6e743
event.setCancelled(itemstack == null);
this.level.getCraftServer().getPluginManager().callEvent(event);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 932dc1b97ae84244f1c8fd8e9c49b655a0c8b62c..88cb60050442a757fb94fa050c4d9a073f197e85 100644
index 7d41d9c5e35bb451f214b67b20c05e30f63ab9d4..d10be85bd30dcf5eba755152954be35a43e8b8b4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -232,6 +232,7 @@ public class PurpurWorldConfig {

6
patches/server/0088-Add-vindicator-johnny-spawn-chance.patch → patches/server/0087-Add-vindicator-johnny-spawn-chance.patch
View File

@@ -30,10 +30,10 @@ index 730fd18cd9dc334fe527283a2ba5e5259fbfead5..c611dd58a7697093087c6d2c3b47cf85
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 88cb60050442a757fb94fa050c4d9a073f197e85..73f0ba30c099a2d32111cfde8e100092f6885304 100644
index d10be85bd30dcf5eba755152954be35a43e8b8b4..8c93cddf6a1afb442a383f2fbb2d8ba279d337bd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1461,6 +1461,7 @@ public class PurpurWorldConfig {
@@ -1459,6 +1459,7 @@ public class PurpurWorldConfig {
public boolean vindicatorRidable = false;
public boolean vindicatorRidableInWater = false;
public double vindicatorMaxHealth = 24.0D;
@@ -41,7 +41,7 @@ index 88cb60050442a757fb94fa050c4d9a073f197e85..73f0ba30c099a2d32111cfde8e100092
private void vindicatorSettings() {
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
@@ -1470,6 +1471,7 @@ public class PurpurWorldConfig {
@@ -1468,6 +1469,7 @@ public class PurpurWorldConfig {
set("mobs.vindicator.attributes.max_health", oldValue);
}
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);

0
patches/server/0089-Add-option-to-disable-certain-block-updates.patch → patches/server/0088-Add-option-to-disable-certain-block-updates.patch
View File

2
patches/server/0090-Dispensers-place-anvils-option.patch → patches/server/0089-Dispensers-place-anvils-option.patch
View File

@@ -41,7 +41,7 @@ index 59db245fe11384282af84ec1d5be08ab0e9484ca..a08eebaa08a75be4e7e8f6d560740ea1
static void setEntityPokingOutOfBlock(BlockSource pointer, Entity entity, Direction direction) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 73f0ba30c099a2d32111cfde8e100092f6885304..3b56a3668d417890c5233c04f15dda9499e8265d 100644
index 8c93cddf6a1afb442a383f2fbb2d8ba279d337bd..bad29754e48433e211b5c163c270fafaeb6794f4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -318,8 +318,10 @@ public class PurpurWorldConfig {

2
patches/server/0091-Allow-anvil-colors.patch → patches/server/0090-Allow-anvil-colors.patch
View File

@@ -37,7 +37,7 @@ index 3751ce065a38cb55b0800f000e33b2b32c7e0f5d..c8b6c5c65a4cd3a53b300358513f96ac
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3b56a3668d417890c5233c04f15dda9499e8265d..730abc3bc780ccbd22b9e8c33a2ea894f53f13ee 100644
index bad29754e48433e211b5c163c270fafaeb6794f4..7bc99c280d16aa22f083c5d644c4ee3bec0bae49 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -301,6 +301,11 @@ public class PurpurWorldConfig {

6
patches/server/0092-Add-option-to-disable-dolphin-treasure-searching.patch → patches/server/0091-Add-option-to-disable-dolphin-treasure-searching.patch
View File

@@ -17,10 +17,10 @@ index f34e1c342562a509539f2176a91e6132cd6672b2..27747e712a5964b43a7fe1d11165740b
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 730abc3bc780ccbd22b9e8c33a2ea894f53f13ee..92d567ee59d18fe6e202774dd5b91980cca37ec5 100644
index 7bc99c280d16aa22f083c5d644c4ee3bec0bae49..4f35036bb4dc7a6325e7a35f1623139da39e31d9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -552,6 +552,7 @@ public class PurpurWorldConfig {
@@ -550,6 +550,7 @@ public class PurpurWorldConfig {
public float dolphinSpitSpeed = 1.0F;
public float dolphinSpitDamage = 2.0F;
public double dolphinMaxHealth = 10.0D;
@@ -28,7 +28,7 @@ index 730abc3bc780ccbd22b9e8c33a2ea894f53f13ee..92d567ee59d18fe6e202774dd5b91980
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinSpitCooldown = getInt("mobs.dolphin.spit.cooldown", dolphinSpitCooldown);
@@ -563,6 +564,7 @@ public class PurpurWorldConfig {
@@ -561,6 +562,7 @@ public class PurpurWorldConfig {
set("mobs.dolphin.attributes.max_health", oldValue);
}
dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);

0
patches/server/0093-Short-enderman-height.patch → patches/server/0092-Short-enderman-height.patch
View File

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

@@ -54,10 +54,10 @@ index 120498a39b7ca7aee9763084507508d4a1c425aa..0dfc639043998cd3bd32afaaf8153459
+ // Purpur
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 92d567ee59d18fe6e202774dd5b91980cca37ec5..c768239b89fba36920a0b6ac926de2584efa7c19 100644
index 4f35036bb4dc7a6325e7a35f1623139da39e31d9..65ce3df6703f11bb77e4b8687b035b83cc7b8dd3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1312,6 +1312,7 @@ public class PurpurWorldConfig {
@@ -1310,6 +1310,7 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
@@ -65,7 +65,7 @@ index 92d567ee59d18fe6e202774dd5b91980cca37ec5..c768239b89fba36920a0b6ac926de258
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1321,6 +1322,7 @@ public class PurpurWorldConfig {
@@ -1319,6 +1320,7 @@ public class PurpurWorldConfig {
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);

0
patches/server/0095-Crying-obsidian-valid-for-portal-frames.patch → patches/server/0094-Crying-obsidian-valid-for-portal-frames.patch
View File

2
patches/server/0096-Entities-can-use-portals-configuration.patch → patches/server/0095-Entities-can-use-portals-configuration.patch
View File

@@ -27,7 +27,7 @@ index 94601ee45d3d1e2829e25dc318f49e2dc7ff2d70..42e7d6d431591cf0edf8f3aa05a4ccf3
public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c768239b89fba36920a0b6ac926de2584efa7c19..2bc7177f0435e93ff8964b74e590be51181a2613 100644
index 65ce3df6703f11bb77e4b8687b035b83cc7b8dd3..f6eafc276ae98430dee2ab65897e201136d1d285 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -287,6 +287,7 @@ public class PurpurWorldConfig {

0
patches/server/0097-LivingEntity-broadcastItemBreak.patch → patches/server/0096-LivingEntity-broadcastItemBreak.patch
View File

6
patches/server/0098-Customizable-wither-health-and-healing.patch → patches/server/0097-Customizable-wither-health-and-healing.patch
View File

@@ -23,10 +23,10 @@ index 54ea9f591d31f3503a67b3b10f9f737843c03b79..10883671cb28e579445f17c7ed729a0e
this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth());
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2bc7177f0435e93ff8964b74e590be51181a2613..df725904e7682dd08049815c8bd226c318ecdf0d 100644
index f6eafc276ae98430dee2ab65897e201136d1d285..6f8dcbaf5bd02b6ce1e613e69b51e29a1c891867 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1523,6 +1523,8 @@ public class PurpurWorldConfig {
@@ -1521,6 +1521,8 @@ public class PurpurWorldConfig {
public boolean witherRidableInWater = false;
public double witherMaxY = 256D;
public double witherMaxHealth = 300.0D;
@@ -35,7 +35,7 @@ index 2bc7177f0435e93ff8964b74e590be51181a2613..df725904e7682dd08049815c8bd226c3
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1537,6 +1539,8 @@ public class PurpurWorldConfig {
@@ -1535,6 +1537,8 @@ public class PurpurWorldConfig {
set("mobs.wither.attributes.max_health", oldValue);
}
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);

2
patches/server/0099-Allow-toggling-special-MobSpawners-per-world.patch → patches/server/0098-Allow-toggling-special-MobSpawners-per-world.patch
View File

@@ -94,7 +94,7 @@ index 323eea2bccacfcc85849b5d82c2b30d991e0c0d8..bb5918ff947eb4cc4d0c964b2a8a9166
if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) {
blockposition1 = blockposition2;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index df725904e7682dd08049815c8bd226c318ecdf0d..cecb81cbed1018dfa3a1088682c8828dd9fd8c36 100644
index 6f8dcbaf5bd02b6ce1e613e69b51e29a1c891867..2a140b22698de57254978178cd5609bf6b63fb5d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -73,6 +73,12 @@ public class PurpurWorldConfig {

2
patches/server/0100-Raid-cooldown-setting.patch → patches/server/0099-Raid-cooldown-setting.patch
View File

@@ -52,7 +52,7 @@ index e8dd1fdf1a3b697a2e040424df49ac6527b68312..120f77f52ef493f16c2bd8fbc8d8d0a4
if (!this.raidMap.containsKey(raid.getId())) {
this.raidMap.put(raid.getId(), raid);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index cecb81cbed1018dfa3a1088682c8828dd9fd8c36..7ee1e9b23b17288bef4f9dda8b2865142d4b466b 100644
index 2a140b22698de57254978178cd5609bf6b63fb5d..16be9ddb79404db1d65b36b2b79cdb15cb8b122c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -313,6 +313,7 @@ public class PurpurWorldConfig {

2
patches/server/0101-Despawn-rate-config-options-per-projectile-type.patch → patches/server/0100-Despawn-rate-config-options-per-projectile-type.patch
View File

@@ -289,7 +289,7 @@ index 2867e841e73a3edfdeb83af9d96e0d0cd4116a68..8613008090a9d7cf5cd7c2a598f2c725
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7ee1e9b23b17288bef4f9dda8b2865142d4b466b..099aa282f51e6f7fbe00b83bb8aa3c5a2e6e2a8a 100644
index 16be9ddb79404db1d65b36b2b79cdb15cb8b122c..8721b4b757776e8d2d66c1ec492b5e7249850459 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -273,6 +273,35 @@ public class PurpurWorldConfig {

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

@@ -71,10 +71,10 @@ index f5551d121d4bd633ce8d667433e1def6e2fcbb8e..6f636ddea90e89fa17fa76d25b93ab50
this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 099aa282f51e6f7fbe00b83bb8aa3c5a2e6e2a8a..8de25f8dcd88e9a3bbcd4c35f4985c982683d92c 100644
index 8721b4b757776e8d2d66c1ec492b5e7249850459..d67c6a67e2c632b36ac28746195efd1cea1077d3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1644,6 +1644,7 @@ public class PurpurWorldConfig {
@@ -1642,6 +1642,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyOnlyBaby = true;
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
@@ -82,7 +82,7 @@ index 099aa282f51e6f7fbe00b83bb8aa3c5a2e6e2a8a..8de25f8dcd88e9a3bbcd4c35f4985c98
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1657,6 +1658,7 @@ public class PurpurWorldConfig {
@@ -1655,6 +1656,7 @@ public class PurpurWorldConfig {
zombieJockeyOnlyBaby = getBoolean("mobs.zombie.jockey.only-babies", zombieJockeyOnlyBaby);
zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);

0
patches/server/0103-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch → patches/server/0102-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
View File

8
patches/server/0104-Flying-squids-Oh-my.patch → patches/server/0103-Flying-squids-Oh-my.patch
View File

@@ -58,10 +58,10 @@ index 82d657e431a5a2317e5be80f3b2898a5c7371a42..9a99904bd761df5861f68533279ebde3
float f1 = Mth.cos(f) * 0.2F;
float f2 = -0.1F + this.squid.getRandom().nextFloat() * 0.2F;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8de25f8dcd88e9a3bbcd4c35f4985c982683d92c..6e6cae5834cfe74021f14a98778c0f40a7e88c4e 100644
index d67c6a67e2c632b36ac28746195efd1cea1077d3..e2b3e7849b5e1a2a18a05a36e6947dd15d1811b4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -809,9 +809,11 @@ public class PurpurWorldConfig {
@@ -807,9 +807,11 @@ public class PurpurWorldConfig {
public boolean glowSquidRidable = false;
public double glowSquidMaxHealth = 10.0D;
@@ -73,7 +73,7 @@ index 8de25f8dcd88e9a3bbcd4c35f4985c982683d92c..6e6cae5834cfe74021f14a98778c0f40
}
public boolean goatRidable = false;
@@ -1367,6 +1369,7 @@ public class PurpurWorldConfig {
@@ -1365,6 +1367,7 @@ public class PurpurWorldConfig {
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
public double squidOffsetWaterCheck = 0.0D;
@@ -81,7 +81,7 @@ index 8de25f8dcd88e9a3bbcd4c35f4985c982683d92c..6e6cae5834cfe74021f14a98778c0f40
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1377,6 +1380,7 @@ public class PurpurWorldConfig {
@@ -1375,6 +1378,7 @@ public class PurpurWorldConfig {
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);

2
patches/server/0105-Infinity-bow-settings.patch → patches/server/0104-Infinity-bow-settings.patch
View File

@@ -27,7 +27,7 @@ index 08d597db1a5345a343777a01427655e6bf2c926b..33df0ca406dc8321b76b393f317bbd1c
} else {
user.startUsingItem(hand);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6e6cae5834cfe74021f14a98778c0f40a7e88c4e..aa39acbebb7068b50f8484e549c39092867a0c09 100644
index e2b3e7849b5e1a2a18a05a36e6947dd15d1811b4..dfae718aa318ecceea7efee1d2b1c85ebfd85256 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -123,6 +123,17 @@ public class PurpurWorldConfig {

4
patches/server/0106-Stonecutter-damage.patch → patches/server/0105-Stonecutter-damage.patch
View File

@@ -61,10 +61,10 @@ index 5e28c09d782166be6d0fbc6778ef9f6c4d7af409..ce891b7d8e5cbc956c28b8bb8c5c9976
} else if (blockState.is(Blocks.HONEY_BLOCK)) {
return BlockPathTypes.STICKY_HONEY;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index aa39acbebb7068b50f8484e549c39092867a0c09..276d1e7f212d08214c5b8f0fda0d15d8898bbff3 100644
index dfae718aa318ecceea7efee1d2b1c85ebfd85256..eed7ae9bc36120e05a48c5f1c1ef61c101b720ef 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -445,6 +445,11 @@ public class PurpurWorldConfig {
@@ -443,6 +443,11 @@ public class PurpurWorldConfig {
spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
}

2
patches/server/0107-Configurable-daylight-cycle.patch → patches/server/0106-Configurable-daylight-cycle.patch
View File

@@ -70,7 +70,7 @@ index 7c84f20ce15525c4b8af4f03e3d67af08f8e1a03..da197e74b1a7b5831b98628198879dd7
public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 276d1e7f212d08214c5b8f0fda0d15d8898bbff3..bc0477eaca798cf10e8928dfa8ea6ea414f18245 100644
index eed7ae9bc36120e05a48c5f1c1ef61c101b720ef..41cd7abb09259eedfb8ea21d273b0cbb6d6ae35e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -105,6 +105,13 @@ public class PurpurWorldConfig {

0
patches/server/0108-Allow-infinite-and-mending-enchantments-together.patch → patches/server/0107-Allow-infinite-and-mending-enchantments-together.patch
View File

2
patches/server/0109-Furnace-uses-lava-from-underneath.patch → patches/server/0108-Furnace-uses-lava-from-underneath.patch
View File

@@ -48,7 +48,7 @@ index fb15ece736dde16066818216749fb2efba0b3b21..600a71b8da335ddfc70f782cbbb08647
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 bc0477eaca798cf10e8928dfa8ea6ea414f18245..3f3e8fab1b4c9496ca03c101025be49f098b9a79 100644
index 41cd7abb09259eedfb8ea21d273b0cbb6d6ae35e..bb0a8fc8d37a44b5ec2fdb008d48796d50182c14 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -406,6 +406,17 @@ public class PurpurWorldConfig {

0
patches/server/0110-Arrows-should-not-reset-despawn-counter.patch → patches/server/0109-Arrows-should-not-reset-despawn-counter.patch
View File

2
patches/server/0111-Ability-to-re-add-farmland-mechanics-from-Alpha.patch → patches/server/0110-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
View File

@@ -24,7 +24,7 @@ index 603e621b16deb63b0d6d7e59e05a8de1831e067f..56233465693943e0fdb998e44a34f802
return;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3f3e8fab1b4c9496ca03c101025be49f098b9a79..7abb25b97ed4b0cf10cc01479f75cb5ac82621ea 100644
index bb0a8fc8d37a44b5ec2fdb008d48796d50182c14..287942965fa805cbbbdb2752d5f6fe4b8e1862d5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -402,8 +402,10 @@ public class PurpurWorldConfig {

2
patches/server/0112-Add-adjustable-breeding-cooldown-to-config.patch → patches/server/0111-Add-adjustable-breeding-cooldown-to-config.patch
View File

@@ -95,7 +95,7 @@ index 112078739e234ee7b676a499fe33e5b2f505526b..f23ca62cc05f2e636462653ae78ddf5a
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7abb25b97ed4b0cf10cc01479f75cb5ac82621ea..1508618aadf4be1b90b72eeb8afb13344a8bf899 100644
index 287942965fa805cbbbdb2752d5f6fe4b8e1862d5..96229ee36ff6d6f18d371095baaa9e2833c88ae0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -361,6 +361,7 @@ public class PurpurWorldConfig {

90
patches/server/0113-Make-entity-breeding-times-configurable.patch → patches/server/0112-Make-entity-breeding-times-configurable.patch
View File

@@ -476,10 +476,10 @@ index 3ec9b8343cf80ceea8503ad78863a4b539c6ef6b..c536b0f0d0ebe5b6b6409972eb711f84
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100db3d24d2 100644
index 96229ee36ff6d6f18d371095baaa9e2833c88ae0..92f303aa5122183073abf2043c0ed3cb54fbc782 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -483,9 +483,11 @@ public class PurpurWorldConfig {
@@ -481,9 +481,11 @@ public class PurpurWorldConfig {
public boolean axolotlRidable = false;
public double axolotlMaxHealth = 14.0D;
@@ -491,7 +491,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean batRidable = false;
@@ -515,6 +517,7 @@ public class PurpurWorldConfig {
@@ -513,6 +515,7 @@ public class PurpurWorldConfig {
public boolean beeRidableInWater = false;
public double beeMaxY = 256D;
public double beeMaxHealth = 10.0D;
@@ -499,7 +499,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -525,6 +528,7 @@ public class PurpurWorldConfig {
@@ -523,6 +526,7 @@ public class PurpurWorldConfig {
set("mobs.bee.attributes.max_health", oldValue);
}
beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
@@ -507,7 +507,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean blazeRidable = false;
@@ -549,6 +553,7 @@ public class PurpurWorldConfig {
@@ -547,6 +551,7 @@ public class PurpurWorldConfig {
public int catSpawnDelay = 1200;
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
@@ -515,7 +515,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -561,6 +566,7 @@ public class PurpurWorldConfig {
@@ -559,6 +564,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);
@@ -523,7 +523,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean caveSpiderRidable = false;
@@ -581,6 +587,7 @@ public class PurpurWorldConfig {
@@ -579,6 +585,7 @@ public class PurpurWorldConfig {
public boolean chickenRidableInWater = false;
public double chickenMaxHealth = 4.0D;
public boolean chickenRetaliate = false;
@@ -531,7 +531,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -591,6 +598,7 @@ public class PurpurWorldConfig {
@@ -589,6 +596,7 @@ public class PurpurWorldConfig {
}
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
@@ -539,7 +539,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean codRidable = false;
@@ -609,6 +617,7 @@ public class PurpurWorldConfig {
@@ -607,6 +615,7 @@ public class PurpurWorldConfig {
public boolean cowRidableInWater = false;
public double cowMaxHealth = 10.0D;
public int cowFeedMushrooms = 0;
@@ -547,7 +547,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -619,6 +628,7 @@ public class PurpurWorldConfig {
@@ -617,6 +626,7 @@ public class PurpurWorldConfig {
}
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
@@ -555,7 +555,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean creeperRidable = false;
@@ -666,6 +676,7 @@ public class PurpurWorldConfig {
@@ -664,6 +674,7 @@ public class PurpurWorldConfig {
public double donkeyJumpStrengthMax = 0.5D;
public double donkeyMovementSpeedMin = 0.175D;
public double donkeyMovementSpeedMax = 0.175D;
@@ -563,7 +563,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
if (PurpurConfig.version < 10) {
@@ -681,6 +692,7 @@ public class PurpurWorldConfig {
@@ -679,6 +690,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);
@@ -571,7 +571,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean drownedRidable = false;
@@ -787,6 +799,7 @@ public class PurpurWorldConfig {
@@ -785,6 +797,7 @@ public class PurpurWorldConfig {
public boolean foxRidableInWater = false;
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
@@ -579,7 +579,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -797,6 +810,7 @@ public class PurpurWorldConfig {
@@ -795,6 +808,7 @@ public class PurpurWorldConfig {
}
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
@@ -587,7 +587,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean ghastRidable = false;
@@ -857,10 +871,12 @@ public class PurpurWorldConfig {
@@ -855,10 +869,12 @@ public class PurpurWorldConfig {
public boolean goatRidable = false;
public boolean goatRidableInWater = false;
public double goatMaxHealth = 10.0D;
@@ -600,7 +600,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean guardianRidable = false;
@@ -878,6 +894,7 @@ public class PurpurWorldConfig {
@@ -876,6 +892,7 @@ public class PurpurWorldConfig {
public boolean hoglinRidable = false;
public boolean hoglinRidableInWater = false;
public double hoglinMaxHealth = 40.0D;
@@ -608,7 +608,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void hoglinSettings() {
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
@@ -887,6 +904,7 @@ public class PurpurWorldConfig {
@@ -885,6 +902,7 @@ public class PurpurWorldConfig {
set("mobs.hoglin.attributes.max_health", oldValue);
}
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
@@ -616,7 +616,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean horseRidableInWater = false;
@@ -896,6 +914,7 @@ public class PurpurWorldConfig {
@@ -894,6 +912,7 @@ public class PurpurWorldConfig {
public double horseJumpStrengthMax = 1.0D;
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
@@ -624,7 +624,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -911,6 +930,7 @@ public class PurpurWorldConfig {
@@ -909,6 +928,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);
@@ -632,7 +632,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean huskRidable = false;
@@ -981,6 +1001,7 @@ public class PurpurWorldConfig {
@@ -979,6 +999,7 @@ public class PurpurWorldConfig {
public double llamaJumpStrengthMax = 0.5D;
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
@@ -640,7 +640,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -997,6 +1018,7 @@ public class PurpurWorldConfig {
@@ -995,6 +1016,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);
@@ -648,7 +648,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean magmaCubeRidable = false;
@@ -1016,6 +1038,7 @@ public class PurpurWorldConfig {
@@ -1014,6 +1036,7 @@ public class PurpurWorldConfig {
public boolean mooshroomRidable = false;
public boolean mooshroomRidableInWater = false;
public double mooshroomMaxHealth = 10.0D;
@@ -656,7 +656,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1025,6 +1048,7 @@ public class PurpurWorldConfig {
@@ -1023,6 +1046,7 @@ public class PurpurWorldConfig {
set("mobs.mooshroom.attributes.max_health", oldValue);
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -664,7 +664,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean muleRidableInWater = false;
@@ -1034,6 +1058,7 @@ public class PurpurWorldConfig {
@@ -1032,6 +1056,7 @@ public class PurpurWorldConfig {
public double muleJumpStrengthMax = 0.5D;
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
@@ -672,7 +672,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1049,11 +1074,13 @@ public class PurpurWorldConfig {
@@ -1047,11 +1072,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);
@@ -686,7 +686,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1063,11 +1090,13 @@ public class PurpurWorldConfig {
@@ -1061,11 +1088,13 @@ public class PurpurWorldConfig {
set("mobs.ocelot.attributes.max_health", oldValue);
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -700,7 +700,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1077,6 +1106,7 @@ public class PurpurWorldConfig {
@@ -1075,6 +1104,7 @@ public class PurpurWorldConfig {
set("mobs.panda.attributes.max_health", oldValue);
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -708,7 +708,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean parrotRidable = false;
@@ -1157,6 +1187,7 @@ public class PurpurWorldConfig {
@@ -1155,6 +1185,7 @@ public class PurpurWorldConfig {
public boolean pigRidableInWater = false;
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
@@ -716,7 +716,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1167,6 +1198,7 @@ public class PurpurWorldConfig {
@@ -1165,6 +1196,7 @@ public class PurpurWorldConfig {
}
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
@@ -724,7 +724,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean piglinRidable = false;
@@ -1216,6 +1248,7 @@ public class PurpurWorldConfig {
@@ -1214,6 +1246,7 @@ public class PurpurWorldConfig {
public double polarBearMaxHealth = 30.0D;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -732,7 +732,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1228,6 +1261,7 @@ public class PurpurWorldConfig {
@@ -1226,6 +1259,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;
@@ -740,7 +740,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean pufferfishRidable = false;
@@ -1247,6 +1281,7 @@ public class PurpurWorldConfig {
@@ -1245,6 +1279,7 @@ public class PurpurWorldConfig {
public double rabbitMaxHealth = 3.0D;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -748,7 +748,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1258,6 +1293,7 @@ public class PurpurWorldConfig {
@@ -1256,6 +1291,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);
@@ -756,7 +756,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean ravagerRidable = false;
@@ -1289,6 +1325,7 @@ public class PurpurWorldConfig {
@@ -1287,6 +1323,7 @@ public class PurpurWorldConfig {
public boolean sheepRidable = false;
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
@@ -764,7 +764,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1298,6 +1335,7 @@ public class PurpurWorldConfig {
@@ -1296,6 +1333,7 @@ public class PurpurWorldConfig {
set("mobs.sheep.attributes.max_health", oldValue);
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -772,7 +772,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean shulkerRidable = false;
@@ -1452,6 +1490,7 @@ public class PurpurWorldConfig {
@@ -1450,6 +1488,7 @@ public class PurpurWorldConfig {
public boolean striderRidable = false;
public boolean striderRidableInWater = false;
public double striderMaxHealth = 20.0D;
@@ -780,7 +780,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1461,6 +1500,7 @@ public class PurpurWorldConfig {
@@ -1459,6 +1498,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -788,7 +788,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean traderLlamaRidable = false;
@@ -1471,6 +1511,7 @@ public class PurpurWorldConfig {
@@ -1469,6 +1509,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -796,7 +796,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1487,6 +1528,7 @@ public class PurpurWorldConfig {
@@ -1485,6 +1526,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);
@@ -804,7 +804,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean tropicalFishRidable = false;
@@ -1507,6 +1549,7 @@ public class PurpurWorldConfig {
@@ -1505,6 +1547,7 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromExpOrbs = true;
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;
@@ -812,7 +812,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void turtleEggSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1519,6 +1562,7 @@ public class PurpurWorldConfig {
@@ -1517,6 +1560,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);
@@ -820,7 +820,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean vexRidable = false;
@@ -1547,6 +1591,7 @@ public class PurpurWorldConfig {
@@ -1545,6 +1589,7 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
@@ -828,7 +828,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1563,6 +1608,7 @@ public class PurpurWorldConfig {
@@ -1561,6 +1606,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);
@@ -836,7 +836,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
}
public boolean vindicatorRidable = false;
@@ -1654,6 +1700,7 @@ public class PurpurWorldConfig {
@@ -1652,6 +1698,7 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -844,7 +844,7 @@ index 1508618aadf4be1b90b72eeb8afb13344a8bf899..935a379c07fb81f62b1e820f2976d100
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1663,6 +1710,7 @@ public class PurpurWorldConfig {
@@ -1661,6 +1708,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

2
patches/server/0114-Apply-display-names-from-item-forms-of-entities-to-e.patch → patches/server/0113-Apply-display-names-from-item-forms-of-entities-to-e.patch
View File

@@ -142,7 +142,7 @@ index 0284201b0bb0f5c9a4a2393cf0d83e8e21262df3..1f46a2be362ed5f60a7ca75916fe7bd4
if (((HangingEntity) object).survives()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 935a379c07fb81f62b1e820f2976d100db3d24d2..a4ec9fd7070fbc71a08a99e2d191464aff2fff20 100644
index 92f303aa5122183073abf2043c0ed3cb54fbc782..02842e0a9e8f2548c5ebdadfab681183d6e63320 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,8 +101,10 @@ public class PurpurWorldConfig {

2
patches/server/0115-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch → patches/server/0114-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
View File

@@ -17,7 +17,7 @@ index 623f78c078fb3aa2665d7e8a37672438227bce6b..500c69e555c7247e20ef8cc59d834155
((Mob) newEntityLiving).setPersistenceRequired();
// Paper end
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a4ec9fd7070fbc71a08a99e2d191464aff2fff20..9c3f2a19e7d4b01c21a82c69c202350d730ff7e7 100644
index 02842e0a9e8f2548c5ebdadfab681183d6e63320..daf9c24425e3ecc8d9e8c3147842ea316d414788 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -102,9 +102,11 @@ public class PurpurWorldConfig {

4
patches/server/0116-Add-twisting-and-weeping-vines-growth-rates.patch → patches/server/0115-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 9c3f2a19e7d4b01c21a82c69c202350d730ff7e7..d157860e20f7faa2a4e7f50e6fcad598e7794394 100644
index daf9c24425e3ecc8d9e8c3147842ea316d414788..b1a47a8bc3a23b2f214efb1caca0bba1364c41ad 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -402,6 +402,11 @@ public class PurpurWorldConfig {
@@ -97,7 +97,7 @@ index 9c3f2a19e7d4b01c21a82c69c202350d730ff7e7..d157860e20f7faa2a4e7f50e6fcad598
public boolean dispenserApplyCursedArmor = true;
public boolean dispenserPlaceAnvils = false;
private void dispenserSettings() {
@@ -478,6 +483,16 @@ public class PurpurWorldConfig {
@@ -476,6 +481,16 @@ public class PurpurWorldConfig {
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
}

4
patches/server/0117-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch → patches/server/0116-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 d157860e20f7faa2a4e7f50e6fcad598e7794394..4037db3395073e5f27091e638555f41d6739d45e 100644
index b1a47a8bc3a23b2f214efb1caca0bba1364c41ad..dd9d39ed0fe3a170e6b024fd42e5c99d9312e410 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -403,8 +403,10 @@ public class PurpurWorldConfig {
@@ -129,7 +129,7 @@ index d157860e20f7faa2a4e7f50e6fcad598e7794394..4037db3395073e5f27091e638555f41d
public boolean respawnAnchorExplode = true;
public double respawnAnchorExplosionPower = 5.0D;
public boolean respawnAnchorExplosionFire = true;
@@ -484,13 +491,17 @@ public class PurpurWorldConfig {
@@ -482,13 +489,17 @@ public class PurpurWorldConfig {
}
public double twistingVinesGrowthModifier = 0.10D;

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

@@ -21,10 +21,10 @@ index 490b8d674a0f1ae75de89fcadb2894da55c32d4e..28d2ccc6b29b17a99a2828d044259ada
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 4037db3395073e5f27091e638555f41d6739d45e..a7ffef3041c104bb4d0de9fc9db348679f28dcd4 100644
index dd9d39ed0fe3a170e6b024fd42e5c99d9312e410..63aad596da417b9e13a8a157408ac91e79d1048e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -787,6 +787,7 @@ public class PurpurWorldConfig {
@@ -785,6 +785,7 @@ public class PurpurWorldConfig {
public boolean endermanRidableInWater = false;
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
@@ -32,7 +32,7 @@ index 4037db3395073e5f27091e638555f41d6739d45e..a7ffef3041c104bb4d0de9fc9db34867
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -797,6 +798,7 @@ public class PurpurWorldConfig {
@@ -795,6 +796,7 @@ public class PurpurWorldConfig {
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);

2
patches/server/0119-Add-configurable-snowball-damage.patch → patches/server/0118-Add-configurable-snowball-damage.patch
View File

@@ -18,7 +18,7 @@ index ed2f039c4042861bcfa2e41d8281eefd37daa9fa..d5d84893c77b4e60a19032d765d76bfd
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a7ffef3041c104bb4d0de9fc9db348679f28dcd4..c8987ff98ad2ffd808cf647266f36bfade93edd4 100644
index 63aad596da417b9e13a8a157408ac91e79d1048e..e034ffef119e36e8beee125bfdaa821aba63fcaf 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -295,6 +295,11 @@ public class PurpurWorldConfig {

2
patches/server/0120-Changeable-Mob-Left-Handed-Chance.patch → patches/server/0119-Changeable-Mob-Left-Handed-Chance.patch
View File

@@ -18,7 +18,7 @@ index 198fe041d20e7ed21b47d5c22dcc121a8d388623..6a8347ceefd663066de5887fef8ebc82
} else {
this.setLeftHanded(false);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c8987ff98ad2ffd808cf647266f36bfade93edd4..acf77639758714e39e9da69946c3fd44b32e8c1c 100644
index e034ffef119e36e8beee125bfdaa821aba63fcaf..b58de3cc86dbeae9fc4fa612f46ef9b75432965c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -130,8 +130,10 @@ public class PurpurWorldConfig {

4
patches/server/0121-Add-boat-fall-damage-config.patch → patches/server/0120-Add-boat-fall-damage-config.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add boat fall damage config
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 48f19d3cfbf310344bf062b269a5f5eecc2887a5..1025696b877d8cffae2d34b6036a362612e9d706 100644
index 299e628db2ddb0f36294c12dd5b55db6c519ac22..d3d7a668d78f52b56654fe89148ecdfd662c769e 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1018,7 +1018,16 @@ public class ServerPlayer extends Player {
@@ -27,7 +27,7 @@ index 48f19d3cfbf310344bf062b269a5f5eecc2887a5..1025696b877d8cffae2d34b6036a3626
if (!flag && isSpawnInvulnerable() && source != DamageSource.OUT_OF_WORLD) { // Purpur
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index acf77639758714e39e9da69946c3fd44b32e8c1c..a47a309fbf877dee063bdf03047c4c627224898b 100644
index b58de3cc86dbeae9fc4fa612f46ef9b75432965c..ff2ad3f56afa0828037adc27c5f36c555269fc67 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -365,6 +365,7 @@ public class PurpurWorldConfig {

6
patches/server/0122-Snow-Golem-rate-of-fire-config.patch → patches/server/0121-Snow-Golem-rate-of-fire-config.patch
View File

@@ -23,10 +23,10 @@ index dbd005660d70918fe5a9d0f5c74f6b7d7fb03c3f..093211be0d86cc114cbb109d7ba01f49
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 a47a309fbf877dee063bdf03047c4c627224898b..051024771f51409805ad76fe9a8d5fdc79a9999d 100644
index ff2ad3f56afa0828037adc27c5f36c555269fc67..f7d9795f163d44c95a2ff6c883c3b1f7f1a34bcf 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1470,6 +1470,10 @@ public class PurpurWorldConfig {
@@ -1468,6 +1468,10 @@ public class PurpurWorldConfig {
public double snowGolemMaxHealth = 4.0D;
public boolean snowGolemDropsPumpkin = true;
public boolean snowGolemPutPumpkinBack = false;
@@ -37,7 +37,7 @@ index a47a309fbf877dee063bdf03047c4c627224898b..051024771f51409805ad76fe9a8d5fdc
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1482,6 +1486,10 @@ public class PurpurWorldConfig {
@@ -1480,6 +1484,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);

0
patches/server/0123-EMC-Configurable-disable-give-dropping.patch → patches/server/0122-EMC-Configurable-disable-give-dropping.patch
View File

6
patches/server/0124-Lobotomize-stuck-villagers.patch → patches/server/0123-Lobotomize-stuck-villagers.patch
View File

@@ -53,10 +53,10 @@ index 145607300ed953e88b0f9fc1fc61bc34a6c92f84..eddaebb31f2c8372ea5bc38a77fda50a
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 051024771f51409805ad76fe9a8d5fdc79a9999d..82baa5223e5df968fb8b0ba989c1e1b7e9d60dec 100644
index f7d9795f163d44c95a2ff6c883c3b1f7f1a34bcf..0a03bdd2e4937ec30f915662f6400132f962b71d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1643,6 +1643,8 @@ public class PurpurWorldConfig {
@@ -1641,6 +1641,8 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
public int villagerBreedingTicks = 6000;
@@ -65,7 +65,7 @@ index 051024771f51409805ad76fe9a8d5fdc79a9999d..82baa5223e5df968fb8b0ba989c1e1b7
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1660,6 +1662,13 @@ public class PurpurWorldConfig {
@@ -1658,6 +1660,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/0125-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch → patches/server/0124-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
View File

@@ -183,10 +183,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 82baa5223e5df968fb8b0ba989c1e1b7e9d60dec..b370d144c6e6c95af27669ebd31292843bf65e8c 100644
index 0a03bdd2e4937ec30f915662f6400132f962b71d..4afd18568552494f01f98ef85ce069537f6904dc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1645,6 +1645,8 @@ public class PurpurWorldConfig {
@@ -1643,6 +1643,8 @@ public class PurpurWorldConfig {
public int villagerBreedingTicks = 6000;
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheck = 60;
@@ -195,7 +195,7 @@ index 82baa5223e5df968fb8b0ba989c1e1b7e9d60dec..b370d144c6e6c95af27669ebd3129284
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1669,6 +1671,8 @@ public class PurpurWorldConfig {
@@ -1667,6 +1669,8 @@ public class PurpurWorldConfig {
}
villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck);

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

@@ -35,10 +35,10 @@ index 76f1bbec2b8ebe037de65ee5ec718e17a6081c13..f8b742ee8e637edd8e8b05aff2fcc7a7
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b370d144c6e6c95af27669ebd31292843bf65e8c..dc7076250f80fc294e14d37cc63233fe66fd9b7f 100644
index 4afd18568552494f01f98ef85ce069537f6904dc..7cac56c153030eda829d283762df3ddc9ed27f96 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1871,6 +1871,7 @@ public class PurpurWorldConfig {
@@ -1869,6 +1869,7 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinJockeyOnlyBaby = true;
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
@@ -46,7 +46,7 @@ index b370d144c6e6c95af27669ebd31292843bf65e8c..dc7076250f80fc294e14d37cc63233fe
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1884,5 +1885,6 @@ public class PurpurWorldConfig {
@@ -1882,5 +1883,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);

0
patches/server/0127-Spread-out-and-optimise-player-list-ticksSpread-out-.patch → patches/server/0126-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
View File

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

@@ -201,10 +201,10 @@ index 2e20a37663f48bd606157e22d466267699c8ed21..1c971eaf2fca2d1cdc89809f673e49de
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 dc7076250f80fc294e14d37cc63233fe66fd9b7f..01a72ba50885024b02bdb473b45855438b72520a 100644
index 7cac56c153030eda829d283762df3ddc9ed27f96..2104500979f4db121a9e0bcd2cb311a8196431a8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1764,6 +1764,8 @@ public class PurpurWorldConfig {
@@ -1762,6 +1762,8 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -213,7 +213,7 @@ index dc7076250f80fc294e14d37cc63233fe66fd9b7f..01a72ba50885024b02bdb473b4585543
public int wolfBreedingTicks = 6000;
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
@@ -1774,6 +1776,8 @@ public class PurpurWorldConfig {
@@ -1772,6 +1774,8 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

10
patches/server/0129-Configurable-default-collar-color.patch → patches/server/0128-Configurable-default-collar-color.patch
View File

@@ -45,10 +45,10 @@ index 1c971eaf2fca2d1cdc89809f673e49de107a4a46..a669a00d68807ed451a1b0def7a92e17
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 01a72ba50885024b02bdb473b45855438b72520a..f690607739f7f040d633dc64632ecd514c5b601e 100644
index 2104500979f4db121a9e0bcd2cb311a8196431a8..4c887deba8d3a7f5688a8f7cc2078ed4a844a72a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -590,6 +590,7 @@ public class PurpurWorldConfig {
@@ -588,6 +588,7 @@ public class PurpurWorldConfig {
public boolean catRidable = false;
public boolean catRidableInWater = false;
@@ -56,7 +56,7 @@ index 01a72ba50885024b02bdb473b45855438b72520a..f690607739f7f040d633dc64632ecd51
public double catMaxHealth = 10.0D;
public int catSpawnDelay = 1200;
public int catSpawnSwampHutScanRange = 16;
@@ -603,6 +604,11 @@ public class PurpurWorldConfig {
@@ -601,6 +602,11 @@ public class PurpurWorldConfig {
set("mobs.cat.attributes.max-health", null);
set("mobs.cat.attributes.max_health", oldValue);
}
@@ -68,7 +68,7 @@ index 01a72ba50885024b02bdb473b45855438b72520a..f690607739f7f040d633dc64632ecd51
catMaxHealth = getDouble("mobs.cat.attributes.max_health", catMaxHealth);
catSpawnDelay = getInt("mobs.cat.spawn-delay", catSpawnDelay);
catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange);
@@ -1764,6 +1770,7 @@ public class PurpurWorldConfig {
@@ -1762,6 +1768,7 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -76,7 +76,7 @@ index 01a72ba50885024b02bdb473b45855438b72520a..f690607739f7f040d633dc64632ecd51
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -1776,6 +1783,11 @@ public class PurpurWorldConfig {
@@ -1774,6 +1781,11 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

6
patches/server/0130-Phantom-flames-on-swoop.patch → patches/server/0129-Phantom-flames-on-swoop.patch
View File

@@ -17,10 +17,10 @@ index edb28f9424af0d1973231729785b6ec67b599dbd..c3fde22e1cf98881da66e70870ced65f
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f690607739f7f040d633dc64632ecd514c5b601e..4f0ae9c4fa903b476e2a6c47632daf52bb0202f5 100644
index 4c887deba8d3a7f5688a8f7cc2078ed4a844a72a..a4c3682075034f4d724da996d71dd029b79349c3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1180,6 +1180,7 @@ public class PurpurWorldConfig {
@@ -1178,6 +1178,7 @@ public class PurpurWorldConfig {
public float phantomFlameDamage = 1.0F;
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
@@ -28,7 +28,7 @@ index f690607739f7f040d633dc64632ecd514c5b601e..4f0ae9c4fa903b476e2a6c47632daf52
public double phantomMaxHealth = 20.0D;
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
@@ -1206,6 +1207,7 @@ public class PurpurWorldConfig {
@@ -1204,6 +1205,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);

2
patches/server/0131-Option-for-chests-to-open-even-with-a-solid-block-on.patch → patches/server/0130-Option-for-chests-to-open-even-with-a-solid-block-on.patch
View File

@@ -17,7 +17,7 @@ index db726697b00afdee6078849fd224263483349912..c808664a67a9604e40ab388c6d0e6ac3
return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4f0ae9c4fa903b476e2a6c47632daf52bb0202f5..d887e7db69a7d57ebfe8bfe79d032e83ab70259a 100644
index a4c3682075034f4d724da996d71dd029b79349c3..da157904b51cf74b56a50ffd9ff35906350315c8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -418,6 +418,11 @@ public class PurpurWorldConfig {

4
patches/server/0132-Implement-TPSBar.patch → patches/server/0131-Implement-TPSBar.patch
View File

@@ -42,7 +42,7 @@ index fe029ec70afad56bb7a7361f347e9b9aef5e00ba..2c37694a6055513803708c9fb40fb0c4
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 1025696b877d8cffae2d34b6036a362612e9d706..c02609448326d76f30a1add7d50980230dfa2f06 100644
index d3d7a668d78f52b56654fe89148ecdfd662c769e..244440eb9d4e85cb73bb6c0dd645d069a036917c 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -256,6 +256,7 @@ public class ServerPlayer extends Player {
@@ -69,7 +69,7 @@ index 1025696b877d8cffae2d34b6036a362612e9d706..c02609448326d76f30a1add7d5098023
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2567,5 +2570,13 @@ public class ServerPlayer extends Player {
@@ -2566,5 +2569,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().moveToWorld(this, toLevel, true, to, !toLevel.paperConfig.disableTeleportationSuffocationCheck);
}
}

6
patches/server/0133-Striders-give-saddle-back.patch → patches/server/0132-Striders-give-saddle-back.patch
View File

@@ -28,10 +28,10 @@ index 672801ab77a10917147f12b2117a3390885b39b0..b4f7d6f4b7e6f6d5fe9e472f1723430c
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d887e7db69a7d57ebfe8bfe79d032e83ab70259a..cd850ceadc6fa6c9fd1747925ecedebf1c482067 100644
index da157904b51cf74b56a50ffd9ff35906350315c8..155d8706446ded023124d537b542fd13c611c5a8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1555,6 +1555,7 @@ public class PurpurWorldConfig {
@@ -1553,6 +1553,7 @@ public class PurpurWorldConfig {
public boolean striderRidableInWater = false;
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
@@ -39,7 +39,7 @@ index d887e7db69a7d57ebfe8bfe79d032e83ab70259a..cd850ceadc6fa6c9fd1747925ecedebf
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1565,6 +1566,7 @@ public class PurpurWorldConfig {
@@ -1563,6 +1564,7 @@ public class PurpurWorldConfig {
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);

2
patches/server/0134-PlayerBookTooLargeEvent.patch → patches/server/0133-PlayerBookTooLargeEvent.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerBookTooLargeEvent
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 3e5bb0075766c826995807b4b16cf12f3b06a755..def90885f40df7a7d3487dc7bca18de951875cba 100644
index 6627214ddab3a8b7080ead964a44a367b0c34a05..cbd434897155095b3689d0adc274df7749a83192 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1107,10 +1107,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

2
patches/server/0135-Full-netherite-armor-grants-fire-resistance.patch → patches/server/0134-Full-netherite-armor-grants-fire-resistance.patch
View File

@@ -26,7 +26,7 @@ index 42becbb21eee4e1b0a14e2fc3e226f0de26c96b1..0a8c8a24af17262be3e656042dc5c8bc
protected ItemCooldowns createItemCooldowns() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index cd850ceadc6fa6c9fd1747925ecedebf1c482067..6b5c8fd51c4fd991362c4f97e42e1370b146786c 100644
index 155d8706446ded023124d537b542fd13c611c5a8..8ac606ca005d4e1836e8428d7c44de609d535df4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -267,6 +267,19 @@ public class PurpurWorldConfig {

0
patches/server/0136-Fix-rotating-UP-DOWN-CW-and-CCW.patch → patches/server/0135-Fix-rotating-UP-DOWN-CW-and-CCW.patch
View File

62
patches/server/0137-Add-mobGriefing-bypass-to-everything-affected.patch → patches/server/0136-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -393,7 +393,7 @@ index b942e7c85e6c8f9a7664d9e5bf93bcd79e0651f1..5b29f3fced5435e172dd69f6f4eb265e
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 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805cdffed219 100644
index 8ac606ca005d4e1836e8428d7c44de609d535df4..578943ea50764470145c3ff81d3188440d365711 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -381,8 +381,11 @@ public class PurpurWorldConfig {
@@ -444,7 +444,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
public boolean respawnAnchorExplode = true;
public double respawnAnchorExplosionPower = 5.0D;
public boolean respawnAnchorExplosionFire = true;
@@ -517,6 +530,11 @@ public class PurpurWorldConfig {
@@ -515,6 +528,11 @@ public class PurpurWorldConfig {
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
}
@@ -456,7 +456,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
public double twistingVinesGrowthModifier = 0.10D;
public int twistingVinesMaxGrowthAge = 25;
private void twistingVinesSettings() {
@@ -701,6 +719,7 @@ public class PurpurWorldConfig {
@@ -699,6 +717,7 @@ public class PurpurWorldConfig {
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
public boolean creeperAllowGriefing = true;
@@ -464,7 +464,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -712,6 +731,7 @@ public class PurpurWorldConfig {
@@ -710,6 +729,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);
@@ -472,7 +472,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
}
public boolean dolphinRidable = false;
@@ -799,6 +819,7 @@ public class PurpurWorldConfig {
@@ -797,6 +817,7 @@ public class PurpurWorldConfig {
public double enderDragonMaxY = 256D;
public double enderDragonMaxHealth = 200.0D;
public boolean enderDragonAlwaysDropsFullExp = false;
@@ -480,7 +480,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -814,6 +835,7 @@ public class PurpurWorldConfig {
@@ -812,6 +833,7 @@ public class PurpurWorldConfig {
}
enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
@@ -488,7 +488,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
}
public boolean endermanRidable = false;
@@ -821,6 +843,7 @@ public class PurpurWorldConfig {
@@ -819,6 +841,7 @@ public class PurpurWorldConfig {
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
@@ -496,7 +496,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -832,6 +855,7 @@ public class PurpurWorldConfig {
@@ -830,6 +853,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);
@@ -504,7 +504,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
}
public boolean endermiteRidable = false;
@@ -851,6 +875,7 @@ public class PurpurWorldConfig {
@@ -849,6 +873,7 @@ public class PurpurWorldConfig {
public boolean evokerRidable = false;
public boolean evokerRidableInWater = false;
public double evokerMaxHealth = 24.0D;
@@ -512,7 +512,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
private void evokerSettings() {
evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
@@ -860,6 +885,7 @@ public class PurpurWorldConfig {
@@ -858,6 +883,7 @@ public class PurpurWorldConfig {
set("mobs.evoker.attributes.max_health", oldValue);
}
evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
@@ -520,7 +520,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
}
public boolean foxRidable = false;
@@ -867,6 +893,7 @@ public class PurpurWorldConfig {
@@ -865,6 +891,7 @@ public class PurpurWorldConfig {
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
public int foxBreedingTicks = 6000;
@@ -528,7 +528,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -878,6 +905,7 @@ public class PurpurWorldConfig {
@@ -876,6 +903,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);
@@ -536,7 +536,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
}
public boolean ghastRidable = false;
@@ -1273,6 +1301,7 @@ public class PurpurWorldConfig {
@@ -1271,6 +1299,7 @@ public class PurpurWorldConfig {
public boolean piglinRidable = false;
public boolean piglinRidableInWater = false;
public double piglinMaxHealth = 16.0D;
@@ -544,7 +544,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1282,6 +1311,7 @@ public class PurpurWorldConfig {
@@ -1280,6 +1309,7 @@ public class PurpurWorldConfig {
set("mobs.piglin.attributes.max_health", oldValue);
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -552,7 +552,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
}
public boolean piglinBruteRidable = false;
@@ -1301,6 +1331,7 @@ public class PurpurWorldConfig {
@@ -1299,6 +1329,7 @@ public class PurpurWorldConfig {
public boolean pillagerRidable = false;
public boolean pillagerRidableInWater = false;
public double pillagerMaxHealth = 24.0D;
@@ -560,7 +560,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1310,6 +1341,7 @@ public class PurpurWorldConfig {
@@ -1308,6 +1339,7 @@ public class PurpurWorldConfig {
set("mobs.pillager.attributes.max_health", oldValue);
}
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -568,7 +568,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
}
public boolean polarBearRidable = false;
@@ -1351,6 +1383,7 @@ public class PurpurWorldConfig {
@@ -1349,6 +1381,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -576,7 +576,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1363,11 +1396,13 @@ public class PurpurWorldConfig {
@@ -1361,11 +1394,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);
@@ -590,7 +590,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1377,6 +1412,7 @@ public class PurpurWorldConfig {
@@ -1375,6 +1410,7 @@ public class PurpurWorldConfig {
set("mobs.ravager.attributes.max_health", oldValue);
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -598,7 +598,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
}
public boolean salmonRidable = false;
@@ -1395,6 +1431,7 @@ public class PurpurWorldConfig {
@@ -1393,6 +1429,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
@@ -606,7 +606,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1405,6 +1442,7 @@ public class PurpurWorldConfig {
@@ -1403,6 +1440,7 @@ public class PurpurWorldConfig {
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
@@ -614,7 +614,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
}
public boolean shulkerRidable = false;
@@ -1424,6 +1462,7 @@ public class PurpurWorldConfig {
@@ -1422,6 +1460,7 @@ public class PurpurWorldConfig {
public boolean silverfishRidable = false;
public boolean silverfishRidableInWater = false;
public double silverfishMaxHealth = 8.0D;
@@ -622,7 +622,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1433,6 +1472,7 @@ public class PurpurWorldConfig {
@@ -1431,6 +1470,7 @@ public class PurpurWorldConfig {
set("mobs.silverfish.attributes.max_health", oldValue);
}
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -630,7 +630,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
}
public boolean skeletonRidable = false;
@@ -1500,6 +1540,7 @@ public class PurpurWorldConfig {
@@ -1498,6 +1538,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -638,7 +638,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1516,6 +1557,7 @@ public class PurpurWorldConfig {
@@ -1514,6 +1555,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);
@@ -646,7 +646,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
}
public boolean squidRidable = false;
@@ -1675,6 +1717,7 @@ public class PurpurWorldConfig {
@@ -1673,6 +1715,7 @@ public class PurpurWorldConfig {
public int villagerLobotomizeCheck = 60;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -654,7 +654,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1701,6 +1744,7 @@ public class PurpurWorldConfig {
@@ -1699,6 +1742,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);
@@ -662,7 +662,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
}
public boolean vindicatorRidable = false;
@@ -1757,6 +1801,7 @@ public class PurpurWorldConfig {
@@ -1755,6 +1799,7 @@ public class PurpurWorldConfig {
public double witherMaxHealth = 300.0D;
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
@@ -670,7 +670,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1773,6 +1818,7 @@ public class PurpurWorldConfig {
@@ -1771,6 +1816,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);
@@ -678,7 +678,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
}
public boolean witherSkeletonRidable = false;
@@ -1837,6 +1883,7 @@ public class PurpurWorldConfig {
@@ -1835,6 +1881,7 @@ public class PurpurWorldConfig {
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -686,7 +686,7 @@ index 6b5c8fd51c4fd991362c4f97e42e1370b146786c..f38b05448019805fd07f462e910c805c
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1851,6 +1898,7 @@ public class PurpurWorldConfig {
@@ -1849,6 +1896,7 @@ 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);

2
patches/server/0138-Config-to-allow-Note-Block-sounds-when-blocked.patch → patches/server/0137-Config-to-allow-Note-Block-sounds-when-blocked.patch
View File

@@ -22,7 +22,7 @@ index 0512b3701a3bf33891ab6281355c07af6be5b9c1..d79cf8df4be544c4402a2419cd9238bd
org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.getValue(NoteBlock.INSTRUMENT), data.getValue(NoteBlock.NOTE));
if (!event.isCancelled()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f38b05448019805fd07f462e910c805cdffed219..4b885756730850fd7b5db52f74eb2e3d0be749f6 100644
index 578943ea50764470145c3ff81d3188440d365711..0ab690478d35782ddb64336252ec426730bd0a19 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -384,6 +384,7 @@ public class PurpurWorldConfig {

2
patches/server/0139-Add-EntityTeleportHinderedEvent.patch → patches/server/0138-Add-EntityTeleportHinderedEvent.patch
View File

@@ -78,7 +78,7 @@ index 500a4013ce525c0474fe3991457d4c2a50ceb7ed..e0beee6bd772792fbd3bc6a856230311
blockEntity.teleportCooldown = 100;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4b885756730850fd7b5db52f74eb2e3d0be749f6..079cf41c91cd75c0f720af1e208e0c8ec40a1691 100644
index 0ab690478d35782ddb64336252ec426730bd0a19..cf0dc057e1e8f4d7554c196b1fc4ab01ef84284d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -383,6 +383,7 @@ public class PurpurWorldConfig {

0
patches/server/0140-Add-StructureGenerateEvent.patch → patches/server/0139-Add-StructureGenerateEvent.patch
View File

2
patches/server/0141-Farmland-trampling-changes.patch → patches/server/0140-Farmland-trampling-changes.patch
View File

@@ -37,7 +37,7 @@ index caf40e3df0896492be959f9e0bcfb1fad0bfa2ef..10f1e3d9c35ee80587865cf0035416ae
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 079cf41c91cd75c0f720af1e208e0c8ec40a1691..76d5e8932e583d84469353468b158f77738d315c 100644
index cf0dc057e1e8f4d7554c196b1fc4ab01ef84284d..53417e46d48b6d676b39b3ecd4cba5d5a680d998 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -456,10 +456,16 @@ public class PurpurWorldConfig {

2
patches/server/0142-Movement-options-for-armor-stands.patch → patches/server/0141-Movement-options-for-armor-stands.patch
View File

@@ -66,7 +66,7 @@ index 50370dc8697569a4e5cf8ec3714d227a59357d64..e9e24435057cff9c0af758ca2aa822c3
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 76d5e8932e583d84469353468b158f77738d315c..1924f81335d239ffd60af0211038cb23ff9caf6c 100644
index 53417e46d48b6d676b39b3ecd4cba5d5a680d998..2e82a009fb0577b129b199841321fadc11c2fd0e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -103,10 +103,16 @@ public class PurpurWorldConfig {

4
patches/server/0143-Fix-stuck-in-portals.patch → patches/server/0142-Fix-stuck-in-portals.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in portals
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index c02609448326d76f30a1add7d50980230dfa2f06..3032157924962e2c5fa5c696fdc3de4bad74d538 100644
index 244440eb9d4e85cb73bb6c0dd645d069a036917c..a66827bc04d05f9643e00ecd4bc3595cc7517b78 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1171,6 +1171,7 @@ public class ServerPlayer extends Player {
@@ -37,7 +37,7 @@ index 47067ff24923002f9083022cbec4a90896ce3012..a3420d0a30fbb3f837c863ef559f66dd
this.isInsidePortal = true;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1924f81335d239ffd60af0211038cb23ff9caf6c..724bce388bf69f9ca7e8e2bf01c17b86f7814b36 100644
index 2e82a009fb0577b129b199841321fadc11c2fd0e..a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -297,6 +297,7 @@ public class PurpurWorldConfig {

220
patches/server/0144-Toggle-for-water-sensitive-mob-damage.patch → patches/server/0143-Toggle-for-water-sensitive-mob-damage.patch
View File

@@ -1174,10 +1174,10 @@ index c5dbb1c8210b71f7d9d91089cb139f65605573a8..e5b78c9d6fb326771d65ea9afd9da38c
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63ba35c48ef 100644
index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f64d4239e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -576,6 +576,7 @@ public class PurpurWorldConfig {
@@ -574,6 +574,7 @@ public class PurpurWorldConfig {
useNightVisionWhenRiding = getBoolean("ridable-settings.use-night-vision", useNightVisionWhenRiding);
}
@@ -1185,7 +1185,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
public boolean axolotlRidable = false;
public double axolotlMaxHealth = 14.0D;
public int axolotlBreedingTicks = 6000;
@@ -583,6 +584,7 @@ public class PurpurWorldConfig {
@@ -581,6 +582,7 @@ public class PurpurWorldConfig {
axolotlRidable = getBoolean("mobs.axolotl.ridable", axolotlRidable);
axolotlMaxHealth = getDouble("mobs.axolotl.attributes.max_health", axolotlMaxHealth);
axolotlBreedingTicks = getInt("mobs.axolotl.breeding-delay-ticks", axolotlBreedingTicks);
@@ -1193,7 +1193,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean batRidable = false;
@@ -596,6 +598,7 @@ public class PurpurWorldConfig {
@@ -594,6 +596,7 @@ public class PurpurWorldConfig {
public double batArmor = 0.0D;
public double batArmorToughness = 0.0D;
public double batAttackKnockback = 0.0D;
@@ -1201,7 +1201,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void batSettings() {
batRidable = getBoolean("mobs.bat.ridable", batRidable);
batRidableInWater = getBoolean("mobs.bat.ridable-in-water", batRidableInWater);
@@ -606,6 +609,7 @@ public class PurpurWorldConfig {
@@ -604,6 +607,7 @@ public class PurpurWorldConfig {
set("mobs.bat.attributes.max_health", oldValue);
}
batMaxHealth = getDouble("mobs.bat.attributes.max_health", batMaxHealth);
@@ -1209,7 +1209,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean beeRidable = false;
@@ -613,6 +617,7 @@ public class PurpurWorldConfig {
@@ -611,6 +615,7 @@ public class PurpurWorldConfig {
public double beeMaxY = 256D;
public double beeMaxHealth = 10.0D;
public int beeBreedingTicks = 6000;
@@ -1217,7 +1217,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -624,12 +629,14 @@ public class PurpurWorldConfig {
@@ -622,12 +627,14 @@ public class PurpurWorldConfig {
}
beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
beeBreedingTicks = getInt("mobs.bee.breeding-delay-ticks", beeBreedingTicks);
@@ -1232,7 +1232,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void blazeSettings() {
blazeRidable = getBoolean("mobs.blaze.ridable", blazeRidable);
blazeRidableInWater = getBoolean("mobs.blaze.ridable-in-water", blazeRidableInWater);
@@ -640,6 +647,7 @@ public class PurpurWorldConfig {
@@ -638,6 +645,7 @@ public class PurpurWorldConfig {
set("mobs.blaze.attributes.max_health", oldValue);
}
blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
@@ -1240,7 +1240,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean catRidable = false;
@@ -650,6 +658,7 @@ public class PurpurWorldConfig {
@@ -648,6 +656,7 @@ public class PurpurWorldConfig {
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
public int catBreedingTicks = 6000;
@@ -1248,7 +1248,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -668,11 +677,13 @@ public class PurpurWorldConfig {
@@ -666,11 +675,13 @@ public class PurpurWorldConfig {
catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange);
catSpawnVillageScanRange = getInt("mobs.cat.scan-range-for-other-cats.village", catSpawnVillageScanRange);
catBreedingTicks = getInt("mobs.cat.breeding-delay-ticks", catBreedingTicks);
@@ -1262,7 +1262,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void caveSpiderSettings() {
caveSpiderRidable = getBoolean("mobs.cave_spider.ridable", caveSpiderRidable);
caveSpiderRidableInWater = getBoolean("mobs.cave_spider.ridable-in-water", caveSpiderRidableInWater);
@@ -682,6 +693,7 @@ public class PurpurWorldConfig {
@@ -680,6 +691,7 @@ public class PurpurWorldConfig {
set("mobs.cave_spider.attributes.max_health", oldValue);
}
caveSpiderMaxHealth = getDouble("mobs.cave_spider.attributes.max_health", caveSpiderMaxHealth);
@@ -1270,7 +1270,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean chickenRidable = false;
@@ -689,6 +701,7 @@ public class PurpurWorldConfig {
@@ -687,6 +699,7 @@ public class PurpurWorldConfig {
public double chickenMaxHealth = 4.0D;
public boolean chickenRetaliate = false;
public int chickenBreedingTicks = 6000;
@@ -1278,7 +1278,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -700,10 +713,12 @@ public class PurpurWorldConfig {
@@ -698,10 +711,12 @@ public class PurpurWorldConfig {
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
chickenBreedingTicks = getInt("mobs.chicken.breeding-delay-ticks", chickenBreedingTicks);
@@ -1291,7 +1291,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void codSettings() {
codRidable = getBoolean("mobs.cod.ridable", codRidable);
if (PurpurConfig.version < 10) {
@@ -712,6 +727,7 @@ public class PurpurWorldConfig {
@@ -710,6 +725,7 @@ public class PurpurWorldConfig {
set("mobs.cod.attributes.max_health", oldValue);
}
codMaxHealth = getDouble("mobs.cod.attributes.max_health", codMaxHealth);
@@ -1299,7 +1299,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean cowRidable = false;
@@ -719,6 +735,7 @@ public class PurpurWorldConfig {
@@ -717,6 +733,7 @@ public class PurpurWorldConfig {
public double cowMaxHealth = 10.0D;
public int cowFeedMushrooms = 0;
public int cowBreedingTicks = 6000;
@@ -1307,7 +1307,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -730,6 +747,7 @@ public class PurpurWorldConfig {
@@ -728,6 +745,7 @@ public class PurpurWorldConfig {
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
cowBreedingTicks = getInt("mobs.cow.breeding-delay-ticks", cowBreedingTicks);
@@ -1315,7 +1315,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean creeperRidable = false;
@@ -738,6 +756,7 @@ public class PurpurWorldConfig {
@@ -736,6 +754,7 @@ public class PurpurWorldConfig {
public double creeperChargedChance = 0.0D;
public boolean creeperAllowGriefing = true;
public boolean creeperBypassMobGriefing = false;
@@ -1323,7 +1323,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -750,6 +769,7 @@ public class PurpurWorldConfig {
@@ -748,6 +767,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);
@@ -1331,7 +1331,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean dolphinRidable = false;
@@ -758,6 +778,7 @@ public class PurpurWorldConfig {
@@ -756,6 +776,7 @@ public class PurpurWorldConfig {
public float dolphinSpitDamage = 2.0F;
public double dolphinMaxHealth = 10.0D;
public boolean dolphinDisableTreasureSearching = false;
@@ -1339,7 +1339,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinSpitCooldown = getInt("mobs.dolphin.spit.cooldown", dolphinSpitCooldown);
@@ -770,6 +791,7 @@ public class PurpurWorldConfig {
@@ -768,6 +789,7 @@ public class PurpurWorldConfig {
}
dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);
dolphinDisableTreasureSearching = getBoolean("mobs.dolphin.disable-treasure-searching", dolphinDisableTreasureSearching);
@@ -1347,7 +1347,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean donkeyRidableInWater = false;
@@ -780,6 +802,7 @@ public class PurpurWorldConfig {
@@ -778,6 +800,7 @@ public class PurpurWorldConfig {
public double donkeyMovementSpeedMin = 0.175D;
public double donkeyMovementSpeedMax = 0.175D;
public int donkeyBreedingTicks = 6000;
@@ -1355,7 +1355,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
if (PurpurConfig.version < 10) {
@@ -796,6 +819,7 @@ public class PurpurWorldConfig {
@@ -794,6 +817,7 @@ public class PurpurWorldConfig {
donkeyMovementSpeedMin = getDouble("mobs.donkey.attributes.movement_speed.min", donkeyMovementSpeedMin);
donkeyMovementSpeedMax = getDouble("mobs.donkey.attributes.movement_speed.max", donkeyMovementSpeedMax);
donkeyBreedingTicks = getInt("mobs.donkey.breeding-delay-ticks", donkeyBreedingTicks);
@@ -1363,7 +1363,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean drownedRidable = false;
@@ -805,6 +829,7 @@ public class PurpurWorldConfig {
@@ -803,6 +827,7 @@ public class PurpurWorldConfig {
public boolean drownedJockeyOnlyBaby = true;
public double drownedJockeyChance = 0.05D;
public boolean drownedJockeyTryExistingChickens = true;
@@ -1371,7 +1371,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -818,10 +843,12 @@ public class PurpurWorldConfig {
@@ -816,10 +841,12 @@ 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);
@@ -1384,7 +1384,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void elderGuardianSettings() {
elderGuardianRidable = getBoolean("mobs.elder_guardian.ridable", elderGuardianRidable);
if (PurpurConfig.version < 10) {
@@ -830,6 +857,7 @@ public class PurpurWorldConfig {
@@ -828,6 +855,7 @@ public class PurpurWorldConfig {
set("mobs.elder_guardian.attributes.max_health", oldValue);
}
elderGuardianMaxHealth = getDouble("mobs.elder_guardian.attributes.max_health", elderGuardianMaxHealth);
@@ -1392,7 +1392,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean enderDragonRidable = false;
@@ -838,6 +866,7 @@ public class PurpurWorldConfig {
@@ -836,6 +864,7 @@ public class PurpurWorldConfig {
public double enderDragonMaxHealth = 200.0D;
public boolean enderDragonAlwaysDropsFullExp = false;
public boolean enderDragonBypassMobGriefing = false;
@@ -1400,7 +1400,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -854,6 +883,7 @@ public class PurpurWorldConfig {
@@ -852,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);
@@ -1408,7 +1408,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean endermanRidable = false;
@@ -862,6 +892,7 @@ public class PurpurWorldConfig {
@@ -860,6 +890,7 @@ public class PurpurWorldConfig {
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
public boolean endermanBypassMobGriefing = false;
@@ -1416,7 +1416,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -874,11 +905,13 @@ public class PurpurWorldConfig {
@@ -872,11 +903,13 @@ 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);
@@ -1430,7 +1430,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void endermiteSettings() {
endermiteRidable = getBoolean("mobs.endermite.ridable", endermiteRidable);
endermiteRidableInWater = getBoolean("mobs.endermite.ridable-in-water", endermiteRidableInWater);
@@ -888,12 +921,14 @@ public class PurpurWorldConfig {
@@ -886,12 +919,14 @@ public class PurpurWorldConfig {
set("mobs.endermite.attributes.max_health", oldValue);
}
endermiteMaxHealth = getDouble("mobs.endermite.attributes.max_health", endermiteMaxHealth);
@@ -1445,7 +1445,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void evokerSettings() {
evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
@@ -904,6 +939,7 @@ public class PurpurWorldConfig {
@@ -902,6 +937,7 @@ public class PurpurWorldConfig {
}
evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
evokerBypassMobGriefing = getBoolean("mobs.evoker.bypass-mob-griefing", evokerBypassMobGriefing);
@@ -1453,7 +1453,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean foxRidable = false;
@@ -912,6 +948,7 @@ public class PurpurWorldConfig {
@@ -910,6 +946,7 @@ public class PurpurWorldConfig {
public boolean foxTypeChangesWithTulips = false;
public int foxBreedingTicks = 6000;
public boolean foxBypassMobGriefing = false;
@@ -1461,7 +1461,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -924,12 +961,14 @@ public class PurpurWorldConfig {
@@ -922,12 +959,14 @@ public class PurpurWorldConfig {
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks);
foxBypassMobGriefing = getBoolean("mobs.fox.bypass-mob-griefing", foxBypassMobGriefing);
@@ -1476,7 +1476,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void ghastSettings() {
ghastRidable = getBoolean("mobs.ghast.ridable", ghastRidable);
ghastRidableInWater = getBoolean("mobs.ghast.ridable-in-water", ghastRidableInWater);
@@ -940,6 +979,7 @@ public class PurpurWorldConfig {
@@ -938,6 +977,7 @@ public class PurpurWorldConfig {
set("mobs.ghast.attributes.max_health", oldValue);
}
ghastMaxHealth = getDouble("mobs.ghast.attributes.max_health", ghastMaxHealth);
@@ -1484,7 +1484,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean giantRidable = false;
@@ -951,6 +991,7 @@ public class PurpurWorldConfig {
@@ -949,6 +989,7 @@ public class PurpurWorldConfig {
public float giantJumpHeight = 1.0F;
public boolean giantHaveAI = false;
public boolean giantHaveHostileAI = false;
@@ -1492,7 +1492,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void giantSettings() {
giantRidable = getBoolean("mobs.giant.ridable", giantRidable);
giantRidableInWater = getBoolean("mobs.giant.ridable-in-water", giantRidableInWater);
@@ -970,30 +1011,36 @@ public class PurpurWorldConfig {
@@ -968,30 +1009,36 @@ public class PurpurWorldConfig {
giantJumpHeight = (float) getDouble("mobs.giant.jump-height", giantJumpHeight);
giantHaveAI = getBoolean("mobs.giant.have-ai", giantHaveAI);
giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI);
@@ -1529,7 +1529,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void guardianSettings() {
guardianRidable = getBoolean("mobs.guardian.ridable", guardianRidable);
if (PurpurConfig.version < 10) {
@@ -1002,12 +1049,14 @@ public class PurpurWorldConfig {
@@ -1000,12 +1047,14 @@ public class PurpurWorldConfig {
set("mobs.guardian.attributes.max_health", oldValue);
}
guardianMaxHealth = getDouble("mobs.guardian.attributes.max_health", guardianMaxHealth);
@@ -1544,7 +1544,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void hoglinSettings() {
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
@@ -1018,6 +1067,7 @@ public class PurpurWorldConfig {
@@ -1016,6 +1065,7 @@ public class PurpurWorldConfig {
}
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
hoglinBreedingTicks = getInt("mobs.hoglin.breeding-delay-ticks", hoglinBreedingTicks);
@@ -1552,7 +1552,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean horseRidableInWater = false;
@@ -1028,6 +1078,7 @@ public class PurpurWorldConfig {
@@ -1026,6 +1076,7 @@ public class PurpurWorldConfig {
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
public int horseBreedingTicks = 6000;
@@ -1560,7 +1560,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1044,6 +1095,7 @@ public class PurpurWorldConfig {
@@ -1042,6 +1093,7 @@ public class PurpurWorldConfig {
horseMovementSpeedMin = getDouble("mobs.horse.attributes.movement_speed.min", horseMovementSpeedMin);
horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax);
horseBreedingTicks = getInt("mobs.horse.breeding-delay-ticks", horseBreedingTicks);
@@ -1568,7 +1568,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean huskRidable = false;
@@ -1053,6 +1105,7 @@ public class PurpurWorldConfig {
@@ -1051,6 +1103,7 @@ public class PurpurWorldConfig {
public boolean huskJockeyOnlyBaby = true;
public double huskJockeyChance = 0.05D;
public boolean huskJockeyTryExistingChickens = true;
@@ -1576,7 +1576,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -1066,6 +1119,7 @@ public class PurpurWorldConfig {
@@ -1064,6 +1117,7 @@ public class PurpurWorldConfig {
huskJockeyOnlyBaby = getBoolean("mobs.husk.jockey.only-babies", huskJockeyOnlyBaby);
huskJockeyChance = getDouble("mobs.husk.jockey.chance", huskJockeyChance);
huskJockeyTryExistingChickens = getBoolean("mobs.husk.jockey.try-existing-chickens", huskJockeyTryExistingChickens);
@@ -1584,7 +1584,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean illusionerRidable = false;
@@ -1073,6 +1127,7 @@ public class PurpurWorldConfig {
@@ -1071,6 +1125,7 @@ public class PurpurWorldConfig {
public double illusionerMovementSpeed = 0.5D;
public double illusionerFollowRange = 18.0D;
public double illusionerMaxHealth = 32.0D;
@@ -1592,7 +1592,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void illusionerSettings() {
illusionerRidable = getBoolean("mobs.illusioner.ridable", illusionerRidable);
illusionerRidableInWater = getBoolean("mobs.illusioner.ridable-in-water", illusionerRidableInWater);
@@ -1088,12 +1143,14 @@ public class PurpurWorldConfig {
@@ -1086,12 +1141,14 @@ public class PurpurWorldConfig {
set("mobs.illusioner.attributes.max_health", oldValue);
}
illusionerMaxHealth = getDouble("mobs.illusioner.attributes.max_health", illusionerMaxHealth);
@@ -1607,7 +1607,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void ironGolemSettings() {
ironGolemRidable = getBoolean("mobs.iron_golem.ridable", ironGolemRidable);
ironGolemRidableInWater = getBoolean("mobs.iron_golem.ridable-in-water", ironGolemRidableInWater);
@@ -1104,6 +1161,7 @@ public class PurpurWorldConfig {
@@ -1102,6 +1159,7 @@ public class PurpurWorldConfig {
set("mobs.iron_golem.attributes.max_health", oldValue);
}
ironGolemMaxHealth = getDouble("mobs.iron_golem.attributes.max_health", ironGolemMaxHealth);
@@ -1615,7 +1615,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean llamaRidable = false;
@@ -1115,6 +1173,7 @@ public class PurpurWorldConfig {
@@ -1113,6 +1171,7 @@ public class PurpurWorldConfig {
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
public int llamaBreedingTicks = 6000;
@@ -1623,7 +1623,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1132,11 +1191,13 @@ public class PurpurWorldConfig {
@@ -1130,11 +1189,13 @@ 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);
@@ -1637,7 +1637,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void magmaCubeSettings() {
magmaCubeRidable = getBoolean("mobs.magma_cube.ridable", magmaCubeRidable);
magmaCubeRidableInWater = getBoolean("mobs.magma_cube.ridable-in-water", magmaCubeRidableInWater);
@@ -1146,12 +1207,14 @@ public class PurpurWorldConfig {
@@ -1144,12 +1205,14 @@ public class PurpurWorldConfig {
set("mobs.magma_cube.attributes.max_health", oldValue);
}
magmaCubeMaxHealth = getString("mobs.magma_cube.attributes.max_health", magmaCubeMaxHealth);
@@ -1652,7 +1652,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1162,6 +1225,7 @@ public class PurpurWorldConfig {
@@ -1160,6 +1223,7 @@ public class PurpurWorldConfig {
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
mooshroomBreedingTicks = getInt("mobs.mooshroom.breeding-delay-ticks", mooshroomBreedingTicks);
@@ -1660,7 +1660,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean muleRidableInWater = false;
@@ -1172,6 +1236,7 @@ public class PurpurWorldConfig {
@@ -1170,6 +1234,7 @@ public class PurpurWorldConfig {
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
public int muleBreedingTicks = 6000;
@@ -1668,7 +1668,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1188,12 +1253,14 @@ public class PurpurWorldConfig {
@@ -1186,12 +1251,14 @@ public class PurpurWorldConfig {
muleMovementSpeedMin = getDouble("mobs.mule.attributes.movement_speed.min", muleMovementSpeedMin);
muleMovementSpeedMax = getDouble("mobs.mule.attributes.movement_speed.max", muleMovementSpeedMax);
muleBreedingTicks = getInt("mobs.mule.breeding-delay-ticks", muleBreedingTicks);
@@ -1683,7 +1683,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1204,12 +1271,14 @@ public class PurpurWorldConfig {
@@ -1202,12 +1269,14 @@ public class PurpurWorldConfig {
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
ocelotBreedingTicks = getInt("mobs.ocelot.breeding-delay-ticks", ocelotBreedingTicks);
@@ -1698,7 +1698,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1220,12 +1289,14 @@ public class PurpurWorldConfig {
@@ -1218,12 +1287,14 @@ public class PurpurWorldConfig {
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
pandaBreedingTicks = getInt("mobs.panda.breeding-delay-ticks", pandaBreedingTicks);
@@ -1713,7 +1713,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void parrotSettings() {
parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable);
parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater);
@@ -1236,6 +1307,7 @@ public class PurpurWorldConfig {
@@ -1234,6 +1305,7 @@ public class PurpurWorldConfig {
set("mobs.parrot.attributes.max_health", oldValue);
}
parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth);
@@ -1721,7 +1721,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean phantomRidable = false;
@@ -1264,6 +1336,7 @@ public class PurpurWorldConfig {
@@ -1262,6 +1334,7 @@ public class PurpurWorldConfig {
public int phantomBurnInLight = 0;
public boolean phantomIgnorePlayersWithTorch = false;
public boolean phantomBurnInDaylight = true;
@@ -1729,7 +1729,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1296,6 +1369,7 @@ public class PurpurWorldConfig {
@@ -1294,6 +1367,7 @@ public class PurpurWorldConfig {
phantomBurnInLight = getInt("mobs.phantom.burn-in-light", phantomBurnInLight);
phantomBurnInDaylight = getBoolean("mobs.phantom.burn-in-daylight", phantomBurnInDaylight);
phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch);
@@ -1737,7 +1737,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean pigRidable = false;
@@ -1303,6 +1377,7 @@ public class PurpurWorldConfig {
@@ -1301,6 +1375,7 @@ public class PurpurWorldConfig {
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
public int pigBreedingTicks = 6000;
@@ -1745,7 +1745,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1314,12 +1389,14 @@ public class PurpurWorldConfig {
@@ -1312,12 +1387,14 @@ public class PurpurWorldConfig {
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
pigBreedingTicks = getInt("mobs.pig.breeding-delay-ticks", pigBreedingTicks);
@@ -1760,7 +1760,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1330,11 +1407,13 @@ public class PurpurWorldConfig {
@@ -1328,11 +1405,13 @@ public class PurpurWorldConfig {
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
piglinBypassMobGriefing = getBoolean("mobs.piglin.bypass-mob-griefing", piglinBypassMobGriefing);
@@ -1774,7 +1774,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void piglinBruteSettings() {
piglinBruteRidable = getBoolean("mobs.piglin_brute.ridable", piglinBruteRidable);
piglinBruteRidableInWater = getBoolean("mobs.piglin_brute.ridable-in-water", piglinBruteRidableInWater);
@@ -1344,12 +1423,14 @@ public class PurpurWorldConfig {
@@ -1342,12 +1421,14 @@ public class PurpurWorldConfig {
set("mobs.piglin_brute.attributes.max_health", oldValue);
}
piglinBruteMaxHealth = getDouble("mobs.piglin_brute.attributes.max_health", piglinBruteMaxHealth);
@@ -1789,7 +1789,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1360,6 +1441,7 @@ public class PurpurWorldConfig {
@@ -1358,6 +1439,7 @@ public class PurpurWorldConfig {
}
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
pillagerBypassMobGriefing = getBoolean("mobs.pillager.bypass-mob-griefing", pillagerBypassMobGriefing);
@@ -1797,7 +1797,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean polarBearRidable = false;
@@ -1368,6 +1450,7 @@ public class PurpurWorldConfig {
@@ -1366,6 +1448,7 @@ public class PurpurWorldConfig {
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
public int polarBearBreedingTicks = 6000;
@@ -1805,7 +1805,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1381,10 +1464,12 @@ public class PurpurWorldConfig {
@@ -1379,10 +1462,12 @@ public class PurpurWorldConfig {
Item item = Registry.ITEM.get(new ResourceLocation(polarBearBreedableItemString));
if (item != Items.AIR) polarBearBreedableItem = item;
polarBearBreedingTicks = getInt("mobs.polar_bear.breeding-delay-ticks", polarBearBreedingTicks);
@@ -1818,7 +1818,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void pufferfishSettings() {
pufferfishRidable = getBoolean("mobs.pufferfish.ridable", pufferfishRidable);
if (PurpurConfig.version < 10) {
@@ -1393,6 +1478,7 @@ public class PurpurWorldConfig {
@@ -1391,6 +1476,7 @@ public class PurpurWorldConfig {
set("mobs.pufferfish.attributes.max_health", oldValue);
}
pufferfishMaxHealth = getDouble("mobs.pufferfish.attributes.max_health", pufferfishMaxHealth);
@@ -1826,7 +1826,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean rabbitRidable = false;
@@ -1402,6 +1488,7 @@ public class PurpurWorldConfig {
@@ -1400,6 +1486,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
public boolean rabbitBypassMobGriefing = false;
@@ -1834,7 +1834,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1415,12 +1502,14 @@ public class PurpurWorldConfig {
@@ -1413,12 +1500,14 @@ public class PurpurWorldConfig {
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks);
rabbitBypassMobGriefing = getBoolean("mobs.rabbit.bypass-mob-griefing", rabbitBypassMobGriefing);
@@ -1849,7 +1849,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1431,10 +1520,12 @@ public class PurpurWorldConfig {
@@ -1429,10 +1518,12 @@ public class PurpurWorldConfig {
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
ravagerBypassMobGriefing = getBoolean("mobs.ravager.bypass-mob-griefing", ravagerBypassMobGriefing);
@@ -1862,7 +1862,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void salmonSettings() {
salmonRidable = getBoolean("mobs.salmon.ridable", salmonRidable);
if (PurpurConfig.version < 10) {
@@ -1443,6 +1534,7 @@ public class PurpurWorldConfig {
@@ -1441,6 +1532,7 @@ public class PurpurWorldConfig {
set("mobs.salmon.attributes.max_health", oldValue);
}
salmonMaxHealth = getDouble("mobs.salmon.attributes.max_health", salmonMaxHealth);
@@ -1870,7 +1870,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean sheepRidable = false;
@@ -1450,6 +1542,7 @@ public class PurpurWorldConfig {
@@ -1448,6 +1540,7 @@ public class PurpurWorldConfig {
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
public boolean sheepBypassMobGriefing = false;
@@ -1878,7 +1878,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1461,11 +1554,13 @@ public class PurpurWorldConfig {
@@ -1459,11 +1552,13 @@ public class PurpurWorldConfig {
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
sheepBypassMobGriefing = getBoolean("mobs.sheep.bypass-mob-griefing", sheepBypassMobGriefing);
@@ -1892,7 +1892,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -1475,12 +1570,14 @@ public class PurpurWorldConfig {
@@ -1473,12 +1568,14 @@ public class PurpurWorldConfig {
set("mobs.shulker.attributes.max_health", oldValue);
}
shulkerMaxHealth = getDouble("mobs.shulker.attributes.max_health", shulkerMaxHealth);
@@ -1907,7 +1907,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1491,11 +1588,13 @@ public class PurpurWorldConfig {
@@ -1489,11 +1586,13 @@ public class PurpurWorldConfig {
}
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
silverfishBypassMobGriefing = getBoolean("mobs.silverfish.bypass-mob-griefing", silverfishBypassMobGriefing);
@@ -1921,7 +1921,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -1505,6 +1604,7 @@ public class PurpurWorldConfig {
@@ -1503,6 +1602,7 @@ public class PurpurWorldConfig {
set("mobs.skeleton.attributes.max_health", oldValue);
}
skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
@@ -1929,7 +1929,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean skeletonHorseRidableInWater = false;
@@ -1515,6 +1615,7 @@ public class PurpurWorldConfig {
@@ -1513,6 +1613,7 @@ public class PurpurWorldConfig {
public double skeletonHorseJumpStrengthMax = 1.0D;
public double skeletonHorseMovementSpeedMin = 0.2D;
public double skeletonHorseMovementSpeedMax = 0.2D;
@@ -1937,7 +1937,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void skeletonHorseSettings() {
skeletonHorseRidableInWater = getBoolean("mobs.skeleton_horse.ridable-in-water", skeletonHorseRidableInWater);
skeletonHorseCanSwim = getBoolean("mobs.skeleton_horse.can-swim", skeletonHorseCanSwim);
@@ -1530,12 +1631,14 @@ public class PurpurWorldConfig {
@@ -1528,12 +1629,14 @@ public class PurpurWorldConfig {
skeletonHorseJumpStrengthMax = getDouble("mobs.skeleton_horse.attributes.jump_strength.max", skeletonHorseJumpStrengthMax);
skeletonHorseMovementSpeedMin = getDouble("mobs.skeleton_horse.attributes.movement_speed.min", skeletonHorseMovementSpeedMin);
skeletonHorseMovementSpeedMax = getDouble("mobs.skeleton_horse.attributes.movement_speed.max", skeletonHorseMovementSpeedMax);
@@ -1952,7 +1952,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void slimeSettings() {
slimeRidable = getBoolean("mobs.slime.ridable", slimeRidable);
slimeRidableInWater = getBoolean("mobs.slime.ridable-in-water", slimeRidableInWater);
@@ -1546,6 +1649,7 @@ public class PurpurWorldConfig {
@@ -1544,6 +1647,7 @@ public class PurpurWorldConfig {
}
slimeMaxHealth = getString("mobs.slime.attributes.max_health", slimeMaxHealth);
slimeMaxHealthCache.clear();
@@ -1960,7 +1960,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean snowGolemRidable = false;
@@ -1559,6 +1663,7 @@ public class PurpurWorldConfig {
@@ -1557,6 +1661,7 @@ public class PurpurWorldConfig {
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
public boolean snowGolemBypassMobGriefing = false;
@@ -1968,7 +1968,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1576,6 +1681,7 @@ public class PurpurWorldConfig {
@@ -1574,6 +1679,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);
@@ -1976,7 +1976,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean squidRidable = false;
@@ -1583,6 +1689,7 @@ public class PurpurWorldConfig {
@@ -1581,6 +1687,7 @@ public class PurpurWorldConfig {
public boolean squidImmuneToEAR = true;
public double squidOffsetWaterCheck = 0.0D;
public boolean squidsCanFly = false;
@@ -1984,7 +1984,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1594,11 +1701,13 @@ public class PurpurWorldConfig {
@@ -1592,11 +1699,13 @@ public class PurpurWorldConfig {
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);
squidsCanFly = getBoolean("mobs.squid.can-fly", squidsCanFly);
@@ -1998,7 +1998,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void spiderSettings() {
spiderRidable = getBoolean("mobs.spider.ridable", spiderRidable);
spiderRidableInWater = getBoolean("mobs.spider.ridable-in-water", spiderRidableInWater);
@@ -1608,11 +1717,13 @@ public class PurpurWorldConfig {
@@ -1606,11 +1715,13 @@ public class PurpurWorldConfig {
set("mobs.spider.attributes.max_health", oldValue);
}
spiderMaxHealth = getDouble("mobs.spider.attributes.max_health", spiderMaxHealth);
@@ -2012,7 +2012,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void straySettings() {
strayRidable = getBoolean("mobs.stray.ridable", strayRidable);
strayRidableInWater = getBoolean("mobs.stray.ridable-in-water", strayRidableInWater);
@@ -1622,6 +1733,7 @@ public class PurpurWorldConfig {
@@ -1620,6 +1731,7 @@ public class PurpurWorldConfig {
set("mobs.stray.attributes.max_health", oldValue);
}
strayMaxHealth = getDouble("mobs.stray.attributes.max_health", strayMaxHealth);
@@ -2020,7 +2020,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean striderRidable = false;
@@ -1629,6 +1741,7 @@ public class PurpurWorldConfig {
@@ -1627,6 +1739,7 @@ public class PurpurWorldConfig {
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
@@ -2028,7 +2028,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1640,6 +1753,7 @@ public class PurpurWorldConfig {
@@ -1638,6 +1751,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);
@@ -2036,7 +2036,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean traderLlamaRidable = false;
@@ -1651,6 +1765,7 @@ public class PurpurWorldConfig {
@@ -1649,6 +1763,7 @@ public class PurpurWorldConfig {
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
public int traderLlamaBreedingTicks = 6000;
@@ -2044,7 +2044,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1668,10 +1783,12 @@ public class PurpurWorldConfig {
@@ -1666,10 +1781,12 @@ public class PurpurWorldConfig {
traderLlamaMovementSpeedMin = getDouble("mobs.trader_llama.attributes.movement_speed.min", traderLlamaMovementSpeedMin);
traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
traderLlamaBreedingTicks = getInt("mobs.trader_llama.breeding-delay-ticks", traderLlamaBreedingTicks);
@@ -2057,7 +2057,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void tropicalFishSettings() {
tropicalFishRidable = getBoolean("mobs.tropical_fish.ridable", tropicalFishRidable);
if (PurpurConfig.version < 10) {
@@ -1680,6 +1797,7 @@ public class PurpurWorldConfig {
@@ -1678,6 +1795,7 @@ public class PurpurWorldConfig {
set("mobs.tropical_fish.attributes.max_health", oldValue);
}
tropicalFishMaxHealth = getDouble("mobs.tropical_fish.attributes.max_health", tropicalFishMaxHealth);
@@ -2065,7 +2065,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean turtleRidable = false;
@@ -1689,6 +1807,7 @@ public class PurpurWorldConfig {
@@ -1687,6 +1805,7 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;
public int turtleBreedingTicks = 6000;
@@ -2073,7 +2073,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void turtleEggSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1702,12 +1821,14 @@ public class PurpurWorldConfig {
@@ -1700,12 +1819,14 @@ public class PurpurWorldConfig {
turtleEggsBreakFromItems = getBoolean("blocks.turtle_egg.break-from-items", turtleEggsBreakFromItems);
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
turtleBreedingTicks = getInt("mobs.turtle.breeding-delay-ticks", turtleBreedingTicks);
@@ -2088,7 +2088,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void vexSettings() {
vexRidable = getBoolean("mobs.vex.ridable", vexRidable);
vexRidableInWater = getBoolean("mobs.vex.ridable-in-water", vexRidableInWater);
@@ -1718,6 +1839,7 @@ public class PurpurWorldConfig {
@@ -1716,6 +1837,7 @@ public class PurpurWorldConfig {
set("mobs.vex.attributes.max_health", oldValue);
}
vexMaxHealth = getDouble("mobs.vex.attributes.max_health", vexMaxHealth);
@@ -2096,7 +2096,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean villagerRidable = false;
@@ -1736,6 +1858,7 @@ public class PurpurWorldConfig {
@@ -1734,6 +1856,7 @@ public class PurpurWorldConfig {
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
@@ -2104,7 +2104,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1763,12 +1886,14 @@ public class PurpurWorldConfig {
@@ -1761,12 +1884,14 @@ 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);
@@ -2119,7 +2119,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void vindicatorSettings() {
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
@@ -1779,6 +1904,7 @@ public class PurpurWorldConfig {
@@ -1777,6 +1902,7 @@ public class PurpurWorldConfig {
}
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);
vindicatorJohnnySpawnChance = getDouble("mobs.vindicator.johnny.spawn-chance", vindicatorJohnnySpawnChance);
@@ -2127,7 +2127,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean wanderingTraderRidable = false;
@@ -1786,6 +1912,7 @@ public class PurpurWorldConfig {
@@ -1784,6 +1910,7 @@ public class PurpurWorldConfig {
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
@@ -2135,7 +2135,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1797,11 +1924,13 @@ public class PurpurWorldConfig {
@@ -1795,11 +1922,13 @@ 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);
@@ -2149,7 +2149,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void witchSettings() {
witchRidable = getBoolean("mobs.witch.ridable", witchRidable);
witchRidableInWater = getBoolean("mobs.witch.ridable-in-water", witchRidableInWater);
@@ -1811,6 +1940,7 @@ public class PurpurWorldConfig {
@@ -1809,6 +1938,7 @@ public class PurpurWorldConfig {
set("mobs.witch.attributes.max_health", oldValue);
}
witchMaxHealth = getDouble("mobs.witch.attributes.max_health", witchMaxHealth);
@@ -2157,7 +2157,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean witherRidable = false;
@@ -1820,6 +1950,7 @@ public class PurpurWorldConfig {
@@ -1818,6 +1948,7 @@ public class PurpurWorldConfig {
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
public boolean witherBypassMobGriefing = false;
@@ -2165,7 +2165,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1837,11 +1968,13 @@ public class PurpurWorldConfig {
@@ -1835,11 +1966,13 @@ 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);
@@ -2179,7 +2179,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void witherSkeletonSettings() {
witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable);
witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater);
@@ -1851,6 +1984,7 @@ public class PurpurWorldConfig {
@@ -1849,6 +1982,7 @@ public class PurpurWorldConfig {
set("mobs.wither_skeleton.attributes.max_health", oldValue);
}
witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth);
@@ -2187,7 +2187,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean wolfRidable = false;
@@ -1860,6 +1994,7 @@ public class PurpurWorldConfig {
@@ -1858,6 +1992,7 @@ public class PurpurWorldConfig {
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -2195,7 +2195,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1877,11 +2012,13 @@ public class PurpurWorldConfig {
@@ -1875,11 +2010,13 @@ public class PurpurWorldConfig {
wolfMilkCuresRabies = getBoolean("mobs.wolf.milk-cures-rabid-wolves", wolfMilkCuresRabies);
wolfNaturalRabid = getDouble("mobs.wolf.spawn-rabid-chance", wolfNaturalRabid);
wolfBreedingTicks = getInt("mobs.wolf.breeding-delay-ticks", wolfBreedingTicks);
@@ -2209,7 +2209,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void zoglinSettings() {
zoglinRidable = getBoolean("mobs.zoglin.ridable", zoglinRidable);
zoglinRidableInWater = getBoolean("mobs.zoglin.ridable-in-water", zoglinRidableInWater);
@@ -1891,6 +2028,7 @@ public class PurpurWorldConfig {
@@ -1889,6 +2026,7 @@ public class PurpurWorldConfig {
set("mobs.zoglin.attributes.max_health", oldValue);
}
zoglinMaxHealth = getDouble("mobs.zoglin.attributes.max_health", zoglinMaxHealth);
@@ -2217,7 +2217,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean zombieRidable = false;
@@ -1902,6 +2040,7 @@ public class PurpurWorldConfig {
@@ -1900,6 +2038,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public boolean zombieBypassMobGriefing = false;
@@ -2225,7 +2225,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1917,6 +2056,7 @@ public class PurpurWorldConfig {
@@ -1915,6 +2054,7 @@ public class PurpurWorldConfig {
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
@@ -2233,7 +2233,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean zombieHorseRidableInWater = false;
@@ -1928,6 +2068,7 @@ public class PurpurWorldConfig {
@@ -1926,6 +2066,7 @@ public class PurpurWorldConfig {
public double zombieHorseMovementSpeedMin = 0.2D;
public double zombieHorseMovementSpeedMax = 0.2D;
public double zombieHorseSpawnChance = 0.0D;
@@ -2241,7 +2241,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void zombieHorseSettings() {
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
@@ -1944,6 +2085,7 @@ public class PurpurWorldConfig {
@@ -1942,6 +2083,7 @@ public class PurpurWorldConfig {
zombieHorseMovementSpeedMin = getDouble("mobs.zombie_horse.attributes.movement_speed.min", zombieHorseMovementSpeedMin);
zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);
zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
@@ -2249,7 +2249,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean zombieVillagerRidable = false;
@@ -1953,6 +2095,7 @@ public class PurpurWorldConfig {
@@ -1951,6 +2093,7 @@ public class PurpurWorldConfig {
public boolean zombieVillagerJockeyOnlyBaby = true;
public double zombieVillagerJockeyChance = 0.05D;
public boolean zombieVillagerJockeyTryExistingChickens = true;
@@ -2257,7 +2257,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -1966,6 +2109,7 @@ public class PurpurWorldConfig {
@@ -1964,6 +2107,7 @@ public class PurpurWorldConfig {
zombieVillagerJockeyOnlyBaby = getBoolean("mobs.zombie_villager.jockey.only-babies", zombieVillagerJockeyOnlyBaby);
zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
@@ -2265,7 +2265,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
}
public boolean zombifiedPiglinRidable = false;
@@ -1976,6 +2120,7 @@ public class PurpurWorldConfig {
@@ -1974,6 +2118,7 @@ public class PurpurWorldConfig {
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
@@ -2273,7 +2273,7 @@ index 724bce388bf69f9ca7e8e2bf01c17b86f7814b36..b7982c468d03f969d4809b66c34ed63b
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1990,5 +2135,6 @@ public class PurpurWorldConfig {
@@ -1988,5 +2133,6 @@ public class PurpurWorldConfig {
zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);

2
patches/server/0145-Config-to-always-tame-in-Creative.patch → patches/server/0144-Config-to-always-tame-in-Creative.patch
View File

@@ -59,7 +59,7 @@ index b039cbbcc33a6b1925d1cf4339018219ceb6c2ad..57e8ef6f7c20d74fdc25d9ab2a9c35b1
this.navigation.stop();
this.setTarget((LivingEntity) null);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b7982c468d03f969d4809b66c34ed63ba35c48ef..ce35bce48c3fc5e4365416e19a194e6821a3f5bb 100644
index 2408d9d07c144540d571119dd2ebd90f64d4239e..54ad3aa8fa17bee0ce74bff2025a91b44ffb16d0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -385,6 +385,7 @@ public class PurpurWorldConfig {

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