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

[ci-skip] clean up TODOs in patches

Browse Source
This commit is contained in:
granny
2023-03-20 20:04:44 -07:00
parent eb1479754d
commit 34464812aa
7 changed files with 108 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
patches/server/0007-Configurable-entity-base-attributes.patch
View File

@@ -1220,7 +1220,7 @@ index 774da46962f70e73d31ea523eb5bfc286f38856d..d2324e2dbd72fcd5a8ab562bc3b6e530
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index de0b2d79435f55f35f1063094ac9c674b186fc79..267833342e74cf71b5199d261620ace5ea988c1e 100644
index de0b2d79435f55f35f1063094ac9c674b186fc79..4a831f434f27a117fdcd1364a18deb026d1638e4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -112,94 +112,181 @@ public class PurpurWorldConfig {
@@ -1295,12 +1295,12 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..267833342e74cf71b5199d261620ace5
+ blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
+ }
+
+ public double camelMaxHealthMin = 32.0D; // TODO: re-implement
+ public double camelMaxHealthMax = 32.0D; // TODO: re-implement
+ public double camelJumpStrengthMin = 0.42D; // TODO: re-implement
+ public double camelJumpStrengthMax = 0.42D; // TODO: re-implement
+ public double camelMovementSpeedMin = 0.09D; // TODO: re-implement
+ public double camelMovementSpeedMax = 0.09D; // TODO: re-implement
+ public double camelMaxHealthMin = 32.0D;
+ public double camelMaxHealthMax = 32.0D;
+ public double camelJumpStrengthMin = 0.42D;
+ public double camelJumpStrengthMax = 0.42D;
+ public double camelMovementSpeedMin = 0.09D;
+ public double camelMovementSpeedMax = 0.09D;
+ private void camelSettings() {
+ camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin);
+ camelMaxHealthMax = getDouble("mobs.camel.attributes.max_health.max", camelMaxHealthMax);
@@ -1425,12 +1425,12 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..267833342e74cf71b5199d261620ace5
}
public boolean donkeyRidableInWater = false;
+ public double donkeyMaxHealthMin = 15.0D; // TODO: re-implement
+ public double donkeyMaxHealthMax = 30.0D; // TODO: re-implement
+ public double donkeyJumpStrengthMin = 0.5D; // TODO: re-implement
+ public double donkeyJumpStrengthMax = 0.5D; // TODO: re-implement
+ public double donkeyMovementSpeedMin = 0.175D; // TODO: re-implement
+ public double donkeyMovementSpeedMax = 0.175D; // TODO: re-implement
+ public double donkeyMaxHealthMin = 15.0D;
+ public double donkeyMaxHealthMax = 30.0D;
+ public double donkeyJumpStrengthMin = 0.5D;
+ public double donkeyJumpStrengthMax = 0.5D;
+ public double donkeyMovementSpeedMin = 0.175D;
+ public double donkeyMovementSpeedMax = 0.175D;
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
+ if (PurpurConfig.version < 10) {
@@ -1660,12 +1660,12 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..267833342e74cf71b5199d261620ace5
}
public boolean horseRidableInWater = false;
+ public double horseMaxHealthMin = 15.0D; // TODO: re-implement
+ public double horseMaxHealthMax = 30.0D; // TODO: re-implement
+ public double horseJumpStrengthMin = 0.4D; // TODO: re-implement
+ public double horseJumpStrengthMax = 1.0D; // TODO: re-implement
+ public double horseMovementSpeedMin = 0.1125D; // TODO: re-implement
+ public double horseMovementSpeedMax = 0.3375D; // TODO: re-implement
+ public double horseMaxHealthMin = 15.0D;
+ public double horseMaxHealthMax = 30.0D;
+ public double horseJumpStrengthMin = 0.4D;
+ public double horseJumpStrengthMax = 1.0D;
+ public double horseMovementSpeedMin = 0.1125D;
+ public double horseMovementSpeedMax = 0.3375D;
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
+ if (PurpurConfig.version < 10) {
@@ -1746,12 +1746,12 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..267833342e74cf71b5199d261620ace5
public boolean llamaRidable = false;
public boolean llamaRidableInWater = false;
public boolean llamaControllable = true;
+ public double llamaMaxHealthMin = 15.0D; // TODO: re-implement
+ public double llamaMaxHealthMax = 30.0D; // TODO: re-implement
+ public double llamaJumpStrengthMin = 0.5D; // TODO: re-implement
+ public double llamaJumpStrengthMax = 0.5D; // TODO: re-implement
+ public double llamaMovementSpeedMin = 0.175D; // TODO: re-implement
+ public double llamaMovementSpeedMax = 0.175D; // TODO: re-implement
+ public double llamaMaxHealthMin = 15.0D;
+ public double llamaMaxHealthMax = 30.0D;
+ public double llamaJumpStrengthMin = 0.5D;
+ public double llamaJumpStrengthMax = 0.5D;
+ public double llamaMovementSpeedMin = 0.175D;
+ public double llamaMovementSpeedMax = 0.175D;
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1810,12 +1810,12 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..267833342e74cf71b5199d261620ace5
}
public boolean muleRidableInWater = false;
+ public double muleMaxHealthMin = 15.0D; // TODO: re-implement
+ public double muleMaxHealthMax = 30.0D; // TODO: re-implement
+ public double muleJumpStrengthMin = 0.5D; // TODO: re-implement
+ public double muleJumpStrengthMax = 0.5D; // TODO: re-implement
+ public double muleMovementSpeedMin = 0.175D; // TODO: re-implement
+ public double muleMovementSpeedMax = 0.175D; // TODO: re-implement
+ public double muleMaxHealthMin = 15.0D;
+ public double muleMaxHealthMax = 30.0D;
+ public double muleJumpStrengthMin = 0.5D;
+ public double muleJumpStrengthMax = 0.5D;
+ public double muleMovementSpeedMin = 0.175D;
+ public double muleMovementSpeedMax = 0.175D;
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
+ if (PurpurConfig.version < 10) {
@@ -2120,12 +2120,12 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..267833342e74cf71b5199d261620ace5
public boolean skeletonHorseRidableInWater = true;
public boolean skeletonHorseCanSwim = false;
+ public double skeletonHorseMaxHealthMin = 15.0D; // TODO: re-implement
+ public double skeletonHorseMaxHealthMax = 15.0D; // TODO: re-implement
+ public double skeletonHorseJumpStrengthMin = 0.4D; // TODO: re-implement
+ public double skeletonHorseJumpStrengthMax = 1.0D; // TODO: re-implement
+ public double skeletonHorseMovementSpeedMin = 0.2D; // TODO: re-implement
+ public double skeletonHorseMovementSpeedMax = 0.2D; // TODO: re-implement
+ public double skeletonHorseMaxHealthMin = 15.0D;
+ public double skeletonHorseMaxHealthMax = 15.0D;
+ public double skeletonHorseJumpStrengthMin = 0.4D;
+ public double skeletonHorseJumpStrengthMax = 1.0D;
+ public double skeletonHorseMovementSpeedMin = 0.2D;
+ public double skeletonHorseMovementSpeedMax = 0.2D;
private void skeletonHorseSettings() {
skeletonHorseRidableInWater = getBoolean("mobs.skeleton_horse.ridable-in-water", skeletonHorseRidableInWater);
skeletonHorseCanSwim = getBoolean("mobs.skeleton_horse.can-swim", skeletonHorseCanSwim);
@@ -2253,12 +2253,12 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..267833342e74cf71b5199d261620ace5
public boolean traderLlamaRidable = false;
public boolean traderLlamaRidableInWater = false;
public boolean traderLlamaControllable = true;
+ public double traderLlamaMaxHealthMin = 15.0D; // TODO: re-implement
+ public double traderLlamaMaxHealthMax = 30.0D; // TODO: re-implement
+ public double traderLlamaJumpStrengthMin = 0.5D; // TODO: re-implement
+ public double traderLlamaJumpStrengthMax = 0.5D; // TODO: re-implement
+ public double traderLlamaMovementSpeedMin = 0.175D; // TODO: re-implement
+ public double traderLlamaMovementSpeedMax = 0.175D; // TODO: re-implement
+ public double traderLlamaMaxHealthMin = 15.0D;
+ public double traderLlamaMaxHealthMax = 30.0D;
+ public double traderLlamaJumpStrengthMin = 0.5D;
+ public double traderLlamaJumpStrengthMax = 0.5D;
+ public double traderLlamaMovementSpeedMin = 0.175D;
+ public double traderLlamaMovementSpeedMax = 0.175D;
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -2482,12 +2482,12 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..267833342e74cf71b5199d261620ace5
public boolean zombieHorseRidableInWater = false;
public boolean zombieHorseCanSwim = false;
+ public double zombieHorseMaxHealthMin = 15.0D; // TODO: re-implement
+ public double zombieHorseMaxHealthMax = 15.0D; // TODO: re-implement
+ public double zombieHorseJumpStrengthMin = 0.4D; // TODO: re-implement
+ public double zombieHorseJumpStrengthMax = 1.0D; // TODO: re-implement
+ public double zombieHorseMovementSpeedMin = 0.2D; // TODO: re-implement
+ public double zombieHorseMovementSpeedMax = 0.2D; // TODO: re-implement
+ public double zombieHorseMaxHealthMin = 15.0D;
+ public double zombieHorseMaxHealthMax = 15.0D;
+ public double zombieHorseJumpStrengthMin = 0.4D;
+ public double zombieHorseJumpStrengthMax = 1.0D;
+ public double zombieHorseMovementSpeedMin = 0.2D;
+ public double zombieHorseMovementSpeedMax = 0.2D;
private void zombieHorseSettings() {
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);

8
patches/server/0025-Zombie-horse-naturally-spawn.patch
View File

@@ -30,13 +30,13 @@ index ffde1d129c5434e7748cbdaac9109cbd3d0d29bc..057f4b71ff295cf6fed9cc5b86aa4034
entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
this.addFreshEntity(entityhorseskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2633d54585678dcbe0b8131d3b28e502cc76b5f8..6a1d6578b8d95b7afcb12de0316d89ffe744d167 100644
index 89ec247625aefc065b6a050d0749d144fcb6bdd6..d476a826abbeb7fd4206c0598cb18dc0d365bc4d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1477,6 +1477,7 @@ public class PurpurWorldConfig {
public double zombieHorseJumpStrengthMax = 1.0D; // TODO: re-implement
public double zombieHorseMovementSpeedMin = 0.2D; // TODO: re-implement
public double zombieHorseMovementSpeedMax = 0.2D; // TODO: re-implement
public double zombieHorseJumpStrengthMax = 1.0D;
public double zombieHorseMovementSpeedMin = 0.2D;
public double zombieHorseMovementSpeedMax = 0.2D;
+ public double zombieHorseSpawnChance = 0.0D;
private void zombieHorseSettings() {
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);

38
patches/server/0104-Make-entity-breeding-times-configurable.patch
View File

@@ -525,7 +525,7 @@ index 9cc42b4a1ea0d2315350e038034dfe7171668658..8e837ce3069ca05bcc93ea93f94c7934
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 823130a1a6505bf900a455858ba9224e5a242a64..7077abe83b9c1cd6cc81c11740947f465049b1c5 100644
index 01794fced783d09073ce84647a93d94c35e713da..a74e68d7f449fba94f0cc10c3988a089b2c86dc1 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -510,10 +510,12 @@ public class PurpurWorldConfig {
@@ -562,9 +562,9 @@ index 823130a1a6505bf900a455858ba9224e5a242a64..7077abe83b9c1cd6cc81c11740947f46
}
+ public int camelBreedingTicks = 6000;
public double camelMaxHealthMin = 32.0D; // TODO: re-implement
public double camelMaxHealthMax = 32.0D; // TODO: re-implement
public double camelJumpStrengthMin = 0.42D; // TODO: re-implement
public double camelMaxHealthMin = 32.0D;
public double camelMaxHealthMax = 32.0D;
public double camelJumpStrengthMin = 0.42D;
@@ -590,6 +595,7 @@ public class PurpurWorldConfig {
camelJumpStrengthMax = getDouble("mobs.camel.attributes.jump_strength.max", camelJumpStrengthMax);
camelMovementSpeedMin = getDouble("mobs.camel.attributes.movement_speed.min", camelMovementSpeedMin);
@@ -622,9 +622,9 @@ index 823130a1a6505bf900a455858ba9224e5a242a64..7077abe83b9c1cd6cc81c11740947f46
public boolean creeperRidable = false;
@@ -729,6 +741,7 @@ public class PurpurWorldConfig {
public double donkeyJumpStrengthMax = 0.5D; // TODO: re-implement
public double donkeyMovementSpeedMin = 0.175D; // TODO: re-implement
public double donkeyMovementSpeedMax = 0.175D; // TODO: re-implement
public double donkeyJumpStrengthMax = 0.5D;
public double donkeyMovementSpeedMin = 0.175D;
public double donkeyMovementSpeedMax = 0.175D;
+ public int donkeyBreedingTicks = 6000;
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
@@ -697,9 +697,9 @@ index 823130a1a6505bf900a455858ba9224e5a242a64..7077abe83b9c1cd6cc81c11740947f46
public boolean horseRidableInWater = false;
@@ -996,6 +1018,7 @@ public class PurpurWorldConfig {
public double horseJumpStrengthMax = 1.0D; // TODO: re-implement
public double horseMovementSpeedMin = 0.1125D; // TODO: re-implement
public double horseMovementSpeedMax = 0.3375D; // TODO: re-implement
public double horseJumpStrengthMax = 1.0D;
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
+ public int horseBreedingTicks = 6000;
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
@@ -713,9 +713,9 @@ index 823130a1a6505bf900a455858ba9224e5a242a64..7077abe83b9c1cd6cc81c11740947f46
public boolean huskRidable = false;
@@ -1088,6 +1112,7 @@ public class PurpurWorldConfig {
public double llamaJumpStrengthMax = 0.5D; // TODO: re-implement
public double llamaMovementSpeedMin = 0.175D; // TODO: re-implement
public double llamaMovementSpeedMax = 0.175D; // TODO: re-implement
public double llamaJumpStrengthMax = 0.5D;
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
+ public int llamaBreedingTicks = 6000;
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
@@ -745,9 +745,9 @@ index 823130a1a6505bf900a455858ba9224e5a242a64..7077abe83b9c1cd6cc81c11740947f46
public boolean muleRidableInWater = false;
@@ -1152,6 +1180,7 @@ public class PurpurWorldConfig {
public double muleJumpStrengthMax = 0.5D; // TODO: re-implement
public double muleMovementSpeedMin = 0.175D; // TODO: re-implement
public double muleMovementSpeedMax = 0.175D; // TODO: re-implement
public double muleJumpStrengthMax = 0.5D;
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
+ public int muleBreedingTicks = 6000;
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
@@ -884,9 +884,9 @@ index 823130a1a6505bf900a455858ba9224e5a242a64..7077abe83b9c1cd6cc81c11740947f46
public boolean tadpoleRidable = false;
@@ -1656,6 +1702,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D; // TODO: re-implement
public double traderLlamaMovementSpeedMin = 0.175D; // TODO: re-implement
public double traderLlamaMovementSpeedMax = 0.175D; // TODO: re-implement
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
+ public int traderLlamaBreedingTicks = 6000;
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);

32
patches/server/0130-Toggle-for-water-sensitive-mob-damage.patch
View File

@@ -1197,7 +1197,7 @@ index fbbeacb94aeda40e9fc5c0553ab68948de9019c4..64c8890a54a10abd454a62671fbabfcf
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ac544371839dc9d5e0540ef2a5936d946e91ac7a..198d963d3fea007638ccac26fafc0dfaa3cbe570 100644
index 636c973d29f72d4e793afb7c448e20ff5a9c12a2..e749a8864c4cd4d5cf5726974c3e7f119aacd889 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -577,11 +577,13 @@ public class PurpurWorldConfig {
@@ -1372,8 +1372,8 @@ index ac544371839dc9d5e0540ef2a5936d946e91ac7a..198d963d3fea007638ccac26fafc0dfa
public boolean donkeyRidableInWater = false;
@@ -816,6 +838,7 @@ public class PurpurWorldConfig {
public double donkeyMovementSpeedMin = 0.175D; // TODO: re-implement
public double donkeyMovementSpeedMax = 0.175D; // TODO: re-implement
public double donkeyMovementSpeedMin = 0.175D;
public double donkeyMovementSpeedMax = 0.175D;
public int donkeyBreedingTicks = 6000;
+ public boolean donkeyTakeDamageFromWater = false;
private void donkeySettings() {
@@ -1587,8 +1587,8 @@ index ac544371839dc9d5e0540ef2a5936d946e91ac7a..198d963d3fea007638ccac26fafc0dfa
public boolean horseRidableInWater = false;
@@ -1103,6 +1153,7 @@ public class PurpurWorldConfig {
public double horseMovementSpeedMin = 0.1125D; // TODO: re-implement
public double horseMovementSpeedMax = 0.3375D; // TODO: re-implement
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
public int horseBreedingTicks = 6000;
+ public boolean horseTakeDamageFromWater = false;
private void horseSettings() {
@@ -1651,8 +1651,8 @@ index ac544371839dc9d5e0540ef2a5936d946e91ac7a..198d963d3fea007638ccac26fafc0dfa
public boolean llamaRidable = false;
@@ -1197,6 +1255,7 @@ public class PurpurWorldConfig {
public double llamaMovementSpeedMin = 0.175D; // TODO: re-implement
public double llamaMovementSpeedMax = 0.175D; // TODO: re-implement
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
public int llamaBreedingTicks = 6000;
+ public boolean llamaTakeDamageFromWater = false;
private void llamaSettings() {
@@ -1699,8 +1699,8 @@ index ac544371839dc9d5e0540ef2a5936d946e91ac7a..198d963d3fea007638ccac26fafc0dfa
public boolean muleRidableInWater = false;
@@ -1265,6 +1329,7 @@ public class PurpurWorldConfig {
public double muleMovementSpeedMin = 0.175D; // TODO: re-implement
public double muleMovementSpeedMax = 0.175D; // TODO: re-implement
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
public int muleBreedingTicks = 6000;
+ public boolean muleTakeDamageFromWater = false;
private void muleSettings() {
@@ -1980,9 +1980,9 @@ index ac544371839dc9d5e0540ef2a5936d946e91ac7a..198d963d3fea007638ccac26fafc0dfa
public boolean skeletonHorseRidableInWater = true;
@@ -1640,6 +1740,7 @@ public class PurpurWorldConfig {
public double skeletonHorseJumpStrengthMax = 1.0D; // TODO: re-implement
public double skeletonHorseMovementSpeedMin = 0.2D; // TODO: re-implement
public double skeletonHorseMovementSpeedMax = 0.2D; // TODO: re-implement
public double skeletonHorseJumpStrengthMax = 1.0D;
public double skeletonHorseMovementSpeedMin = 0.2D;
public double skeletonHorseMovementSpeedMax = 0.2D;
+ public boolean skeletonHorseTakeDamageFromWater = false;
private void skeletonHorseSettings() {
skeletonHorseRidableInWater = getBoolean("mobs.skeleton_horse.ridable-in-water", skeletonHorseRidableInWater);
@@ -2090,8 +2090,8 @@ index ac544371839dc9d5e0540ef2a5936d946e91ac7a..198d963d3fea007638ccac26fafc0dfa
public boolean tadpoleRidable = false;
@@ -1813,6 +1927,7 @@ public class PurpurWorldConfig {
public double traderLlamaMovementSpeedMin = 0.175D; // TODO: re-implement
public double traderLlamaMovementSpeedMax = 0.175D; // TODO: re-implement
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
public int traderLlamaBreedingTicks = 6000;
+ public boolean traderLlamaTakeDamageFromWater = false;
private void traderLlamaSettings() {
@@ -2294,8 +2294,8 @@ index ac544371839dc9d5e0540ef2a5936d946e91ac7a..198d963d3fea007638ccac26fafc0dfa
public boolean zombieHorseRidableInWater = false;
@@ -2101,6 +2241,7 @@ public class PurpurWorldConfig {
public double zombieHorseMovementSpeedMin = 0.2D; // TODO: re-implement
public double zombieHorseMovementSpeedMax = 0.2D; // TODO: re-implement
public double zombieHorseMovementSpeedMin = 0.2D;
public double zombieHorseMovementSpeedMax = 0.2D;
public double zombieHorseSpawnChance = 0.0D;
+ public boolean zombieHorseTakeDamageFromWater = false;
private void zombieHorseSettings() {

4
patches/server/0142-Config-to-disable-Llama-caravans.patch
View File

@@ -32,11 +32,11 @@ index 185749df0c7c08f625145a29810ffed6042550bb..3f3e6633a3de2ceb5a082777a24ff045
this.caravanHead.caravanTail = this;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 941811c1070f10302c10bb404e8d782224a796e4..bac8dc98ad761a510de5eb411a33365863a2da7a 100644
index ab07a785f7017882f3ee31ee32625fae8392c7c5..e8c890ee982489206b5e8d36786c48bdcf66968f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1327,6 +1327,7 @@ public class PurpurWorldConfig {
public double llamaMovementSpeedMax = 0.175D; // TODO: re-implement
public double llamaMovementSpeedMax = 0.175D;
public int llamaBreedingTicks = 6000;
public boolean llamaTakeDamageFromWater = false;
+ public boolean llamaJoinCaravans = true;

16
patches/server/0230-Mobs-always-drop-experience.patch
View File

@@ -1157,7 +1157,7 @@ index e06f3ee85dde587f1146d4a3d70e8a2e5b9a128b..2e9dd920e5c3943cba4c53ec2a2b48ee
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e4f06854d30c4f441dc55af91c010ad34a5888c0..2f99965a4ed34d48f62ad19338e7728f8b8bb7e7 100644
index b35a52ac5acc8b61a2af17babae53cbcacc957fa..63a073ed252419b52217fe4b404e6efbc355b776 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1013,12 +1013,14 @@ public class PurpurWorldConfig {
@@ -1335,7 +1335,7 @@ index e4f06854d30c4f441dc55af91c010ad34a5888c0..2f99965a4ed34d48f62ad19338e7728f
public boolean donkeyRidableInWater = false;
@@ -1293,6 +1315,7 @@ public class PurpurWorldConfig {
public double donkeyMovementSpeedMax = 0.175D; // TODO: re-implement
public double donkeyMovementSpeedMax = 0.175D;
public int donkeyBreedingTicks = 6000;
public boolean donkeyTakeDamageFromWater = false;
+ public boolean donkeyAlwaysDropExp = false;
@@ -1540,7 +1540,7 @@ index e4f06854d30c4f441dc55af91c010ad34a5888c0..2f99965a4ed34d48f62ad19338e7728f
public boolean horseRidableInWater = false;
@@ -1633,6 +1681,7 @@ public class PurpurWorldConfig {
public double horseMovementSpeedMax = 0.3375D; // TODO: re-implement
public double horseMovementSpeedMax = 0.3375D;
public int horseBreedingTicks = 6000;
public boolean horseTakeDamageFromWater = false;
+ public boolean horseAlwaysDropExp = false;
@@ -1652,7 +1652,7 @@ index e4f06854d30c4f441dc55af91c010ad34a5888c0..2f99965a4ed34d48f62ad19338e7728f
public boolean muleRidableInWater = false;
@@ -1815,6 +1877,7 @@ public class PurpurWorldConfig {
public double muleMovementSpeedMax = 0.175D; // TODO: re-implement
public double muleMovementSpeedMax = 0.175D;
public int muleBreedingTicks = 6000;
public boolean muleTakeDamageFromWater = false;
+ public boolean muleAlwaysDropExp = false;
@@ -1938,8 +1938,8 @@ index e4f06854d30c4f441dc55af91c010ad34a5888c0..2f99965a4ed34d48f62ad19338e7728f
public boolean skeletonHorseRidableInWater = true;
@@ -2260,6 +2358,7 @@ public class PurpurWorldConfig {
public double skeletonHorseMovementSpeedMin = 0.2D; // TODO: re-implement
public double skeletonHorseMovementSpeedMax = 0.2D; // TODO: re-implement
public double skeletonHorseMovementSpeedMin = 0.2D;
public double skeletonHorseMovementSpeedMax = 0.2D;
public boolean skeletonHorseTakeDamageFromWater = false;
+ public boolean skeletonHorseAlwaysDropExp = false;
private void skeletonHorseSettings() {
@@ -2050,7 +2050,7 @@ index e4f06854d30c4f441dc55af91c010ad34a5888c0..2f99965a4ed34d48f62ad19338e7728f
public boolean tadpoleRidable = false;
@@ -2447,6 +2559,7 @@ public class PurpurWorldConfig {
public double traderLlamaMovementSpeedMax = 0.175D; // TODO: re-implement
public double traderLlamaMovementSpeedMax = 0.175D;
public int traderLlamaBreedingTicks = 6000;
public boolean traderLlamaTakeDamageFromWater = false;
+ public boolean traderLlamaAlwaysDropExp = false;
@@ -2257,7 +2257,7 @@ index e4f06854d30c4f441dc55af91c010ad34a5888c0..2f99965a4ed34d48f62ad19338e7728f
public boolean zombieHorseRidableInWater = false;
@@ -2771,6 +2909,7 @@ public class PurpurWorldConfig {
public double zombieHorseMovementSpeedMax = 0.2D; // TODO: re-implement
public double zombieHorseMovementSpeedMax = 0.2D;
public double zombieHorseSpawnChance = 0.0D;
public boolean zombieHorseTakeDamageFromWater = false;
+ public boolean zombieHorseAlwaysDropExp = false;