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

Flying glow squids

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-21 22:55:45 -05:00
parent 9e531fe333
commit afabb3c5b6
21 changed files with 157 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
patches/server/0110-Flying-squids-Oh-my.patch
View File

@@ -4,31 +4,51 @@ Date: Sun, 4 Oct 2020 12:00:42 -0500
Subject: [PATCH] Flying squids! Oh my!
diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
index 2affff346a7fe81480e86cb61996039df0569853..be9b800d81b4d5faed7a3fb95d605bfd9e9afde6 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
@@ -85,6 +85,11 @@ public class Squid extends WaterAnimal {
// Stops squids from floating just over the water
return this.getBoundingBox().deflate(0.001D).offsetY(level.purpurConfig.squidOffsetWaterCheck);
diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
index 87d01bebbb179eec53323e9e23db011a791660ed..02b79aa6f4c472a9450549b1730f026d6d93b87b 100644
--- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
+++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
@@ -34,6 +34,11 @@ public class GlowSquid extends Squid {
public void initAttributes() {
this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.glowSquidMaxHealth);
}
+
+ @Override
+ public boolean isInWater() {
+ return this.wasTouchingWater || level.purpurConfig.squidsCanFly;
+ public boolean canFly() {
+ return this.level.purpurConfig.glowSquidsCanFly;
+ }
// Purpur end
@Override
@@ -159,6 +164,7 @@ public class Squid extends WaterAnimal {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
index 2affff346a7fe81480e86cb61996039df0569853..12be4a2f25a7def8341acda47d10a256c044aec2 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
@@ -85,6 +85,15 @@ public class Squid extends WaterAnimal {
// Stops squids from floating just over the water
return this.getBoundingBox().deflate(0.001D).offsetY(level.purpurConfig.squidOffsetWaterCheck);
}
+
+ public boolean canFly() {
+ return this.level.purpurConfig.squidsCanFly;
+ }
+
+ @Override
+ public boolean isInWater() {
+ return this.wasTouchingWater || canFly();
+ }
// Purpur end
@Override
@@ -159,6 +168,7 @@ public class Squid extends WaterAnimal {
}
if (this.isInWaterOrBubble()) {
+ if (level.purpurConfig.squidsCanFly) setNoGravity(!wasTouchingWater); // Purpur
+ if (canFly()) setNoGravity(!wasTouchingWater); // Purpur
if (this.tentacleMovement < 3.1415927F) {
float f = this.tentacleMovement / 3.1415927F;
@@ -320,7 +326,7 @@ public class Squid extends WaterAnimal {
@@ -320,7 +330,7 @@ public class Squid extends WaterAnimal {
if (i > 100) {
this.squid.setMovementVector(0.0F, 0.0F, 0.0F);
@@ -38,10 +58,22 @@ index 2affff346a7fe81480e86cb61996039df0569853..be9b800d81b4d5faed7a3fb95d605bfd
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 267ca0aa7187f8aac27d0b675c702f181da6d13a..9421df1069e16efd0bc121d1b433ae92d7e211ff 100644
index 267ca0aa7187f8aac27d0b675c702f181da6d13a..26ca63448f9c5feeb6b4d137b46239dc8c2ea420 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1352,6 +1352,7 @@ public class PurpurWorldConfig {
@@ -794,9 +794,11 @@ public class PurpurWorldConfig {
public boolean glowSquidRidable = false;
public double glowSquidMaxHealth = 10.0D;
+ public boolean glowSquidsCanFly = false;
private void glowSquidSettings() {
glowSquidRidable = getBoolean("mobs.glow_squid.ridable", glowSquidRidable);
glowSquidMaxHealth = getDouble("mobs.glow_squid.attributes.max_health", glowSquidMaxHealth);
+ glowSquidsCanFly = getBoolean("mobs.glow_squid.can-fly", glowSquidsCanFly);
}
public boolean goatRidable = false;
@@ -1352,6 +1354,7 @@ public class PurpurWorldConfig {
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
public double squidOffsetWaterCheck = 0.0D;
@@ -49,7 +81,7 @@ index 267ca0aa7187f8aac27d0b675c702f181da6d13a..9421df1069e16efd0bc121d1b433ae92
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1362,6 +1363,7 @@ public class PurpurWorldConfig {
@@ -1362,6 +1365,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);

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

@@ -474,7 +474,7 @@ index 5d289be8f0ef003abbce992e7662f6ddce4f4a99..5e3d7321a73144c3e4c43c18c5b748b2
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d401765acd 100644
index e804fdab0637c4a35968246463330eeb2376d7a9..7685cc102d2a5640b61fc50ec9ed3fc053019317 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -462,9 +462,11 @@ public class PurpurWorldConfig {
@@ -585,7 +585,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean ghastRidable = false;
@@ -834,10 +848,12 @@ public class PurpurWorldConfig {
@@ -836,10 +850,12 @@ public class PurpurWorldConfig {
public boolean goatRidable = false;
public boolean goatRidableInWater = false;
public double goatMaxHealth = 10.0D;
@@ -598,7 +598,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean guardianRidable = false;
@@ -855,6 +871,7 @@ public class PurpurWorldConfig {
@@ -857,6 +873,7 @@ public class PurpurWorldConfig {
public boolean hoglinRidable = false;
public boolean hoglinRidableInWater = false;
public double hoglinMaxHealth = 40.0D;
@@ -606,7 +606,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void hoglinSettings() {
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
@@ -864,6 +881,7 @@ public class PurpurWorldConfig {
@@ -866,6 +883,7 @@ public class PurpurWorldConfig {
set("mobs.hoglin.attributes.max_health", oldValue);
}
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
@@ -614,7 +614,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean horseRidableInWater = false;
@@ -873,6 +891,7 @@ public class PurpurWorldConfig {
@@ -875,6 +893,7 @@ public class PurpurWorldConfig {
public double horseJumpStrengthMax = 1.0D;
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
@@ -622,7 +622,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -888,6 +907,7 @@ public class PurpurWorldConfig {
@@ -890,6 +909,7 @@ public class PurpurWorldConfig {
horseJumpStrengthMax = getDouble("mobs.horse.attributes.jump_strength.max", horseJumpStrengthMax);
horseMovementSpeedMin = getDouble("mobs.horse.attributes.movement_speed.min", horseMovementSpeedMin);
horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax);
@@ -630,7 +630,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean huskRidable = false;
@@ -958,6 +978,7 @@ public class PurpurWorldConfig {
@@ -960,6 +980,7 @@ public class PurpurWorldConfig {
public double llamaJumpStrengthMax = 0.5D;
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
@@ -638,7 +638,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -974,6 +995,7 @@ public class PurpurWorldConfig {
@@ -976,6 +997,7 @@ public class PurpurWorldConfig {
llamaJumpStrengthMax = getDouble("mobs.llama.attributes.jump_strength.max", llamaJumpStrengthMax);
llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
@@ -646,7 +646,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean magmaCubeRidable = false;
@@ -993,6 +1015,7 @@ public class PurpurWorldConfig {
@@ -995,6 +1017,7 @@ public class PurpurWorldConfig {
public boolean mooshroomRidable = false;
public boolean mooshroomRidableInWater = false;
public double mooshroomMaxHealth = 10.0D;
@@ -654,7 +654,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1002,6 +1025,7 @@ public class PurpurWorldConfig {
@@ -1004,6 +1027,7 @@ public class PurpurWorldConfig {
set("mobs.mooshroom.attributes.max_health", oldValue);
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -662,7 +662,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean muleRidableInWater = false;
@@ -1011,6 +1035,7 @@ public class PurpurWorldConfig {
@@ -1013,6 +1037,7 @@ public class PurpurWorldConfig {
public double muleJumpStrengthMax = 0.5D;
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
@@ -670,7 +670,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1026,11 +1051,13 @@ public class PurpurWorldConfig {
@@ -1028,11 +1053,13 @@ public class PurpurWorldConfig {
muleJumpStrengthMax = getDouble("mobs.mule.attributes.jump_strength.max", muleJumpStrengthMax);
muleMovementSpeedMin = getDouble("mobs.mule.attributes.movement_speed.min", muleMovementSpeedMin);
muleMovementSpeedMax = getDouble("mobs.mule.attributes.movement_speed.max", muleMovementSpeedMax);
@@ -684,7 +684,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1040,11 +1067,13 @@ public class PurpurWorldConfig {
@@ -1042,11 +1069,13 @@ public class PurpurWorldConfig {
set("mobs.ocelot.attributes.max_health", oldValue);
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -698,7 +698,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1054,6 +1083,7 @@ public class PurpurWorldConfig {
@@ -1056,6 +1085,7 @@ public class PurpurWorldConfig {
set("mobs.panda.attributes.max_health", oldValue);
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -706,7 +706,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean parrotRidable = false;
@@ -1134,6 +1164,7 @@ public class PurpurWorldConfig {
@@ -1136,6 +1166,7 @@ public class PurpurWorldConfig {
public boolean pigRidableInWater = false;
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
@@ -714,7 +714,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1144,6 +1175,7 @@ public class PurpurWorldConfig {
@@ -1146,6 +1177,7 @@ public class PurpurWorldConfig {
}
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
@@ -722,7 +722,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean piglinRidable = false;
@@ -1193,6 +1225,7 @@ public class PurpurWorldConfig {
@@ -1195,6 +1227,7 @@ public class PurpurWorldConfig {
public double polarBearMaxHealth = 30.0D;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -730,7 +730,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1205,6 +1238,7 @@ public class PurpurWorldConfig {
@@ -1207,6 +1240,7 @@ public class PurpurWorldConfig {
polarBearBreedableItemString = getString("mobs.polar_bear.breedable-item", polarBearBreedableItemString);
Item item = Registry.ITEM.get(new ResourceLocation(polarBearBreedableItemString));
if (item != Items.AIR) polarBearBreedableItem = item;
@@ -738,7 +738,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean pufferfishRidable = false;
@@ -1224,6 +1258,7 @@ public class PurpurWorldConfig {
@@ -1226,6 +1260,7 @@ public class PurpurWorldConfig {
public double rabbitMaxHealth = 3.0D;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -746,7 +746,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1235,6 +1270,7 @@ public class PurpurWorldConfig {
@@ -1237,6 +1272,7 @@ public class PurpurWorldConfig {
rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth);
rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
@@ -754,7 +754,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean ravagerRidable = false;
@@ -1266,6 +1302,7 @@ public class PurpurWorldConfig {
@@ -1268,6 +1304,7 @@ public class PurpurWorldConfig {
public boolean sheepRidable = false;
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
@@ -762,7 +762,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1275,6 +1312,7 @@ public class PurpurWorldConfig {
@@ -1277,6 +1314,7 @@ public class PurpurWorldConfig {
set("mobs.sheep.attributes.max_health", oldValue);
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -770,7 +770,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean shulkerRidable = false;
@@ -1429,6 +1467,7 @@ public class PurpurWorldConfig {
@@ -1431,6 +1469,7 @@ public class PurpurWorldConfig {
public boolean striderRidable = false;
public boolean striderRidableInWater = false;
public double striderMaxHealth = 20.0D;
@@ -778,7 +778,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1438,6 +1477,7 @@ public class PurpurWorldConfig {
@@ -1440,6 +1479,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -786,7 +786,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean traderLlamaRidable = false;
@@ -1448,6 +1488,7 @@ public class PurpurWorldConfig {
@@ -1450,6 +1490,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -794,7 +794,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1464,6 +1505,7 @@ public class PurpurWorldConfig {
@@ -1466,6 +1507,7 @@ public class PurpurWorldConfig {
traderLlamaJumpStrengthMax = getDouble("mobs.trader_llama.attributes.jump_strength.max", traderLlamaJumpStrengthMax);
traderLlamaMovementSpeedMin = getDouble("mobs.trader_llama.attributes.movement_speed.min", traderLlamaMovementSpeedMin);
traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
@@ -802,7 +802,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean tropicalFishRidable = false;
@@ -1484,6 +1526,7 @@ public class PurpurWorldConfig {
@@ -1486,6 +1528,7 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromExpOrbs = true;
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;
@@ -810,7 +810,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void turtleEggSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1496,6 +1539,7 @@ public class PurpurWorldConfig {
@@ -1498,6 +1541,7 @@ public class PurpurWorldConfig {
turtleEggsBreakFromExpOrbs = getBoolean("blocks.turtle_egg.break-from-exp-orbs", turtleEggsBreakFromExpOrbs);
turtleEggsBreakFromItems = getBoolean("blocks.turtle_egg.break-from-items", turtleEggsBreakFromItems);
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
@@ -818,7 +818,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean vexRidable = false;
@@ -1524,6 +1568,7 @@ public class PurpurWorldConfig {
@@ -1526,6 +1570,7 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
@@ -826,7 +826,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1540,6 +1585,7 @@ public class PurpurWorldConfig {
@@ -1542,6 +1587,7 @@ public class PurpurWorldConfig {
villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
@@ -834,7 +834,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean vindicatorRidable = false;
@@ -1633,6 +1679,7 @@ public class PurpurWorldConfig {
@@ -1635,6 +1681,7 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -842,7 +842,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1642,6 +1689,7 @@ public class PurpurWorldConfig {
@@ -1644,6 +1691,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

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

@@ -44,7 +44,7 @@ index fe045f8e35fe2aac51032a67ce52b27a53a8eff0..03bc86c776596ca5964c22adb757115d
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c883d71390af33bee224b529807f640f94ba4c52..0957b411ee1cdbda067a76867e89bb202d0975da 100644
index 21850e0aa760b6e4f0d88515cf917676b1ed4f3a..77b1d0429712ccfc5560f96639b872c4f9b35600 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -2,6 +2,7 @@ package net.pl3x.purpur;
@@ -55,7 +55,7 @@ index c883d71390af33bee224b529807f640f94ba4c52..0957b411ee1cdbda067a76867e89bb20
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.Explosion;
@@ -1753,6 +1754,7 @@ public class PurpurWorldConfig {
@@ -1755,6 +1756,7 @@ public class PurpurWorldConfig {
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -63,7 +63,7 @@ index c883d71390af33bee224b529807f640f94ba4c52..0957b411ee1cdbda067a76867e89bb20
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1767,6 +1769,11 @@ public class PurpurWorldConfig {
@@ -1769,6 +1771,11 @@ public class PurpurWorldConfig {
zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);

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

@@ -23,10 +23,10 @@ index 0733f9c057fef17fd79a4769f19b78f4c83a7784..1697b573ffd0c5d17d2d538c40f5ce4b
this.goalSelector.addGoal(3, new LookAtPlayerGoal(this, Player.class, 6.0F));
this.goalSelector.addGoal(4, new RandomLookAroundGoal(this));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 11c95793c13b9bf8a38f96972f77ae8c05533611..ae7644c7e75cd49977bed725292764128441c532 100644
index 7d039e5dc91f07aa06061a235cebd782587a1f2e..d14b5f367fa86e9247f6d15bbe3a7fb6414c5e44 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1448,6 +1448,10 @@ public class PurpurWorldConfig {
@@ -1450,6 +1450,10 @@ public class PurpurWorldConfig {
public double snowGolemMaxHealth = 4.0D;
public boolean snowGolemDropsPumpkin = true;
public boolean snowGolemPutPumpkinBack = false;
@@ -37,7 +37,7 @@ index 11c95793c13b9bf8a38f96972f77ae8c05533611..ae7644c7e75cd49977bed72529276412
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1460,6 +1464,10 @@ public class PurpurWorldConfig {
@@ -1462,6 +1466,10 @@ public class PurpurWorldConfig {
snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);
snowGolemDropsPumpkin = getBoolean("mobs.snow_golem.drop-pumpkin-when-sheared", snowGolemDropsPumpkin);
snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);

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

@@ -53,10 +53,10 @@ index 1e05cc98a332e5b115c4670e5331e679117c6629..84142a42111ff03827297c522b7ce164
if (this.assignProfessionWhenSpawned) {
this.assignProfessionWhenSpawned = false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ae7644c7e75cd49977bed725292764128441c532..f728775737554fe8fb9be4c5fe0a558742f5d358 100644
index d14b5f367fa86e9247f6d15bbe3a7fb6414c5e44..09f350642fb343e3294e6adcb5ca61c93f29b6ec 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1621,6 +1621,8 @@ public class PurpurWorldConfig {
@@ -1623,6 +1623,8 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
public int villagerBreedingTicks = 6000;
@@ -65,7 +65,7 @@ index ae7644c7e75cd49977bed725292764128441c532..f728775737554fe8fb9be4c5fe0a5587
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1638,6 +1640,13 @@ public class PurpurWorldConfig {
@@ -1640,6 +1642,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/0135-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
View File

@@ -185,10 +185,10 @@ index 901fc6520d58a5fa5f2cf1b4fa78fec6008aa409..9050cd25663c71197c597aac0ab2e612
public static final VillagerProfession FISHERMAN = register("fisherman", PoiType.FISHERMAN, SoundEvents.VILLAGER_WORK_FISHERMAN);
public static final VillagerProfession FLETCHER = register("fletcher", PoiType.FLETCHER, SoundEvents.VILLAGER_WORK_FLETCHER);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f728775737554fe8fb9be4c5fe0a558742f5d358..ca743f116e47ce02b67713d6ac818436bd8b68c8 100644
index 09f350642fb343e3294e6adcb5ca61c93f29b6ec..a6ce2ed10c7b0bf1e1b6f1e75da03d00a82c2778 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1623,6 +1623,8 @@ public class PurpurWorldConfig {
@@ -1625,6 +1625,8 @@ public class PurpurWorldConfig {
public int villagerBreedingTicks = 6000;
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheck = 60;
@@ -197,7 +197,7 @@ index f728775737554fe8fb9be4c5fe0a558742f5d358..ca743f116e47ce02b67713d6ac818436
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1647,6 +1649,8 @@ public class PurpurWorldConfig {
@@ -1649,6 +1651,8 @@ public class PurpurWorldConfig {
}
villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck);

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

@@ -35,10 +35,10 @@ index 43ef93d2c0c59e0d7021ee9aa2b44345192cc0a9..ce780a2ba7dcbd9c1c9dc24c07387861
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ca743f116e47ce02b67713d6ac818436bd8b68c8..984f10800309b45214ca4d0c79b65115492071a0 100644
index a6ce2ed10c7b0bf1e1b6f1e75da03d00a82c2778..afc54067f00bb0fd24ee193cd85891cbea6962ac 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1857,6 +1857,7 @@ public class PurpurWorldConfig {
@@ -1859,6 +1859,7 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinJockeyOnlyBaby = true;
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
@@ -46,7 +46,7 @@ index ca743f116e47ce02b67713d6ac818436bd8b68c8..984f10800309b45214ca4d0c79b65115
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1870,5 +1871,6 @@ public class PurpurWorldConfig {
@@ -1872,5 +1873,6 @@ public class PurpurWorldConfig {
zombifiedPiglinJockeyOnlyBaby = getBoolean("mobs.zombified_piglin.jockey.only-babies", zombifiedPiglinJockeyOnlyBaby);
zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);

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

@@ -201,10 +201,10 @@ index ef4abaf68de01b0879f7d0b330d2d57cc6bd10f9..3e7409ebf1f94b9cf55f2d0b0fe17ca8
return super.mobInteract(player, hand);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 984f10800309b45214ca4d0c79b65115492071a0..bd2d56dba2ab806517e2168372d063fc84177d40 100644
index afc54067f00bb0fd24ee193cd85891cbea6962ac..3d69682134c0d88fe4f8a140c596ff6cfe3b2118 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1744,6 +1744,8 @@ public class PurpurWorldConfig {
@@ -1746,6 +1746,8 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -213,7 +213,7 @@ index 984f10800309b45214ca4d0c79b65115492071a0..bd2d56dba2ab806517e2168372d063fc
public int wolfBreedingTicks = 6000;
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
@@ -1754,6 +1756,8 @@ public class PurpurWorldConfig {
@@ -1756,6 +1758,8 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

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

@@ -24,7 +24,7 @@ index 3e7409ebf1f94b9cf55f2d0b0fe17ca8ec44659f..518dd0e6b4889c049e438b393baa795a
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index bd2d56dba2ab806517e2168372d063fc84177d40..97071f2f1b16134464560ae3f562f48d732a4f78 100644
index 3d69682134c0d88fe4f8a140c596ff6cfe3b2118..e08946f536a566c94609eaee7a96f11fdfe50533 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -3,6 +3,7 @@ package net.pl3x.purpur;
@@ -35,7 +35,7 @@ index bd2d56dba2ab806517e2168372d063fc84177d40..97071f2f1b16134464560ae3f562f48d
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.Explosion;
@@ -1744,6 +1745,7 @@ public class PurpurWorldConfig {
@@ -1746,6 +1747,7 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -43,7 +43,7 @@ index bd2d56dba2ab806517e2168372d063fc84177d40..97071f2f1b16134464560ae3f562f48d
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -1756,6 +1758,11 @@ public class PurpurWorldConfig {
@@ -1758,6 +1760,11 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

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

@@ -17,10 +17,10 @@ index 007437edff2db6044adf9afca4a098509d007edf..a8d8b524cd8e532f78ee6e61a883bd0a
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 97071f2f1b16134464560ae3f562f48d732a4f78..406a56c51e85bfda195d56c67da66c476219b1e4 100644
index e08946f536a566c94609eaee7a96f11fdfe50533..449d5f9de232adcbeb72ba9d840da6f503f9af9d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1153,6 +1153,7 @@ public class PurpurWorldConfig {
@@ -1155,6 +1155,7 @@ public class PurpurWorldConfig {
public float phantomFlameDamage = 1.0F;
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
@@ -28,7 +28,7 @@ index 97071f2f1b16134464560ae3f562f48d732a4f78..406a56c51e85bfda195d56c67da66c47
public double phantomMaxHealth = 20.0D;
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
@@ -1179,6 +1180,7 @@ public class PurpurWorldConfig {
@@ -1181,6 +1182,7 @@ public class PurpurWorldConfig {
phantomFlameDamage = (float) getDouble("mobs.phantom.flames.damage", phantomFlameDamage);
phantomFlameFireTime = getInt("mobs.phantom.flames.fire-time", phantomFlameFireTime);
phantomAllowGriefing = getBoolean("mobs.phantom.allow-griefing", phantomAllowGriefing);

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

@@ -28,10 +28,10 @@ index 294f276fa8d2d754abde11ebc3d39e5e68996b05..b3928617f732b49cfc124e9bdb879110
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2426b506b1edb013a386d99f5981faca850c1824..4b059eece9e527b8f556058be7349409283e6768 100644
index fd2a79583c73014944cdbda3f0cb1e9b2ea214e6..ad1e00a21015655d1d93a3fb09dc212550e3cb0b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1528,6 +1528,7 @@ public class PurpurWorldConfig {
@@ -1530,6 +1530,7 @@ public class PurpurWorldConfig {
public boolean striderRidableInWater = false;
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
@@ -39,7 +39,7 @@ index 2426b506b1edb013a386d99f5981faca850c1824..4b059eece9e527b8f556058be7349409
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1538,6 +1539,7 @@ public class PurpurWorldConfig {
@@ -1540,6 +1541,7 @@ public class PurpurWorldConfig {
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);

40
patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -393,7 +393,7 @@ index e98fc3c235f9160f1928a8afb0d7991a6d3430cb..db35f756b7adb6b113659ae13b08ab89
return true;
// Purpur end
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583f8a73032 100644
index 2889fefb433b7a7611eb8a168ad5de671cc342b4..fa8bc169febef0f0513c584d558238cc28decfac 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -351,9 +351,12 @@ public class PurpurWorldConfig {
@@ -538,7 +538,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
}
public boolean ghastRidable = false;
@@ -1246,6 +1274,7 @@ public class PurpurWorldConfig {
@@ -1248,6 +1276,7 @@ public class PurpurWorldConfig {
public boolean piglinRidable = false;
public boolean piglinRidableInWater = false;
public double piglinMaxHealth = 16.0D;
@@ -546,7 +546,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1255,6 +1284,7 @@ public class PurpurWorldConfig {
@@ -1257,6 +1286,7 @@ public class PurpurWorldConfig {
set("mobs.piglin.attributes.max_health", oldValue);
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -554,7 +554,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
}
public boolean piglinBruteRidable = false;
@@ -1274,6 +1304,7 @@ public class PurpurWorldConfig {
@@ -1276,6 +1306,7 @@ public class PurpurWorldConfig {
public boolean pillagerRidable = false;
public boolean pillagerRidableInWater = false;
public double pillagerMaxHealth = 24.0D;
@@ -562,7 +562,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1283,6 +1314,7 @@ public class PurpurWorldConfig {
@@ -1285,6 +1316,7 @@ public class PurpurWorldConfig {
set("mobs.pillager.attributes.max_health", oldValue);
}
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -570,7 +570,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
}
public boolean polarBearRidable = false;
@@ -1324,6 +1356,7 @@ public class PurpurWorldConfig {
@@ -1326,6 +1358,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -578,7 +578,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1336,11 +1369,13 @@ public class PurpurWorldConfig {
@@ -1338,11 +1371,13 @@ public class PurpurWorldConfig {
rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks);
@@ -592,7 +592,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1350,6 +1385,7 @@ public class PurpurWorldConfig {
@@ -1352,6 +1387,7 @@ public class PurpurWorldConfig {
set("mobs.ravager.attributes.max_health", oldValue);
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -600,7 +600,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
}
public boolean salmonRidable = false;
@@ -1368,6 +1404,7 @@ public class PurpurWorldConfig {
@@ -1370,6 +1406,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
@@ -608,7 +608,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1378,6 +1415,7 @@ public class PurpurWorldConfig {
@@ -1380,6 +1417,7 @@ public class PurpurWorldConfig {
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
@@ -616,7 +616,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
}
public boolean shulkerRidable = false;
@@ -1397,6 +1435,7 @@ public class PurpurWorldConfig {
@@ -1399,6 +1437,7 @@ public class PurpurWorldConfig {
public boolean silverfishRidable = false;
public boolean silverfishRidableInWater = false;
public double silverfishMaxHealth = 8.0D;
@@ -624,7 +624,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1406,6 +1445,7 @@ public class PurpurWorldConfig {
@@ -1408,6 +1447,7 @@ public class PurpurWorldConfig {
set("mobs.silverfish.attributes.max_health", oldValue);
}
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -632,7 +632,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
}
public boolean skeletonRidable = false;
@@ -1473,6 +1513,7 @@ public class PurpurWorldConfig {
@@ -1475,6 +1515,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -640,7 +640,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1489,6 +1530,7 @@ public class PurpurWorldConfig {
@@ -1491,6 +1532,7 @@ public class PurpurWorldConfig {
snowGolemSnowBallMax = getInt("mobs.snow_golem.max-shoot-interval-ticks", snowGolemSnowBallMax);
snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
@@ -648,7 +648,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
}
public boolean squidRidable = false;
@@ -1648,6 +1690,7 @@ public class PurpurWorldConfig {
@@ -1650,6 +1692,7 @@ public class PurpurWorldConfig {
public int villagerLobotomizeCheck = 60;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -656,7 +656,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1674,6 +1717,7 @@ public class PurpurWorldConfig {
@@ -1676,6 +1719,7 @@ public class PurpurWorldConfig {
villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck);
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
@@ -664,7 +664,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
}
public boolean vindicatorRidable = false;
@@ -1730,6 +1774,7 @@ public class PurpurWorldConfig {
@@ -1732,6 +1776,7 @@ public class PurpurWorldConfig {
public double witherMaxHealth = 300.0D;
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
@@ -672,7 +672,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1746,6 +1791,7 @@ public class PurpurWorldConfig {
@@ -1748,6 +1793,7 @@ public class PurpurWorldConfig {
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
@@ -680,7 +680,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
}
public boolean witherSkeletonRidable = false;
@@ -1813,6 +1859,7 @@ public class PurpurWorldConfig {
@@ -1815,6 +1861,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD;
@@ -688,7 +688,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1832,6 +1879,7 @@ public class PurpurWorldConfig {
@@ -1834,6 +1881,7 @@ public class PurpurWorldConfig {
} catch (IllegalArgumentException ignore) {
zombieBreakDoorMinDifficulty = Difficulty.HARD;
}

10
patches/server/0155-Toggle-for-water-sensitive-mob-damage.patch
View File

@@ -70,7 +70,7 @@ index b3928617f732b49cfc124e9bdb879110413defd7..1c6d29a30df66e9971cd50e264bb4455
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 906d95f6f43b950a52192b9048e4a2f58d404e9f..cfeb22ba7a135a31fdbf5a2f65d4f52740fc9cde 100644
index 60df4d666c269eaabbb0b5ebf7fd6eef4261d111..442245807f734231256c9eedf1ed03c15ce84e7b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -611,6 +611,7 @@ public class PurpurWorldConfig {
@@ -105,7 +105,7 @@ index 906d95f6f43b950a52192b9048e4a2f58d404e9f..cfeb22ba7a135a31fdbf5a2f65d4f527
}
public boolean endermiteRidable = false;
@@ -1532,6 +1536,7 @@ public class PurpurWorldConfig {
@@ -1534,6 +1538,7 @@ public class PurpurWorldConfig {
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
public boolean snowGolemBypassMobGriefing = false;
@@ -113,7 +113,7 @@ index 906d95f6f43b950a52192b9048e4a2f58d404e9f..cfeb22ba7a135a31fdbf5a2f65d4f527
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1549,6 +1554,7 @@ public class PurpurWorldConfig {
@@ -1551,6 +1556,7 @@ public class PurpurWorldConfig {
snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
snowGolemBypassMobGriefing = getBoolean("mobs.snow_golem.bypass-mob-griefing", snowGolemBypassMobGriefing);
@@ -121,7 +121,7 @@ index 906d95f6f43b950a52192b9048e4a2f58d404e9f..cfeb22ba7a135a31fdbf5a2f65d4f527
}
public boolean squidRidable = false;
@@ -1602,6 +1608,7 @@ public class PurpurWorldConfig {
@@ -1604,6 +1610,7 @@ public class PurpurWorldConfig {
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
@@ -129,7 +129,7 @@ index 906d95f6f43b950a52192b9048e4a2f58d404e9f..cfeb22ba7a135a31fdbf5a2f65d4f527
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1613,6 +1620,7 @@ public class PurpurWorldConfig {
@@ -1615,6 +1622,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);

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

@@ -29,7 +29,7 @@ index 15d35d325b66e1a417eb7ba699597d627bd4eb54..36745f845f33c877595d572e46bd8e96
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c3bf38fda276d05be4864ba67778c4ba7dae0b21..1adabe1ead47e51b4d1dc2d19036d2675e844707 100644
index 3cca0436d664fc19779ade69a8b961b678674895..78763c53bafc3bd5a142acf530342af8fad363c6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -846,6 +846,7 @@ public class PurpurWorldConfig {
@@ -48,7 +48,7 @@ index c3bf38fda276d05be4864ba67778c4ba7dae0b21..1adabe1ead47e51b4d1dc2d19036d267
}
public boolean endermanRidable = false;
@@ -1832,6 +1834,7 @@ public class PurpurWorldConfig {
@@ -1834,6 +1836,7 @@ public class PurpurWorldConfig {
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
public boolean witherBypassMobGriefing = false;
@@ -56,7 +56,7 @@ index c3bf38fda276d05be4864ba67778c4ba7dae0b21..1adabe1ead47e51b4d1dc2d19036d267
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1849,6 +1852,7 @@ public class PurpurWorldConfig {
@@ -1851,6 +1854,7 @@ public class PurpurWorldConfig {
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);

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

@@ -32,10 +32,10 @@ index 873e1d64b917e961c9d9b5217fe664a91d0ab5bc..c31ffb302dba05d9771db7bd17993a1e
this.caravanHead.caravanTail = this;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1c08334952fa4afd251c1fa00365892c4ef7454f..28a6585e8a20ebd993cd1c20001760fa3b28685d 100644
index 11cb5942c958219b27324127d883edad957e64a4..a310c53c70f40f6f272759bf3899b2742ce06879 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1154,6 +1154,7 @@ public class PurpurWorldConfig {
@@ -1156,6 +1156,7 @@ public class PurpurWorldConfig {
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
public int llamaBreedingTicks = 6000;
@@ -43,7 +43,7 @@ index 1c08334952fa4afd251c1fa00365892c4ef7454f..28a6585e8a20ebd993cd1c20001760fa
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1171,6 +1172,7 @@ public class PurpurWorldConfig {
@@ -1173,6 +1174,7 @@ public class PurpurWorldConfig {
llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks);

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

@@ -31,10 +31,10 @@ index 3c51e6d419a244b9270119590aa299527163c331..b466b0430dd94777975a1e7ab9792166
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d5bf649e4643da234cd76d959d7c2b892535dbd1..1fb80872de9ba8f4d0851da8c2aed992f55c1e08 100644
index b717f636c1eb57e4b3d78b147c76e6cf7fa8ee22..3bddca7e070f1a38454c43f63bc7d62be90f1329 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1464,6 +1464,7 @@ public class PurpurWorldConfig {
@@ -1466,6 +1466,7 @@ public class PurpurWorldConfig {
public boolean ravagerRidableInWater = false;
public double ravagerMaxHealth = 100.0D;
public boolean ravagerBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index d5bf649e4643da234cd76d959d7c2b892535dbd1..1fb80872de9ba8f4d0851da8c2aed992
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1474,6 +1475,23 @@ public class PurpurWorldConfig {
@@ -1476,6 +1477,23 @@ public class PurpurWorldConfig {
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
ravagerBypassMobGriefing = getBoolean("mobs.ravager.bypass-mob-griefing", ravagerBypassMobGriefing);

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

@@ -31,10 +31,10 @@ index c48935d35a6141c41db22e3ec172d5994fd317a2..fa4644c11cbb252734a6f5dc21c861d2
this.openTradingScreen(player, this.getDisplayName(), 1);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a133696790f9f78f80de5de906e04b36fa09ce32..b6a32174aa55585d28340d0f9883e57e95deec41 100644
index c8f4b025a20bd8d6dee4808e597e1e5e295149cc..3ebb64879cf8e920e9ae967791cd62bfdfcbd192 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1808,6 +1808,7 @@ public class PurpurWorldConfig {
@@ -1810,6 +1810,7 @@ public class PurpurWorldConfig {
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index a133696790f9f78f80de5de906e04b36fa09ce32..b6a32174aa55585d28340d0f9883e57e
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1835,6 +1836,7 @@ public class PurpurWorldConfig {
@@ -1837,6 +1838,7 @@ public class PurpurWorldConfig {
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
@@ -50,7 +50,7 @@ index a133696790f9f78f80de5de906e04b36fa09ce32..b6a32174aa55585d28340d0f9883e57e
}
public boolean vindicatorRidable = false;
@@ -1858,6 +1860,7 @@ public class PurpurWorldConfig {
@@ -1860,6 +1862,7 @@ public class PurpurWorldConfig {
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
@@ -58,7 +58,7 @@ index a133696790f9f78f80de5de906e04b36fa09ce32..b6a32174aa55585d28340d0f9883e57e
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1869,6 +1872,7 @@ public class PurpurWorldConfig {
@@ -1871,6 +1874,7 @@ public class PurpurWorldConfig {
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);

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

@@ -31,10 +31,10 @@ index fef1027829c44957e23c0a121033bfb7640d06f0..c42349d0f6b0025525278295b36f4030
pos = pos.below();
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e3dd6088093658e1c8f79bc722893545d6ef2f72..16d77d2a6389f55aed5247f00de8c7fe06e6443e 100644
index 37ebfae24476eec669ce7496430a03f5ef94bd2d..21d0bb67c71b984529257481e6766aeb66ff32f2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1429,6 +1429,7 @@ public class PurpurWorldConfig {
@@ -1431,6 +1431,7 @@ public class PurpurWorldConfig {
public boolean piglinRidableInWater = false;
public double piglinMaxHealth = 16.0D;
public boolean piglinBypassMobGriefing = true;
@@ -42,7 +42,7 @@ index e3dd6088093658e1c8f79bc722893545d6ef2f72..16d77d2a6389f55aed5247f00de8c7fe
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1439,6 +1440,7 @@ public class PurpurWorldConfig {
@@ -1441,6 +1442,7 @@ public class PurpurWorldConfig {
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
piglinBypassMobGriefing = getBoolean("mobs.piglin.bypass-mob-griefing", piglinBypassMobGriefing);

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

@@ -18,10 +18,10 @@ index 430aa10101d9f21561155941ff24441fd0c4103a..de91f0dd7f9a62e5a96b4cc3e4f505ec
if (!event.isCancelled()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1ccc415dfdbacc5c66867252db45ffaf0050a167..f8cf4fa3aa76077e804e63ba219c15bfd8af9566 100644
index c3cf4f7ba1c01e09cbeec690eb99c86fc94c0873..f6e62e14454c869d5f53ed341ef968aedd520692 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1965,6 +1965,7 @@ public class PurpurWorldConfig {
@@ -1967,6 +1967,7 @@ public class PurpurWorldConfig {
public int witherHealthRegenDelay = 20;
public boolean witherBypassMobGriefing = false;
public boolean witherCanRideVehicles = false;
@@ -29,7 +29,7 @@ index 1ccc415dfdbacc5c66867252db45ffaf0050a167..f8cf4fa3aa76077e804e63ba219c15bf
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1983,6 +1984,7 @@ public class PurpurWorldConfig {
@@ -1985,6 +1986,7 @@ public class PurpurWorldConfig {
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);

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

@@ -17,10 +17,10 @@ index f4e983da7206923ee0b0f984e65a6c2b3a6a8aeb..cea3725009af1bc746a593c4db63ed63
this.goalSelector.addGoal(2, new MoveTowardsTargetGoal(this, 0.9D, 32.0F));
this.goalSelector.addGoal(2, new MoveBackToVillageGoal(this, 0.6D, false));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b0114741cf9b57ce0140bad99cb711ad532937b2..d9c6ff22fc92caaff09e7990334f281dab9e4296 100644
index c263b838428a456b75be86c6a841c28977fc740f..f5ee6cb61f0fd5489ce0b38b1d4f96c6777d8eaa 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1232,6 +1232,7 @@ public class PurpurWorldConfig {
@@ -1234,6 +1234,7 @@ public class PurpurWorldConfig {
public boolean ironGolemRidableInWater = false;
public boolean ironGolemCanSwim = false;
public double ironGolemMaxHealth = 100.0D;
@@ -28,7 +28,7 @@ index b0114741cf9b57ce0140bad99cb711ad532937b2..d9c6ff22fc92caaff09e7990334f281d
private void ironGolemSettings() {
ironGolemRidable = getBoolean("mobs.iron_golem.ridable", ironGolemRidable);
ironGolemRidableInWater = getBoolean("mobs.iron_golem.ridable-in-water", ironGolemRidableInWater);
@@ -1242,6 +1243,7 @@ public class PurpurWorldConfig {
@@ -1244,6 +1245,7 @@ public class PurpurWorldConfig {
set("mobs.iron_golem.attributes.max_health", oldValue);
}
ironGolemMaxHealth = getDouble("mobs.iron_golem.attributes.max_health", ironGolemMaxHealth);

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

@@ -50,10 +50,10 @@ index 553b0aff0ccc5baf41d5faae1a2fd88249dd5a74..3da2b68fb03a80676d7a5eed271499f6
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d9c6ff22fc92caaff09e7990334f281dab9e4296..dafd6d024a68395ef26ad85ce3d1a60b6e22a584 100644
index f5ee6cb61f0fd5489ce0b38b1d4f96c6777d8eaa..128b7d544f4e6df800d55cc192e1c59ef0566eb7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1368,6 +1368,7 @@ public class PurpurWorldConfig {
@@ -1370,6 +1370,7 @@ public class PurpurWorldConfig {
public boolean parrotRidableInWater = false;
public double parrotMaxY = 256D;
public double parrotMaxHealth = 6.0D;
@@ -61,7 +61,7 @@ index d9c6ff22fc92caaff09e7990334f281dab9e4296..dafd6d024a68395ef26ad85ce3d1a60b
private void parrotSettings() {
parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable);
parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater);
@@ -1378,6 +1379,7 @@ public class PurpurWorldConfig {
@@ -1380,6 +1381,7 @@ public class PurpurWorldConfig {
set("mobs.parrot.attributes.max_health", oldValue);
}
parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth);