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

add camel attributes to config, fixes #1224

Browse Source
This commit is contained in:
granny
2023-01-20 02:44:41 -08:00
parent a1238c38b2
commit 15a76c78b1
78 changed files with 641 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
patches/server/0009-Configurable-entity-base-attributes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable entity base attributes
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 129e9f79930f03295d1bfaf53333e1a9863b4bc8..c6db89b5c94e31bffcca6625e37497bab779fdb8 100644
index 56600adaeb6b51451529469acca8ca1aef352ff3..1c70f6bb15764a1327347db2190e0337c581e695 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -155,7 +155,7 @@ import org.bukkit.plugin.PluginManager;
@@ -34,7 +34,7 @@ index 882ab40c8cdea8c214cb8344b3ccecddb2967c1c..cb79d2c958fbd34f8c8818e7e1c0db88
@Override
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 60519f70115358e3f94de6a2c1923e2d5f7a9f55..a24bffefc209ebfe31e553ceef212615edeb2687 100644
index 1f9f59f4ec936e365ad6428717a7d92983a66222..82a8fddc5a0ee82c8ce78c02f4ecb106b89c734d 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -290,6 +290,7 @@ public abstract class LivingEntity extends Entity {
@@ -474,6 +474,34 @@ index ac7b58d4ad0e3c3d3fe8aaf7a6b4237786c09e75..72f84f5a951c96c360206b43154a9524
// Purpur end
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
index d9104d996c854cce1ff167706c93747cd69c3969..d04bc82bb5dbb24ec26d8e7a89061ed62fd199f5 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
@@ -294,6 +294,23 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider
return this.dashCooldown;
}
+ // Purpur start
+ @Override
+ public float generateRandomMaxHealth(net.minecraft.util.RandomSource random) {
+ return (float) generateRandomMaxHealth(this.level.purpurConfig.camelMaxHealthMin, this.level.purpurConfig.camelMaxHealthMax);
+ }
+
+ @Override
+ public double generateRandomJumpStrength(net.minecraft.util.RandomSource random) {
+ return generateRandomJumpStrength(this.level.purpurConfig.camelJumpStrengthMin, this.level.purpurConfig.camelJumpStrengthMax);
+ }
+
+ @Override
+ public double generateRandomSpeed(net.minecraft.util.RandomSource random) {
+ return generateRandomSpeed(this.level.purpurConfig.camelMovementSpeedMin, this.level.purpurConfig.camelMovementSpeedMax);
+ }
+ // Purpur end
+
@Override
protected SoundEvent getAmbientSound() {
return SoundEvents.CAMEL_AMBIENT;
diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
index d6e527fb592f721aac59d52a1e84e147da62913b..6ddc233dff914abda9895b4a4a6218f8642ae07e 100644
--- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
@@ -719,7 +747,7 @@ index a71b4979c1acb272efe3e5eddae05768e98dfca3..3ad96cce8ce944586f24a40101bc531c
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
index de5bc81e8a80a3e81781e2edfdd1f8bd5fc76181..01ba677cb6ffc9f4eabf78cfc67f27051a248f0d 100644
index 7506ba57b1e5488d50ee577ed6147e7f05e0faa3..b82a90d6b051fe7d93e4c9a5ac0000137768cae5 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
@@ -160,6 +160,11 @@ public class EnderDragon extends Mob implements Enemy {
@@ -1067,7 +1095,7 @@ index a12352cb50edd8bd7a8f514e714e352bb341c2f7..f2f0137d8c74165f5ea829599f537c14
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
index c08c95198fb472ac2eb1e0cbf266f2e47c6bd437..94859efec34e6edfd31ff22277e3084218e38b3c 100644
index e497d0ff3cafd16d3aed9a858a506d1c6f4e140a..255b90552a8887e37a051f74eb2ed51e6a041e3b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
@@ -90,6 +90,11 @@ public class Ravager extends Raider {
@@ -1185,7 +1213,7 @@ index 3de34f745609cfcb8039c72b0432966262918510..a508b7c024f35d63c2de5f61e4b1717a
this.setHealth(this.getMaxHealth());
}
diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
index 74d70a2d63f527511fbf369f85abde864524c3c0..4094ec0e89ef6f3aac1337045646665db27312c5 100644
index e95e5677df0affdf4ce87365263c40e0b9d396c1..f82d214f22e10aec3b0ab106c0d11b990ae7cec5 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
@@ -66,6 +66,11 @@ public class Spider extends Monster {
@@ -1384,7 +1412,7 @@ index 838420f5d61eaf5e4abb52751b010d57def21d6f..aca84be04c50188612f69ee20e9a0948
@Nullable
diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
index f2afd5f8ad916f0cf4674c6b4f973715999c6641..e99ffbf30652e188e88f8e17ed41d39ff25c9f73 100644
index 3330580c06d4e7645be12deffb63936799dffe44..8e2c052dac99d4b7b4b926a2c22281087abaf754 100644
--- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
@@ -82,6 +82,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@@ -1464,10 +1492,10 @@ index 0e7d5540763d56020cd59d9aef09f7a7d2cde1b1..7502940882edea11842b09de57094af3
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a258de586a26c43f0316468f0a49e2da94b690da..a85c9f24729ea44ef072a6d3d9ffeb93e8f0a486 100644
index a258de586a26c43f0316468f0a49e2da94b690da..eb3953524cf7dc8a96fd7bcfddf2685565e7b60e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -113,94 +113,166 @@ public class PurpurWorldConfig {
@@ -113,94 +113,183 @@ public class PurpurWorldConfig {
public boolean axolotlRidable = false;
public boolean axolotlControllable = true;
@@ -1537,6 +1565,23 @@ index a258de586a26c43f0316468f0a49e2da94b690da..a85c9f24729ea44ef072a6d3d9ffeb93
+ set("mobs.blaze.attributes.max_health", oldValue);
+ }
+ blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
+ }
+
+ public int camelBreedingTicks = 6000;
+ 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);
+ camelJumpStrengthMin = getDouble("mobs.camel.attributes.jump_strength.min", camelJumpStrengthMin);
+ camelJumpStrengthMax = getDouble("mobs.camel.attributes.jump_strength.max", camelJumpStrengthMax);
+ camelMovementSpeedMin = getDouble("mobs.camel.attributes.movement_speed.min", camelMovementSpeedMin);
+ camelMovementSpeedMax = getDouble("mobs.camel.attributes.movement_speed.max", camelMovementSpeedMax);
+ camelBreedingTicks = getInt("mobs.camel.breeding-delay-ticks", camelBreedingTicks);
}
public boolean catRidable = false;
@@ -1634,7 +1679,7 @@ index a258de586a26c43f0316468f0a49e2da94b690da..a85c9f24729ea44ef072a6d3d9ffeb93
}
public boolean dolphinRidable = false;
@@ -208,80 +280,161 @@ public class PurpurWorldConfig {
@@ -208,80 +297,161 @@ public class PurpurWorldConfig {
public int dolphinSpitCooldown = 20;
public float dolphinSpitSpeed = 1.0F;
public float dolphinSpitDamage = 2.0F;
@@ -1796,7 +1841,7 @@ index a258de586a26c43f0316468f0a49e2da94b690da..a85c9f24729ea44ef072a6d3d9ffeb93
}
public boolean frogRidable = false;
@@ -299,147 +452,316 @@ public class PurpurWorldConfig {
@@ -299,147 +469,316 @@ public class PurpurWorldConfig {
public boolean ghastRidableInWater = false;
public boolean ghastControllable = true;
public double ghastMaxY = 320D;
@@ -2113,7 +2158,7 @@ index a258de586a26c43f0316468f0a49e2da94b690da..a85c9f24729ea44ef072a6d3d9ffeb93
}
public boolean phantomRidable = false;
@@ -449,6 +771,10 @@ public class PurpurWorldConfig {
@@ -449,6 +788,10 @@ public class PurpurWorldConfig {
public float phantomFlameDamage = 1.0F;
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
@@ -2124,7 +2169,7 @@ index a258de586a26c43f0316468f0a49e2da94b690da..a85c9f24729ea44ef072a6d3d9ffeb93
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -457,180 +783,350 @@ public class PurpurWorldConfig {
@@ -457,180 +800,350 @@ 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);
@@ -2475,7 +2520,7 @@ index a258de586a26c43f0316468f0a49e2da94b690da..a85c9f24729ea44ef072a6d3d9ffeb93
}
public boolean tadpoleRidable = false;
@@ -645,64 +1141,125 @@ public class PurpurWorldConfig {
@@ -645,64 +1158,125 @@ public class PurpurWorldConfig {
public boolean traderLlamaRidable = false;
public boolean traderLlamaRidableInWater = false;
public boolean traderLlamaControllable = true;
@@ -2601,7 +2646,7 @@ index a258de586a26c43f0316468f0a49e2da94b690da..a85c9f24729ea44ef072a6d3d9ffeb93
}
public boolean wardenRidable = false;
@@ -717,81 +1274,165 @@ public class PurpurWorldConfig {
@@ -717,81 +1291,165 @@ public class PurpurWorldConfig {
public boolean witchRidable = false;
public boolean witchRidableInWater = false;
public boolean witchControllable = true;

6
patches/server/0026-Giants-AI-settings.patch
View File

@@ -120,10 +120,10 @@ index c1c5e884f00398032196ee71b55b348fcfce21ce..ed032918fb33d60c2d60d4db9275dddf
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 0ebed2363ee959a10eddb60d2cdfc4d2b81b49d9..bab472dc673404dc339e5952f68f6c9561de58af 100644
index f295aeec1428086bb3d2cf4720fdcc7c6ed2131a..1c3c75b5ee930565463d3f36dc974091cef61487 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -535,6 +535,10 @@ public class PurpurWorldConfig {
@@ -552,6 +552,10 @@ public class PurpurWorldConfig {
public double giantMovementSpeed = 0.5D;
public double giantAttackDamage = 50.0D;
public double giantMaxHealth = 100.0D;
@@ -134,7 +134,7 @@ index 0ebed2363ee959a10eddb60d2cdfc4d2b81b49d9..bab472dc673404dc339e5952f68f6c95
private void giantSettings() {
giantRidable = getBoolean("mobs.giant.ridable", giantRidable);
giantRidableInWater = getBoolean("mobs.giant.ridable-in-water", giantRidableInWater);
@@ -551,6 +555,10 @@ public class PurpurWorldConfig {
@@ -568,6 +572,10 @@ public class PurpurWorldConfig {
set("mobs.giant.attributes.max_health", oldValue);
}
giantMaxHealth = getDouble("mobs.giant.attributes.max_health", giantMaxHealth);

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

@@ -30,10 +30,10 @@ index af87c06e9a135ed22ea575d36d739951707b3c66..b860cb90870c2fb78d9d2d6d6ceed57e
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 bab472dc673404dc339e5952f68f6c9561de58af..f9ef2118787f5fdac7964bb6975a3d6fb5b7760f 100644
index 1c3c75b5ee930565463d3f36dc974091cef61487..7aad0f7029bdd1839e1e92028c4357d6ebbe2b1c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1454,6 +1454,7 @@ public class PurpurWorldConfig {
@@ -1471,6 +1471,7 @@ public class PurpurWorldConfig {
public double zombieHorseJumpStrengthMax = 1.0D;
public double zombieHorseMovementSpeedMin = 0.2D;
public double zombieHorseMovementSpeedMax = 0.2D;
@@ -41,7 +41,7 @@ index bab472dc673404dc339e5952f68f6c9561de58af..f9ef2118787f5fdac7964bb6975a3d6f
private void zombieHorseSettings() {
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
@@ -1469,6 +1470,7 @@ public class PurpurWorldConfig {
@@ -1486,6 +1487,7 @@ public class PurpurWorldConfig {
zombieHorseJumpStrengthMax = getDouble("mobs.zombie_horse.attributes.jump_strength.max", zombieHorseJumpStrengthMax);
zombieHorseMovementSpeedMin = getDouble("mobs.zombie_horse.attributes.movement_speed.min", zombieHorseMovementSpeedMin);
zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);

6
patches/server/0028-Charged-creeper-naturally-spawn.patch
View File

@@ -24,10 +24,10 @@ index 05d7dd5a9a302b6281e56f8dfe54168b524a89f2..2a733951b5b16c3e7da613744eb76414
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f9ef2118787f5fdac7964bb6975a3d6fb5b7760f..68209ce9715e0717486153bd71572d558dd48851 100644
index 7aad0f7029bdd1839e1e92028c4357d6ebbe2b1c..5d5b7af6b49893156652c8ccede5386419a5c5ad 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -326,6 +326,7 @@ public class PurpurWorldConfig {
@@ -343,6 +343,7 @@ public class PurpurWorldConfig {
public boolean creeperRidableInWater = false;
public boolean creeperControllable = true;
public double creeperMaxHealth = 20.0D;
@@ -35,7 +35,7 @@ index f9ef2118787f5fdac7964bb6975a3d6fb5b7760f..68209ce9715e0717486153bd71572d55
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -336,6 +337,7 @@ public class PurpurWorldConfig {
@@ -353,6 +354,7 @@ public class PurpurWorldConfig {
set("mobs.creeper.attributes.max_health", oldValue);
}
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);

6
patches/server/0029-Rabbit-naturally-spawn-toast-and-killer.patch
View File

@@ -33,10 +33,10 @@ index b3bfb94529dfaa912f0e5ce0965b0740f09cf55e..592d72857aea88425a6359818f96f227
int i = world.getRandom().nextInt(100);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 68209ce9715e0717486153bd71572d558dd48851..24f529b4ca5f4e83ac33e255d4f602de54732fb3 100644
index 5d5b7af6b49893156652c8ccede5386419a5c5ad..3f95cc3703f36842504b7425ce993c990917119c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -969,6 +969,8 @@ public class PurpurWorldConfig {
@@ -986,6 +986,8 @@ public class PurpurWorldConfig {
public boolean rabbitRidableInWater = false;
public boolean rabbitControllable = true;
public double rabbitMaxHealth = 3.0D;
@@ -45,7 +45,7 @@ index 68209ce9715e0717486153bd71572d558dd48851..24f529b4ca5f4e83ac33e255d4f602de
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -979,6 +981,8 @@ public class PurpurWorldConfig {
@@ -996,6 +998,8 @@ public class PurpurWorldConfig {
set("mobs.rabbit.attributes.max_health", oldValue);
}
rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth);

6
patches/server/0031-Tulips-change-fox-type.patch
View File

@@ -75,10 +75,10 @@ index 4f10430e55d634b4e4bf74582a8032cc42938c7f..503721cce0a5207a44b016a4234c17a8
// Paper start - Cancellable death event
protected org.bukkit.event.entity.EntityDeathEvent dropAllDeathLoot(DamageSource source) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 24f529b4ca5f4e83ac33e255d4f602de54732fb3..924016926fa8d6df1667a1b39bf0fa6328d871b1 100644
index 3f95cc3703f36842504b7425ce993c990917119c..c499a252f0eab6f03f8b2e33aa0092a2c03cd532 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -490,6 +490,7 @@ public class PurpurWorldConfig {
@@ -507,6 +507,7 @@ public class PurpurWorldConfig {
public boolean foxRidableInWater = false;
public boolean foxControllable = true;
public double foxMaxHealth = 10.0D;
@@ -86,7 +86,7 @@ index 24f529b4ca5f4e83ac33e255d4f602de54732fb3..924016926fa8d6df1667a1b39bf0fa63
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -500,6 +501,7 @@ public class PurpurWorldConfig {
@@ -517,6 +518,7 @@ public class PurpurWorldConfig {
set("mobs.fox.attributes.max_health", oldValue);
}
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);

6
patches/server/0032-Breedable-Polar-Bears.patch
View File

@@ -59,10 +59,10 @@ index bd1d90fa59d420577baada18d5afd04a85ad76a9..4e837590faebcb35426f8b9d023b2ae2
this.goalSelector.addGoal(5, new RandomStrollGoal(this, 1.0D));
this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 924016926fa8d6df1667a1b39bf0fa6328d871b1..d1323d3857e4455d2fbfbfdb004fde24a475132f 100644
index c499a252f0eab6f03f8b2e33aa0092a2c03cd532..62d6072136d3338cc16985891c37c6b36bca245f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -941,6 +941,8 @@ public class PurpurWorldConfig {
@@ -958,6 +958,8 @@ public class PurpurWorldConfig {
public boolean polarBearRidableInWater = false;
public boolean polarBearControllable = true;
public double polarBearMaxHealth = 30.0D;
@@ -71,7 +71,7 @@ index 924016926fa8d6df1667a1b39bf0fa6328d871b1..d1323d3857e4455d2fbfbfdb004fde24
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -951,6 +953,9 @@ public class PurpurWorldConfig {
@@ -968,6 +970,9 @@ public class PurpurWorldConfig {
set("mobs.polar_bear.attributes.max_health", oldValue);
}
polarBearMaxHealth = getDouble("mobs.polar_bear.attributes.max_health", polarBearMaxHealth);

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

@@ -51,10 +51,10 @@ index e4200b09f54861d61c9dae40e6883aa19265e295..471647830f3ae90f8867282edd6fb20f
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d1323d3857e4455d2fbfbfdb004fde24a475132f..31a4f178239f35e1f82a771b8677429289a2dcac 100644
index 62d6072136d3338cc16985891c37c6b36bca245f..dca1c34210c35eadb1e19c05d831d3af52ae9d67 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -280,6 +280,7 @@ public class PurpurWorldConfig {
@@ -297,6 +297,7 @@ public class PurpurWorldConfig {
public boolean chickenRidableInWater = false;
public boolean chickenControllable = true;
public double chickenMaxHealth = 4.0D;
@@ -62,7 +62,7 @@ index d1323d3857e4455d2fbfbfdb004fde24a475132f..31a4f178239f35e1f82a771b86774292
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -290,6 +291,7 @@ public class PurpurWorldConfig {
@@ -307,6 +308,7 @@ public class PurpurWorldConfig {
set("mobs.chicken.attributes.max_health", oldValue);
}
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);

6
patches/server/0035-Cat-spawning-options.patch
View File

@@ -51,10 +51,10 @@ index 5f407535298a31a34cfe114dd863fd6a9b977707..29c7e33fe961020e5a0007287fe9b663
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 0a6228781eaa7195f028427da134858e2f0ee094..d6b0e7b263bcdf3270ea41a85d92ba5f8f6a2db1 100644
index 71d3a65b92e6ffb22c876008877c5969a9cb69fb..0efaf2e7222f668f555d1738e7161bfc10eef639 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -253,6 +253,9 @@ public class PurpurWorldConfig {
@@ -270,6 +270,9 @@ public class PurpurWorldConfig {
public boolean catRidableInWater = false;
public boolean catControllable = true;
public double catMaxHealth = 10.0D;
@@ -64,7 +64,7 @@ index 0a6228781eaa7195f028427da134858e2f0ee094..d6b0e7b263bcdf3270ea41a85d92ba5f
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -263,6 +266,9 @@ public class PurpurWorldConfig {
@@ -280,6 +283,9 @@ public class PurpurWorldConfig {
set("mobs.cat.attributes.max_health", oldValue);
}
catMaxHealth = getDouble("mobs.cat.attributes.max_health", catMaxHealth);

6
patches/server/0036-Cows-eat-mushrooms.patch
View File

@@ -114,10 +114,10 @@ index 7eecdb4be5ee7de39ccb86b4bfe98491f8cba9b6..8744649fbd3f11485d5862d6f1fb32ea
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d6b0e7b263bcdf3270ea41a85d92ba5f8f6a2db1..2b959830cc4d7f0c8ee55a6ebdb7fb37712ec706 100644
index 0efaf2e7222f668f555d1738e7161bfc10eef639..186a9914701821e7c6f8de45b723c5ae2dc1b311 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -323,6 +323,7 @@ public class PurpurWorldConfig {
@@ -340,6 +340,7 @@ public class PurpurWorldConfig {
public boolean cowRidableInWater = false;
public boolean cowControllable = true;
public double cowMaxHealth = 10.0D;
@@ -125,7 +125,7 @@ index d6b0e7b263bcdf3270ea41a85d92ba5f8f6a2db1..2b959830cc4d7f0c8ee55a6ebdb7fb37
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -333,6 +334,7 @@ public class PurpurWorldConfig {
@@ -350,6 +351,7 @@ public class PurpurWorldConfig {
set("mobs.cow.attributes.max_health", oldValue);
}
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);

6
patches/server/0038-Pigs-give-saddle-back.patch
View File

@@ -27,10 +27,10 @@ index 372574f224d21b8801f40e6c4991d64975cd79db..27f616534ff5280528fd2c681d8335e4
if (!this.level.isClientSide) {
player.startRiding(this);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2b959830cc4d7f0c8ee55a6ebdb7fb37712ec706..cf09c49c4520e0fe37f580f6fdfcc46b21edd054 100644
index 186a9914701821e7c6f8de45b723c5ae2dc1b311..0d8d6e81b901b454ac7ca1bb9c37e40c83241d07 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -892,6 +892,7 @@ public class PurpurWorldConfig {
@@ -909,6 +909,7 @@ public class PurpurWorldConfig {
public boolean pigRidableInWater = false;
public boolean pigControllable = true;
public double pigMaxHealth = 10.0D;
@@ -38,7 +38,7 @@ index 2b959830cc4d7f0c8ee55a6ebdb7fb37712ec706..cf09c49c4520e0fe37f580f6fdfcc46b
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -902,6 +903,7 @@ public class PurpurWorldConfig {
@@ -919,6 +920,7 @@ public class PurpurWorldConfig {
set("mobs.pig.attributes.max_health", oldValue);
}
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);

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

@@ -32,10 +32,10 @@ index e2f0f1d7ed8004a03f14887750a470e08ee1f42d..b4459d68397cc5bac4f7ef79a2dfb18f
this.forceDrops = false; // CraftBukkit
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index cf09c49c4520e0fe37f580f6fdfcc46b21edd054..cf26071ce5a789019c743ff5ce742e2150bab9e0 100644
index 0d8d6e81b901b454ac7ca1bb9c37e40c83241d07..b64a1f935c36a7f25a60988717204b56e143b9ee 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1155,6 +1155,8 @@ public class PurpurWorldConfig {
@@ -1172,6 +1172,8 @@ public class PurpurWorldConfig {
public boolean snowGolemControllable = true;
public boolean snowGolemLeaveTrailWhenRidden = false;
public double snowGolemMaxHealth = 4.0D;
@@ -44,7 +44,7 @@ index cf09c49c4520e0fe37f580f6fdfcc46b21edd054..cf26071ce5a789019c743ff5ce742e21
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1166,6 +1168,8 @@ public class PurpurWorldConfig {
@@ -1183,6 +1185,8 @@ public class PurpurWorldConfig {
set("mobs.snow_golem.attributes.max_health", oldValue);
}
snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);

8
patches/server/0040-Ender-dragon-always-drop-full-exp.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Ender dragon always drop full exp
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
index 01ba677cb6ffc9f4eabf78cfc67f27051a248f0d..e8672137aa9ff8c7ae11b6e5c963a2dbe739cff8 100644
index b82a90d6b051fe7d93e4c9a5ac0000137768cae5..4b2aff2002e559c32a56f941fa9285f20080fe90 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
@@ -713,7 +713,7 @@ public class EnderDragon extends Mob implements Enemy {
@@ -18,10 +18,10 @@ index 01ba677cb6ffc9f4eabf78cfc67f27051a248f0d..e8672137aa9ff8c7ae11b6e5c963a2db
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index cf26071ce5a789019c743ff5ce742e2150bab9e0..55cd98d1e9aaf6d3248bb52620c5907221c14d65 100644
index b64a1f935c36a7f25a60988717204b56e143b9ee..2ad17fefbf2352ecbdf2a312565b21afd14f9f8e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -436,6 +436,7 @@ public class PurpurWorldConfig {
@@ -453,6 +453,7 @@ public class PurpurWorldConfig {
public boolean enderDragonControllable = true;
public double enderDragonMaxY = 320D;
public double enderDragonMaxHealth = 200.0D;
@@ -29,7 +29,7 @@ index cf26071ce5a789019c743ff5ce742e2150bab9e0..55cd98d1e9aaf6d3248bb52620c59072
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -451,6 +452,7 @@ public class PurpurWorldConfig {
@@ -468,6 +469,7 @@ public class PurpurWorldConfig {
set("mobs.ender_dragon.attributes.max_health", oldValue);
}
enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);

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

@@ -38,10 +38,10 @@ index dcbf6dac3fca471760e2b460e74d90f6d80bcae9..112c1d084bf0e30a1a3f2d37341f7373
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d901174c44e58757ab8c12bf47c329c1455706d7..011f4118fd893de561b9917fe43334ddffe84356 100644
index 6cafbe5aeb555aac4366b43e184904751ab4931b..30d334e35e79354594c2227e80896ce4d044bce4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -423,6 +423,7 @@ public class PurpurWorldConfig {
@@ -440,6 +440,7 @@ public class PurpurWorldConfig {
public boolean creeperControllable = true;
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
@@ -49,7 +49,7 @@ index d901174c44e58757ab8c12bf47c329c1455706d7..011f4118fd893de561b9917fe43334dd
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -434,6 +435,7 @@ public class PurpurWorldConfig {
@@ -451,6 +452,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 d901174c44e58757ab8c12bf47c329c1455706d7..011f4118fd893de561b9917fe43334dd
}
public boolean dolphinRidable = false;
@@ -540,6 +542,7 @@ public class PurpurWorldConfig {
@@ -557,6 +559,7 @@ public class PurpurWorldConfig {
public boolean endermanRidableInWater = false;
public boolean endermanControllable = true;
public double endermanMaxHealth = 40.0D;
@@ -65,7 +65,7 @@ index d901174c44e58757ab8c12bf47c329c1455706d7..011f4118fd893de561b9917fe43334dd
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -550,6 +553,7 @@ public class PurpurWorldConfig {
@@ -567,6 +570,7 @@ public class PurpurWorldConfig {
set("mobs.enderman.attributes.max_health", oldValue);
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);

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

@@ -54,10 +54,10 @@ index 7502940882edea11842b09de57094af37a7d62f9..7df47fb018bacbe1d7afdf5954652d16
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/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 011f4118fd893de561b9917fe43334ddffe84356..974bee223cd92626a9ce7a8eb2c932c1497642f1 100644
index 30d334e35e79354594c2227e80896ce4d044bce4..15d3307e6ec15b4f0adbd7d45adbb60ca9b153ba 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1410,6 +1410,7 @@ public class PurpurWorldConfig {
@@ -1427,6 +1427,7 @@ public class PurpurWorldConfig {
public boolean villagerRidableInWater = false;
public boolean villagerControllable = true;
public double villagerMaxHealth = 20.0D;
@@ -65,7 +65,7 @@ index 011f4118fd893de561b9917fe43334ddffe84356..974bee223cd92626a9ce7a8eb2c932c1
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1420,6 +1421,7 @@ public class PurpurWorldConfig {
@@ -1437,6 +1438,7 @@ public class PurpurWorldConfig {
set("mobs.villager.attributes.max_health", oldValue);
}
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
@@ -73,7 +73,7 @@ index 011f4118fd893de561b9917fe43334ddffe84356..974bee223cd92626a9ce7a8eb2c932c1
}
public boolean vindicatorRidable = false;
@@ -1442,6 +1444,7 @@ public class PurpurWorldConfig {
@@ -1459,6 +1461,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderRidableInWater = false;
public boolean wanderingTraderControllable = true;
public double wanderingTraderMaxHealth = 20.0D;
@@ -81,7 +81,7 @@ index 011f4118fd893de561b9917fe43334ddffe84356..974bee223cd92626a9ce7a8eb2c932c1
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1452,6 +1455,7 @@ public class PurpurWorldConfig {
@@ -1469,6 +1472,7 @@ public class PurpurWorldConfig {
set("mobs.wandering_trader.attributes.max_health", oldValue);
}
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);

10
patches/server/0053-Allow-leashing-villagers.patch
View File

@@ -49,10 +49,10 @@ index 7df47fb018bacbe1d7afdf5954652d16e8548bef..2c01e6155124e0c11899b643197badeb
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 974bee223cd92626a9ce7a8eb2c932c1497642f1..1c1a1a70126d4b0581888d685e7c1766c983d9d9 100644
index 15d3307e6ec15b4f0adbd7d45adbb60ca9b153ba..04c8e92e0037f95d2d390d3108cb4bbeb71d66c7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1411,6 +1411,7 @@ public class PurpurWorldConfig {
@@ -1428,6 +1428,7 @@ public class PurpurWorldConfig {
public boolean villagerControllable = true;
public double villagerMaxHealth = 20.0D;
public boolean villagerFollowEmeraldBlock = false;
@@ -60,7 +60,7 @@ index 974bee223cd92626a9ce7a8eb2c932c1497642f1..1c1a1a70126d4b0581888d685e7c1766
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1422,6 +1423,7 @@ public class PurpurWorldConfig {
@@ -1439,6 +1440,7 @@ public class PurpurWorldConfig {
}
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
@@ -68,7 +68,7 @@ index 974bee223cd92626a9ce7a8eb2c932c1497642f1..1c1a1a70126d4b0581888d685e7c1766
}
public boolean vindicatorRidable = false;
@@ -1445,6 +1447,7 @@ public class PurpurWorldConfig {
@@ -1462,6 +1464,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderControllable = true;
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
@@ -76,7 +76,7 @@ index 974bee223cd92626a9ce7a8eb2c932c1497642f1..1c1a1a70126d4b0581888d685e7c1766
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1456,6 +1459,7 @@ public class PurpurWorldConfig {
@@ -1473,6 +1476,7 @@ public class PurpurWorldConfig {
}
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);

22
patches/server/0068-Configurable-jockey-options.patch
View File

@@ -167,10 +167,10 @@ index aca84be04c50188612f69ee20e9a0948fe5e5b7f..9bec6222a8145f84f4b748e8c96e02fa
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a9a8923ce63391bfaa58dd241ea8addfb195b6a7..00cce1123abca1533b9b62de118249886abb7951 100644
index a6ed10bcfe24831bc0257511a68c38b3b500f608..1a2537d47416391a0f84621250db18f589d35205 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -578,6 +578,9 @@ public class PurpurWorldConfig {
@@ -595,6 +595,9 @@ public class PurpurWorldConfig {
public boolean drownedControllable = true;
public double drownedMaxHealth = 20.0D;
public double drownedSpawnReinforcements = 0.1D;
@@ -180,7 +180,7 @@ index a9a8923ce63391bfaa58dd241ea8addfb195b6a7..00cce1123abca1533b9b62de11824988
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -589,6 +592,9 @@ public class PurpurWorldConfig {
@@ -606,6 +609,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 a9a8923ce63391bfaa58dd241ea8addfb195b6a7..00cce1123abca1533b9b62de11824988
}
public boolean elderGuardianRidable = false;
@@ -837,6 +843,9 @@ public class PurpurWorldConfig {
@@ -854,6 +860,9 @@ public class PurpurWorldConfig {
public boolean huskControllable = true;
public double huskMaxHealth = 20.0D;
public double huskSpawnReinforcements = 0.1D;
@@ -200,7 +200,7 @@ index a9a8923ce63391bfaa58dd241ea8addfb195b6a7..00cce1123abca1533b9b62de11824988
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -848,6 +857,9 @@ public class PurpurWorldConfig {
@@ -865,6 +874,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 a9a8923ce63391bfaa58dd241ea8addfb195b6a7..00cce1123abca1533b9b62de11824988
}
public boolean illusionerRidable = false;
@@ -1653,6 +1665,9 @@ public class PurpurWorldConfig {
@@ -1670,6 +1682,9 @@ public class PurpurWorldConfig {
public boolean zombieControllable = true;
public double zombieMaxHealth = 20.0D;
public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index a9a8923ce63391bfaa58dd241ea8addfb195b6a7..00cce1123abca1533b9b62de11824988
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1664,6 +1679,9 @@ public class PurpurWorldConfig {
@@ -1681,6 +1696,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 a9a8923ce63391bfaa58dd241ea8addfb195b6a7..00cce1123abca1533b9b62de11824988
}
public boolean zombieHorseRidableInWater = false;
@@ -1698,6 +1716,9 @@ public class PurpurWorldConfig {
@@ -1715,6 +1733,9 @@ public class PurpurWorldConfig {
public boolean zombieVillagerControllable = true;
public double zombieVillagerMaxHealth = 20.0D;
public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index a9a8923ce63391bfaa58dd241ea8addfb195b6a7..00cce1123abca1533b9b62de11824988
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -1709,6 +1730,9 @@ public class PurpurWorldConfig {
@@ -1726,6 +1747,9 @@ public class PurpurWorldConfig {
}
zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
@@ -250,7 +250,7 @@ index a9a8923ce63391bfaa58dd241ea8addfb195b6a7..00cce1123abca1533b9b62de11824988
}
public boolean zombifiedPiglinRidable = false;
@@ -1716,6 +1740,9 @@ public class PurpurWorldConfig {
@@ -1733,6 +1757,9 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinControllable = true;
public double zombifiedPiglinMaxHealth = 20.0D;
public double zombifiedPiglinSpawnReinforcements = 0.0D;
@@ -260,7 +260,7 @@ index a9a8923ce63391bfaa58dd241ea8addfb195b6a7..00cce1123abca1533b9b62de11824988
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1727,5 +1754,8 @@ public class PurpurWorldConfig {
@@ -1744,5 +1771,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/0069-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -258,10 +258,10 @@ index 2294458c7e81147a3efd2ef854fbc08f44231050..b9d737a20b8cca81fca290c13cb640c1
private float speed = 0.1F;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 00cce1123abca1533b9b62de118249886abb7951..7cb5b887d2b22fc41674f1df7a95ac4e1713ff60 100644
index 1a2537d47416391a0f84621250db18f589d35205..bc94981da6e382bae1f1ae8136f7bb7805f98e35 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1055,6 +1055,9 @@ public class PurpurWorldConfig {
@@ -1072,6 +1072,9 @@ public class PurpurWorldConfig {
public String phantomAttackDamage = "6 + size";
public Map<Integer, Double> phantomMaxHealthCache = new HashMap<>();
public Map<Integer, Double> phantomAttackDamageCache = new HashMap<>();
@@ -271,7 +271,7 @@ index 00cce1123abca1533b9b62de118249886abb7951..7cb5b887d2b22fc41674f1df7a95ac4e
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1076,6 +1079,9 @@ public class PurpurWorldConfig {
@@ -1093,6 +1096,9 @@ public class PurpurWorldConfig {
phantomAttackDamage = getString("mobs.phantom.attributes.attack_damage", phantomAttackDamage);
phantomMaxHealthCache.clear();
phantomAttackDamageCache.clear();

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

@@ -40,10 +40,10 @@ index 1c3718d9244513d9fc795dceb564a81375734557..69753f0b67a78c565ff455676860dc05
for (int l = 0; l < k; ++l) {
// Paper start
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7cb5b887d2b22fc41674f1df7a95ac4e1713ff60..4421f48e9dd433cdcff5b7c5ac249bae49a67bd8 100644
index bc94981da6e382bae1f1ae8136f7bb7805f98e35..de8603b6ba12297bb3d0979d0e02f0baf2f0ec35 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1058,6 +1058,12 @@ public class PurpurWorldConfig {
@@ -1075,6 +1075,12 @@ public class PurpurWorldConfig {
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
public double phantomOrbitCrystalRadius = 0.0D;
@@ -56,7 +56,7 @@ index 7cb5b887d2b22fc41674f1df7a95ac4e1713ff60..4421f48e9dd433cdcff5b7c5ac249bae
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1082,6 +1088,12 @@ public class PurpurWorldConfig {
@@ -1099,6 +1105,12 @@ 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);

8
patches/server/0077-Squid-EAR-immunity.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Squid EAR immunity
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 395634815198b7c754ee070783b20ca340ad8f09..dd5ff44bd1fbf6b55fa35ad5c889e2398bef60f0 100644
index 67317dcff36b9857d5d22e12cfa6114e8c5fb183..7b776cc842c57cc27838ad2208d11d84ef0cae68 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1432,6 +1432,7 @@ public class PurpurWorldConfig {
@@ -1449,6 +1449,7 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public boolean squidControllable = true;
public double squidMaxHealth = 10.0D;
@@ -16,7 +16,7 @@ index 395634815198b7c754ee070783b20ca340ad8f09..dd5ff44bd1fbf6b55fa35ad5c889e239
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -1441,6 +1442,7 @@ public class PurpurWorldConfig {
@@ -1458,6 +1459,7 @@ public class PurpurWorldConfig {
set("mobs.squid.attributes.max_health", oldValue);
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
@@ -25,7 +25,7 @@ index 395634815198b7c754ee070783b20ca340ad8f09..dd5ff44bd1fbf6b55fa35ad5c889e239
public boolean spiderRidable = false;
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 7529bca82efe4c33dbf781bcf6f8b583fa54fa95..383a13a26ee9445fa6201770bb9bef274d72283a 100644
index f1abcd9c63d7bb9797f05e3764262e0080c60da2..00744aceb25ddc689b8c5ed90ae27e1ea28057ad 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -15,6 +15,7 @@ import net.minecraft.world.entity.ambient.AmbientCreature;

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

@@ -53,10 +53,10 @@ index b9d737a20b8cca81fca290c13cb640c17d25bc6e..11cbb89eb062de0cd30158dbfbef1355
list.sort(Comparator.comparing((Entity e) -> { return e.getY(); }).reversed()); // CraftBukkit - decompile error
Iterator iterator = list.iterator();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index dd5ff44bd1fbf6b55fa35ad5c889e2398bef60f0..48f8ffce68f75142e29d9f71e3f245eb9c31f912 100644
index 7b776cc842c57cc27838ad2208d11d84ef0cae68..172978f5db69cd7e85aa413ed261ad996e67ee8e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1113,6 +1113,9 @@ public class PurpurWorldConfig {
@@ -1130,6 +1130,9 @@ public class PurpurWorldConfig {
public double phantomSpawnLocalDifficultyChance = 3.0D;
public int phantomSpawnMinPerAttempt = 1;
public int phantomSpawnMaxPerAttempt = -1;
@@ -66,7 +66,7 @@ index dd5ff44bd1fbf6b55fa35ad5c889e2398bef60f0..48f8ffce68f75142e29d9f71e3f245eb
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1143,6 +1146,9 @@ public class PurpurWorldConfig {
@@ -1160,6 +1163,9 @@ public class PurpurWorldConfig {
phantomSpawnLocalDifficultyChance = getDouble("mobs.phantom.spawn.local-difficulty-chance", phantomSpawnLocalDifficultyChance);
phantomSpawnMinPerAttempt = getInt("mobs.phantom.spawn.per-attempt.min", phantomSpawnMinPerAttempt);
phantomSpawnMaxPerAttempt = getInt("mobs.phantom.spawn.per-attempt.max", phantomSpawnMaxPerAttempt);

6
patches/server/0079-Configurable-villager-breeding.patch
View File

@@ -18,10 +18,10 @@ index fcb2d59d3ccb4a0601f82330878a784ece71f866..f225eb2f1d5a7c49fb2d640338823066
private boolean hungry() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 48f8ffce68f75142e29d9f71e3f245eb9c31f912..6e97e7ac18695e8b0f1c9d333ba4b5afa3eee460 100644
index 172978f5db69cd7e85aa413ed261ad996e67ee8e..10632aa9e97c712b11970b698432ed1a49292d86 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1590,6 +1590,7 @@ public class PurpurWorldConfig {
@@ -1607,6 +1607,7 @@ public class PurpurWorldConfig {
public double villagerMaxHealth = 20.0D;
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
@@ -29,7 +29,7 @@ index 48f8ffce68f75142e29d9f71e3f245eb9c31f912..6e97e7ac18695e8b0f1c9d333ba4b5af
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1602,6 +1603,7 @@ public class PurpurWorldConfig {
@@ -1619,6 +1620,7 @@ public class PurpurWorldConfig {
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);

6
patches/server/0082-Add-vindicator-johnny-spawn-chance.patch
View File

@@ -22,10 +22,10 @@ index c3b8bce2d8e1dccb619267923964e06abfed8762..021550a0465dd1fd152b4c2e76301405
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b9dedd9a4318d82fbdc7393182ac07fae34779b1..141796ae466dcd2aa57f8662785bdb5140a3fe60 100644
index 9accec507a9db1974727d87e46d1c6efa51df278..ab7857989e985f3ffff43a7fd303a3c39137d7da 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1617,6 +1617,7 @@ public class PurpurWorldConfig {
@@ -1634,6 +1634,7 @@ public class PurpurWorldConfig {
public boolean vindicatorRidableInWater = false;
public boolean vindicatorControllable = true;
public double vindicatorMaxHealth = 24.0D;
@@ -33,7 +33,7 @@ index b9dedd9a4318d82fbdc7393182ac07fae34779b1..141796ae466dcd2aa57f8662785bdb51
private void vindicatorSettings() {
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
@@ -1627,6 +1628,7 @@ public class PurpurWorldConfig {
@@ -1644,6 +1645,7 @@ public class PurpurWorldConfig {
set("mobs.vindicator.attributes.max_health", oldValue);
}
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);

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

@@ -17,10 +17,10 @@ index 1ca3ffe212da2c3914c290172e729ba8017f631c..a8ca2d120a545d423fc00aef5299b66b
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ca70fd0cee8c0d8b4c398a8dc12c4f3bbadab665..0ae4a84f953c5f68d50124e6446df88f276ad2f6 100644
index 2457818f6716c2434f1b178f3c2c396cf03c7bbc..3f63fbafd6a8423a00dc7acaf224cecafde4a2bb 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -600,6 +600,7 @@ public class PurpurWorldConfig {
@@ -617,6 +617,7 @@ public class PurpurWorldConfig {
public float dolphinSpitSpeed = 1.0F;
public float dolphinSpitDamage = 2.0F;
public double dolphinMaxHealth = 10.0D;
@@ -28,7 +28,7 @@ index ca70fd0cee8c0d8b4c398a8dc12c4f3bbadab665..0ae4a84f953c5f68d50124e6446df88f
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinControllable = getBoolean("mobs.dolphin.controllable", dolphinControllable);
@@ -612,6 +613,7 @@ public class PurpurWorldConfig {
@@ -629,6 +630,7 @@ public class PurpurWorldConfig {
set("mobs.dolphin.attributes.max_health", oldValue);
}
dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);

8
patches/server/0088-Stop-squids-floating-on-top-of-water.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 7639f3872e3c98548973cb08edad17b1af1add1f..dbb02d7e0b0528c834a14489236670125a67db45 100644
index b3befc3ba8ffdd4aea1df37db6d1698887ef55d9..66cc082e197c6369c3cb92ab95d61f4b6703c504 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4153,6 +4153,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -54,10 +54,10 @@ index 68cc6f2a78a06293a29317fda72ab3ee79b3533a..cfb2e46b34b2982d6724f18214557fc8
+ // Purpur
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 0ae4a84f953c5f68d50124e6446df88f276ad2f6..5a6da03ce41cc78a36dc0c4fb0f89bbbacb0a6da 100644
index 3f63fbafd6a8423a00dc7acaf224cecafde4a2bb..a070c21f49d59702df56409fa5c05f8eb05a0e22 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1457,6 +1457,7 @@ public class PurpurWorldConfig {
@@ -1474,6 +1474,7 @@ public class PurpurWorldConfig {
public boolean squidControllable = true;
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
@@ -65,7 +65,7 @@ index 0ae4a84f953c5f68d50124e6446df88f276ad2f6..5a6da03ce41cc78a36dc0c4fb0f89bbb
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -1467,6 +1468,7 @@ public class PurpurWorldConfig {
@@ -1484,6 +1485,7 @@ public class PurpurWorldConfig {
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);

6
patches/server/0092-Customizable-wither-health-and-healing.patch
View File

@@ -23,10 +23,10 @@ index 8e2711325ee32dda903f191ec4f338173370e738..991525cb5f0265678d61759ff55c1479
this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth());
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3bd18d72f996d93e0c5c31a7fb143a29401fca75..d6a4e3dead9ffc7cc779cb1b8413c61308850a01 100644
index 2aa0422aa65554eb47523a3fe26364370ceb3a65..b41d130f383d18bee7da6842bc82db276510f995 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1696,6 +1696,8 @@ public class PurpurWorldConfig {
@@ -1713,6 +1713,8 @@ public class PurpurWorldConfig {
public boolean witherControllable = true;
public double witherMaxY = 320D;
public double witherMaxHealth = 300.0D;
@@ -35,7 +35,7 @@ index 3bd18d72f996d93e0c5c31a7fb143a29401fca75..d6a4e3dead9ffc7cc779cb1b8413c613
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1711,6 +1713,8 @@ public class PurpurWorldConfig {
@@ -1728,6 +1730,8 @@ public class PurpurWorldConfig {
set("mobs.wither.attributes.max_health", oldValue);
}
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);

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

@@ -71,10 +71,10 @@ index 05cb9eff1ce0d5af9efcd47033878feb22397a2d..35e1e8264d9f1e30b37ad598adab478b
this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 34b1fa9b540bc42e13bf4a1949c266fc8a973398..d16469a057c6782bdd13d92ca114e89f93744238 100644
index 9747f16d953912a4a17afa8cdaff6a7ca4d200b0..50ea7f241d1eedb74104073fbcec7376d7afbb56 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1829,6 +1829,7 @@ public class PurpurWorldConfig {
@@ -1846,6 +1846,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyOnlyBaby = true;
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
@@ -82,7 +82,7 @@ index 34b1fa9b540bc42e13bf4a1949c266fc8a973398..d16469a057c6782bdd13d92ca114e89f
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1843,6 +1844,7 @@ public class PurpurWorldConfig {
@@ -1860,6 +1861,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);

8
patches/server/0098-Flying-squids-Oh-my.patch
View File

@@ -58,10 +58,10 @@ index 709aaa9dc834d91219ce1087d8f89ef5bf3d915c..4850960c7c4f38c7d81b8945f8c87504
float f1 = Mth.cos(f) * 0.2F;
float f2 = -0.1F + this.squid.getRandom().nextFloat() * 0.2F;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d16469a057c6782bdd13d92ca114e89f93744238..0d0bfec73d3b4419220d7f82ff6d4d6c3778a381 100644
index 50ea7f241d1eedb74104073fbcec7376d7afbb56..e752e9364c5f42e67e961854cef0a55c86eb4984 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -892,10 +892,12 @@ public class PurpurWorldConfig {
@@ -909,10 +909,12 @@ public class PurpurWorldConfig {
public boolean glowSquidRidable = false;
public boolean glowSquidControllable = true;
public double glowSquidMaxHealth = 10.0D;
@@ -74,7 +74,7 @@ index d16469a057c6782bdd13d92ca114e89f93744238..0d0bfec73d3b4419220d7f82ff6d4d6c
}
public boolean goatRidable = false;
@@ -1516,6 +1518,7 @@ public class PurpurWorldConfig {
@@ -1533,6 +1535,7 @@ public class PurpurWorldConfig {
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
public double squidOffsetWaterCheck = 0.0D;
@@ -82,7 +82,7 @@ index d16469a057c6782bdd13d92ca114e89f93744238..0d0bfec73d3b4419220d7f82ff6d4d6c
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -1527,6 +1530,7 @@ public class PurpurWorldConfig {
@@ -1544,6 +1547,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);

100
patches/server/0106-Make-entity-breeding-times-configurable.patch
View File

@@ -316,7 +316,7 @@ index 72f84f5a951c96c360206b43154a95247b1f8b42..b9301265557d1d6a1afb96f3e589e2f2
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
index d9104d996c854cce1ff167706c93747cd69c3969..e81b65476a6885b949b96f1d85df652c8cf56d5c 100644
index d04bc82bb5dbb24ec26d8e7a89061ed62fd199f5..0ddae1d558316ca7129e51d59d4189fc8dd03c1a 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
@@ -80,6 +80,13 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider
@@ -493,7 +493,7 @@ index ddd4c66193cf6553bdb8f5206e17731a529d0f9e..162fc0f879b882c934000ebb71e6eef6
public static boolean checkStriderSpawnRules(EntityType<Strider> type, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource random) {
diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
index e99ffbf30652e188e88f8e17ed41d39ff25c9f73..c335a32832c6eef95658fbf632b943bb10ac44b0 100644
index 8e2c052dac99d4b7b4b926a2c22281087abaf754..3d8b1b66e8d033e1e65a61a640ffdc29fe863cd5 100644
--- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
@@ -87,6 +87,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@@ -509,7 +509,7 @@ index e99ffbf30652e188e88f8e17ed41d39ff25c9f73..c335a32832c6eef95658fbf632b943bb
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705ccbb123622 100644
index a53eb2654a677c68497e35f7d87dd0408ac1b523..c0afa86b018f2af481c7e0494d1274abceb0f783 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -515,10 +515,12 @@ public class PurpurWorldConfig {
@@ -541,19 +541,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean blazeRidable = false;
@@ -582,6 +586,11 @@ public class PurpurWorldConfig {
blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
}
+ public int camelBreedingTicks = 6000;
+ private void camelSettings() {
+ camelBreedingTicks = getInt("mobs.camel.breeding-delay-ticks", camelBreedingTicks);
+ }
+
public boolean catRidable = false;
public boolean catRidableInWater = false;
public boolean catControllable = true;
@@ -589,6 +598,7 @@ public class PurpurWorldConfig {
@@ -606,6 +610,7 @@ public class PurpurWorldConfig {
public int catSpawnDelay = 1200;
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
@@ -561,7 +549,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -602,6 +612,7 @@ public class PurpurWorldConfig {
@@ -619,6 +624,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);
@@ -569,7 +557,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean caveSpiderRidable = false;
@@ -625,6 +636,7 @@ public class PurpurWorldConfig {
@@ -642,6 +648,7 @@ public class PurpurWorldConfig {
public boolean chickenControllable = true;
public double chickenMaxHealth = 4.0D;
public boolean chickenRetaliate = false;
@@ -577,7 +565,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -636,6 +648,7 @@ public class PurpurWorldConfig {
@@ -653,6 +660,7 @@ public class PurpurWorldConfig {
}
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
@@ -585,7 +573,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean codRidable = false;
@@ -657,6 +670,7 @@ public class PurpurWorldConfig {
@@ -674,6 +682,7 @@ public class PurpurWorldConfig {
public boolean cowControllable = true;
public double cowMaxHealth = 10.0D;
public int cowFeedMushrooms = 0;
@@ -593,7 +581,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -668,6 +682,7 @@ public class PurpurWorldConfig {
@@ -685,6 +694,7 @@ public class PurpurWorldConfig {
}
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
@@ -601,7 +589,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean creeperRidable = false;
@@ -719,6 +734,7 @@ public class PurpurWorldConfig {
@@ -736,6 +746,7 @@ public class PurpurWorldConfig {
public double donkeyJumpStrengthMax = 0.5D;
public double donkeyMovementSpeedMin = 0.175D;
public double donkeyMovementSpeedMax = 0.175D;
@@ -609,7 +597,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
if (PurpurConfig.version < 10) {
@@ -734,6 +750,7 @@ public class PurpurWorldConfig {
@@ -751,6 +762,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);
@@ -617,7 +605,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean drownedRidable = false;
@@ -853,6 +870,7 @@ public class PurpurWorldConfig {
@@ -870,6 +882,7 @@ public class PurpurWorldConfig {
public boolean foxControllable = true;
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
@@ -625,7 +613,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -864,17 +882,20 @@ public class PurpurWorldConfig {
@@ -881,17 +894,20 @@ public class PurpurWorldConfig {
}
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
@@ -646,7 +634,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean ghastRidable = false;
@@ -942,11 +963,13 @@ public class PurpurWorldConfig {
@@ -959,11 +975,13 @@ public class PurpurWorldConfig {
public boolean goatRidableInWater = false;
public boolean goatControllable = true;
public double goatMaxHealth = 10.0D;
@@ -660,7 +648,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean guardianRidable = false;
@@ -967,6 +990,7 @@ public class PurpurWorldConfig {
@@ -984,6 +1002,7 @@ public class PurpurWorldConfig {
public boolean hoglinRidableInWater = false;
public boolean hoglinControllable = true;
public double hoglinMaxHealth = 40.0D;
@@ -668,7 +656,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void hoglinSettings() {
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
@@ -977,6 +1001,7 @@ public class PurpurWorldConfig {
@@ -994,6 +1013,7 @@ public class PurpurWorldConfig {
set("mobs.hoglin.attributes.max_health", oldValue);
}
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
@@ -676,7 +664,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean horseRidableInWater = false;
@@ -986,6 +1011,7 @@ public class PurpurWorldConfig {
@@ -1003,6 +1023,7 @@ public class PurpurWorldConfig {
public double horseJumpStrengthMax = 1.0D;
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
@@ -684,7 +672,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1001,6 +1027,7 @@ public class PurpurWorldConfig {
@@ -1018,6 +1039,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);
@@ -692,7 +680,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean huskRidable = false;
@@ -1078,6 +1105,7 @@ public class PurpurWorldConfig {
@@ -1095,6 +1117,7 @@ public class PurpurWorldConfig {
public double llamaJumpStrengthMax = 0.5D;
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
@@ -700,7 +688,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1095,6 +1123,7 @@ public class PurpurWorldConfig {
@@ -1112,6 +1135,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);
@@ -708,7 +696,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean magmaCubeRidable = false;
@@ -1123,6 +1152,7 @@ public class PurpurWorldConfig {
@@ -1140,6 +1164,7 @@ public class PurpurWorldConfig {
public boolean mooshroomRidableInWater = false;
public boolean mooshroomControllable = true;
public double mooshroomMaxHealth = 10.0D;
@@ -716,7 +704,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1133,6 +1163,7 @@ public class PurpurWorldConfig {
@@ -1150,6 +1175,7 @@ public class PurpurWorldConfig {
set("mobs.mooshroom.attributes.max_health", oldValue);
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -724,7 +712,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean muleRidableInWater = false;
@@ -1142,6 +1173,7 @@ public class PurpurWorldConfig {
@@ -1159,6 +1185,7 @@ public class PurpurWorldConfig {
public double muleJumpStrengthMax = 0.5D;
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
@@ -732,7 +720,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1157,12 +1189,14 @@ public class PurpurWorldConfig {
@@ -1174,12 +1201,14 @@ 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);
@@ -747,7 +735,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1173,12 +1207,14 @@ public class PurpurWorldConfig {
@@ -1190,12 +1219,14 @@ public class PurpurWorldConfig {
set("mobs.ocelot.attributes.max_health", oldValue);
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -762,7 +750,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1189,6 +1225,7 @@ public class PurpurWorldConfig {
@@ -1206,6 +1237,7 @@ public class PurpurWorldConfig {
set("mobs.panda.attributes.max_health", oldValue);
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -770,7 +758,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean parrotRidable = false;
@@ -1272,6 +1309,7 @@ public class PurpurWorldConfig {
@@ -1289,6 +1321,7 @@ public class PurpurWorldConfig {
public boolean pigControllable = true;
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
@@ -778,7 +766,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1283,6 +1321,7 @@ public class PurpurWorldConfig {
@@ -1300,6 +1333,7 @@ public class PurpurWorldConfig {
}
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
@@ -786,7 +774,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean piglinRidable = false;
@@ -1339,6 +1378,7 @@ public class PurpurWorldConfig {
@@ -1356,6 +1390,7 @@ public class PurpurWorldConfig {
public double polarBearMaxHealth = 30.0D;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -794,7 +782,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1352,6 +1392,7 @@ public class PurpurWorldConfig {
@@ -1369,6 +1404,7 @@ public class PurpurWorldConfig {
polarBearBreedableItemString = getString("mobs.polar_bear.breedable-item", polarBearBreedableItemString);
Item item = BuiltInRegistries.ITEM.get(new ResourceLocation(polarBearBreedableItemString));
if (item != Items.AIR) polarBearBreedableItem = item;
@@ -802,7 +790,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean pufferfishRidable = false;
@@ -1374,6 +1415,7 @@ public class PurpurWorldConfig {
@@ -1391,6 +1427,7 @@ public class PurpurWorldConfig {
public double rabbitMaxHealth = 3.0D;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -810,7 +798,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1386,6 +1428,7 @@ public class PurpurWorldConfig {
@@ -1403,6 +1440,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);
@@ -818,7 +806,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean ravagerRidable = false;
@@ -1422,6 +1465,7 @@ public class PurpurWorldConfig {
@@ -1439,6 +1477,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = false;
public boolean sheepControllable = true;
public double sheepMaxHealth = 8.0D;
@@ -826,7 +814,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1432,6 +1476,7 @@ public class PurpurWorldConfig {
@@ -1449,6 +1488,7 @@ public class PurpurWorldConfig {
set("mobs.sheep.attributes.max_health", oldValue);
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -834,7 +822,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean shulkerRidable = false;
@@ -1607,6 +1652,7 @@ public class PurpurWorldConfig {
@@ -1624,6 +1664,7 @@ public class PurpurWorldConfig {
public boolean striderRidableInWater = false;
public boolean striderControllable = true;
public double striderMaxHealth = 20.0D;
@@ -842,7 +830,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1617,6 +1663,7 @@ public class PurpurWorldConfig {
@@ -1634,6 +1675,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -850,7 +838,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean tadpoleRidable = false;
@@ -1637,6 +1684,7 @@ public class PurpurWorldConfig {
@@ -1654,6 +1696,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -858,7 +846,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1654,6 +1702,7 @@ public class PurpurWorldConfig {
@@ -1671,6 +1714,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);
@@ -866,7 +854,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean tropicalFishRidable = false;
@@ -1674,6 +1723,7 @@ public class PurpurWorldConfig {
@@ -1691,6 +1735,7 @@ public class PurpurWorldConfig {
public boolean turtleRidableInWater = false;
public boolean turtleControllable = true;
public double turtleMaxHealth = 30.0D;
@@ -874,7 +862,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void turtleSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1684,6 +1734,7 @@ public class PurpurWorldConfig {
@@ -1701,6 +1746,7 @@ public class PurpurWorldConfig {
set("mobs.turtle.attributes.max_health", oldValue);
}
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
@@ -882,7 +870,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean vexRidable = false;
@@ -1711,6 +1762,7 @@ public class PurpurWorldConfig {
@@ -1728,6 +1774,7 @@ public class PurpurWorldConfig {
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
public boolean villagerCanBreed = true;
@@ -890,7 +878,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1724,6 +1776,7 @@ public class PurpurWorldConfig {
@@ -1741,6 +1788,7 @@ public class PurpurWorldConfig {
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
@@ -898,7 +886,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
}
public boolean vindicatorRidable = false;
@@ -1835,6 +1888,7 @@ public class PurpurWorldConfig {
@@ -1852,6 +1900,7 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = false;
public boolean wolfControllable = true;
public double wolfMaxHealth = 8.0D;
@@ -906,7 +894,7 @@ index 213ee1230206fe9afcf89b1be5af738cd64afbb1..7ebe655892cd22e06e41eea0cdb705cc
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1845,6 +1899,7 @@ public class PurpurWorldConfig {
@@ -1862,6 +1911,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

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

@@ -21,10 +21,10 @@ index 1dd86f7dfabb38fd8d1199055d7e28b7d8f39bb4..1e8b7eab01a73524bef61a2a3666f6c6
private static class EndermanFreezeWhenLookedAt extends Goal {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d3c9285d5f7aa51367e5052ab8b00a9bd269dddd..6c1f8b9aa052f78a59bb3dcbe0c3f480b73e9f34 100644
index 51e74a5fb0a78aa67416b8912ec7c4bd284ee13a..79709e58064039d7b861a4f3133fe0953cab9bb4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -826,6 +826,7 @@ public class PurpurWorldConfig {
@@ -838,6 +838,7 @@ public class PurpurWorldConfig {
public boolean endermanControllable = true;
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
@@ -32,7 +32,7 @@ index d3c9285d5f7aa51367e5052ab8b00a9bd269dddd..6c1f8b9aa052f78a59bb3dcbe0c3f480
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -837,6 +838,7 @@ public class PurpurWorldConfig {
@@ -849,6 +850,7 @@ public class PurpurWorldConfig {
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);

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

@@ -23,10 +23,10 @@ index b4459d68397cc5bac4f7ef79a2dfb18f3eb24f77..b9025929fcc89e72aa820953b91a6542
this.goalSelector.addGoal(3, new LookAtPlayerGoal(this, Player.class, 6.0F));
this.goalSelector.addGoal(4, new RandomLookAroundGoal(this));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 24154b253a27bd72f8cfcec700fc385d535b84a3..77859fdf49d86c5577457abdd1594ad9b6c1df61 100644
index 288ef13e0cbbb96712e76ebd203e3a44eca3d621..a405d1112e154bc8689d7c9f15c67d397d424dde 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1598,6 +1598,10 @@ public class PurpurWorldConfig {
@@ -1610,6 +1610,10 @@ public class PurpurWorldConfig {
public double snowGolemMaxHealth = 4.0D;
public boolean snowGolemDropsPumpkin = true;
public boolean snowGolemPutPumpkinBack = false;
@@ -37,7 +37,7 @@ index 24154b253a27bd72f8cfcec700fc385d535b84a3..77859fdf49d86c5577457abdd1594ad9
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1611,6 +1615,10 @@ public class PurpurWorldConfig {
@@ -1623,6 +1627,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/0115-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
View File

@@ -181,10 +181,10 @@ index ac70c2c03241e73943bd517a8c69dd05e0873634..0318663a824d2a9515f867a075d148c3
public static final VillagerProfession FISHERMAN = register("fisherman", PoiTypes.FISHERMAN, SoundEvents.VILLAGER_WORK_FISHERMAN);
public static final VillagerProfession FLETCHER = register("fletcher", PoiTypes.FLETCHER, SoundEvents.VILLAGER_WORK_FLETCHER);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 77859fdf49d86c5577457abdd1594ad9b6c1df61..1acfc3776bdaaef852c67bc9f7b20e6365df684e 100644
index a405d1112e154bc8689d7c9f15c67d397d424dde..4fbeb9bd9678301059af438dc8b843e8abc18d6b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1788,6 +1788,8 @@ public class PurpurWorldConfig {
@@ -1800,6 +1800,8 @@ public class PurpurWorldConfig {
public boolean villagerCanBeLeashed = false;
public boolean villagerCanBreed = true;
public int villagerBreedingTicks = 6000;
@@ -193,7 +193,7 @@ index 77859fdf49d86c5577457abdd1594ad9b6c1df61..1acfc3776bdaaef852c67bc9f7b20e63
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1802,6 +1804,8 @@ public class PurpurWorldConfig {
@@ -1814,6 +1816,8 @@ public class PurpurWorldConfig {
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks);

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

@@ -35,10 +35,10 @@ index 9bec6222a8145f84f4b748e8c96e02fa0d6f14d2..2ff0166a26ede86e8410b003a5e7f051
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 1acfc3776bdaaef852c67bc9f7b20e6365df684e..89b2a4c5adb70c8790dad34a5474011f9ad681b2 100644
index 4fbeb9bd9678301059af438dc8b843e8abc18d6b..d07f8a2568a569d551ce848855ee3411cce5a9d0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2032,6 +2032,7 @@ public class PurpurWorldConfig {
@@ -2044,6 +2044,7 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinJockeyOnlyBaby = true;
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
@@ -46,7 +46,7 @@ index 1acfc3776bdaaef852c67bc9f7b20e6365df684e..89b2a4c5adb70c8790dad34a5474011f
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -2046,5 +2047,6 @@ public class PurpurWorldConfig {
@@ -2058,5 +2059,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/0117-Configurable-chance-for-wolves-to-spawn-rabid.patch
View File

@@ -222,10 +222,10 @@ index e43fd3e59fd8c74828ae65965fade27f56beef65..b2f133c8baabba1cffa6e92ea0f85453
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 89b2a4c5adb70c8790dad34a5474011f9ad681b2..419e89bd2f825d449238f0d7234d0f33abc5ec05 100644
index d07f8a2568a569d551ce848855ee3411cce5a9d0..e40e606815d24f01e5e620d0572a609b1f41f815 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1917,6 +1917,8 @@ public class PurpurWorldConfig {
@@ -1929,6 +1929,8 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = false;
public boolean wolfControllable = true;
public double wolfMaxHealth = 8.0D;
@@ -234,7 +234,7 @@ index 89b2a4c5adb70c8790dad34a5474011f9ad681b2..419e89bd2f825d449238f0d7234d0f33
public int wolfBreedingTicks = 6000;
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
@@ -1928,6 +1930,8 @@ public class PurpurWorldConfig {
@@ -1940,6 +1942,8 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

10
patches/server/0118-Configurable-default-collar-color.patch
View File

@@ -43,10 +43,10 @@ index 73741cd019cbe57225203f76f645a6b58c02b5e3..ef2405b5e32e581c488e8b943e143fae
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 419e89bd2f825d449238f0d7234d0f33abc5ec05..f87081b6424a58bee2f74c1a7f85d0a388bac3cd 100644
index e40e606815d24f01e5e620d0572a609b1f41f815..f3d8d538fe35929018478b1be6f047b7296acea7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -614,6 +614,7 @@ public class PurpurWorldConfig {
@@ -626,6 +626,7 @@ public class PurpurWorldConfig {
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
public int catBreedingTicks = 6000;
@@ -54,7 +54,7 @@ index 419e89bd2f825d449238f0d7234d0f33abc5ec05..f87081b6424a58bee2f74c1a7f85d0a3
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -628,6 +629,11 @@ public class PurpurWorldConfig {
@@ -640,6 +641,11 @@ 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);
@@ -66,7 +66,7 @@ index 419e89bd2f825d449238f0d7234d0f33abc5ec05..f87081b6424a58bee2f74c1a7f85d0a3
}
public boolean caveSpiderRidable = false;
@@ -1917,6 +1923,7 @@ public class PurpurWorldConfig {
@@ -1929,6 +1935,7 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = false;
public boolean wolfControllable = true;
public double wolfMaxHealth = 8.0D;
@@ -74,7 +74,7 @@ index 419e89bd2f825d449238f0d7234d0f33abc5ec05..f87081b6424a58bee2f74c1a7f85d0a3
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -1930,6 +1937,11 @@ public class PurpurWorldConfig {
@@ -1942,6 +1949,11 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

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

@@ -17,10 +17,10 @@ index 11cbb89eb062de0cd30158dbfbef13554f81cf9f..162f8f6f368266ce238247901277f78c
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f87081b6424a58bee2f74c1a7f85d0a388bac3cd..7312198c3059058de967f4caf5ca0bcc0a31f445 100644
index f3d8d538fe35929018478b1be6f047b7296acea7..eac20d42f3c962dcefffd55fec1a79089ecd7d5c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1292,6 +1292,7 @@ public class PurpurWorldConfig {
@@ -1304,6 +1304,7 @@ public class PurpurWorldConfig {
public int phantomBurnInLight = 0;
public boolean phantomIgnorePlayersWithTorch = false;
public boolean phantomBurnInDaylight = true;
@@ -28,7 +28,7 @@ index f87081b6424a58bee2f74c1a7f85d0a388bac3cd..7312198c3059058de967f4caf5ca0bcc
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1325,6 +1326,7 @@ public class PurpurWorldConfig {
@@ -1337,6 +1338,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);

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

@@ -29,10 +29,10 @@ index 162fc0f879b882c934000ebb71e6eef6459876b6..521680926277d4c2bcfa0c6e482c92d9
if (!this.level.isClientSide) {
player.startRiding(this);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 615ceb5c0d465de3e86e5b6556b73e08c8bb9baf..3ad07d56faf7bf206d24d2c0a1d8790c3e910227 100644
index 7f6ff4f52da34fcd49f14b469546db76ebe5ab2f..14a05e7a166d40c49146da9bb3e6500a93fde4c7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1691,6 +1691,7 @@ public class PurpurWorldConfig {
@@ -1703,6 +1703,7 @@ public class PurpurWorldConfig {
public boolean striderControllable = true;
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
@@ -40,7 +40,7 @@ index 615ceb5c0d465de3e86e5b6556b73e08c8bb9baf..3ad07d56faf7bf206d24d2c0a1d8790c
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1702,6 +1703,7 @@ public class PurpurWorldConfig {
@@ -1714,6 +1715,7 @@ public class PurpurWorldConfig {
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);

66
patches/server/0126-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 50ac35c43570525bf7b9551d5a67940e870852a1..4649cee89a78f1eca27c6dfee07489601741ec41 100644
index 3f8e4c7436a0f0b8d1e4391967185e362eadd0b8..2d3d36f46e65d44fddf8b1f6e8de2c37c61ee7c0 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1734,7 +1734,7 @@ public abstract class LivingEntity extends Entity {
@@ -131,7 +131,7 @@ index b9025929fcc89e72aa820953b91a65423878ba0f..edf4537f08a54e1a5b043927678bbddf
}
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
index e8672137aa9ff8c7ae11b6e5c963a2dbe739cff8..fe1ba45984f253422f58158c6558cb75bbc4a6eb 100644
index 4b2aff2002e559c32a56f941fa9285f20080fe90..8baf531d95924a31ae3f6db613497c15752e740a 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
@@ -578,7 +578,7 @@ public class EnderDragon extends Mob implements Enemy {
@@ -208,7 +208,7 @@ index c220808b2a7854fa4a4e8170d7c03ba26717a8ee..8658ec12bcdf90797016f446e52c60c3
} else {
List<Sheep> list = Evoker.this.level.getNearbyEntities(Sheep.class, this.wololoTargeting, Evoker.this, Evoker.this.getBoundingBox().inflate(16.0D, 4.0D, 16.0D));
diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
index 94859efec34e6edfd31ff22277e3084218e38b3c..f8867270a5eb705b60236abf3351c050f2e27c60 100644
index 255b90552a8887e37a051f74eb2ed51e6a041e3b..7e487e93ddd33a69a1bce418edbc7d0da28655d6 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
@@ -191,7 +191,7 @@ public class Ravager extends Raider {
@@ -374,7 +374,7 @@ index 7edbe55556d3072690d535575e8704c617465770..87bae3047c16428194eae82d52e2e0c2
return true;
// Purpur end
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce79617d46 100644
index 670b87db94104499e860c7fc2b2ff6ab73d7350a..d504b3177476996a7d772eb7eeaa728521e8ae38 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -118,8 +118,11 @@ public class PurpurWorldConfig {
@@ -438,7 +438,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
}
public boolean waterInfinite = true;
@@ -730,6 +745,7 @@ public class PurpurWorldConfig {
@@ -742,6 +757,7 @@ public class PurpurWorldConfig {
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
public boolean creeperAllowGriefing = true;
@@ -446,7 +446,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -742,6 +758,7 @@ public class PurpurWorldConfig {
@@ -754,6 +770,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);
@@ -454,7 +454,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
}
public boolean dolphinRidable = false;
@@ -836,6 +853,7 @@ public class PurpurWorldConfig {
@@ -848,6 +865,7 @@ public class PurpurWorldConfig {
public double enderDragonMaxY = 320D;
public double enderDragonMaxHealth = 200.0D;
public boolean enderDragonAlwaysDropsFullExp = false;
@@ -462,7 +462,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -852,6 +870,7 @@ public class PurpurWorldConfig {
@@ -864,6 +882,7 @@ public class PurpurWorldConfig {
}
enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
@@ -470,7 +470,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
}
public boolean endermanRidable = false;
@@ -860,6 +879,7 @@ public class PurpurWorldConfig {
@@ -872,6 +891,7 @@ public class PurpurWorldConfig {
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
@@ -478,7 +478,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -872,6 +892,7 @@ public class PurpurWorldConfig {
@@ -884,6 +904,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);
@@ -486,7 +486,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
}
public boolean endermiteRidable = false;
@@ -894,6 +915,7 @@ public class PurpurWorldConfig {
@@ -906,6 +927,7 @@ public class PurpurWorldConfig {
public boolean evokerRidableInWater = false;
public boolean evokerControllable = true;
public double evokerMaxHealth = 24.0D;
@@ -494,7 +494,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
private void evokerSettings() {
evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
@@ -904,6 +926,7 @@ public class PurpurWorldConfig {
@@ -916,6 +938,7 @@ public class PurpurWorldConfig {
set("mobs.evoker.attributes.max_health", oldValue);
}
evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
@@ -502,7 +502,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
}
public boolean foxRidable = false;
@@ -912,6 +935,7 @@ public class PurpurWorldConfig {
@@ -924,6 +947,7 @@ public class PurpurWorldConfig {
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
public int foxBreedingTicks = 6000;
@@ -510,7 +510,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -924,6 +948,7 @@ public class PurpurWorldConfig {
@@ -936,6 +960,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);
@@ -518,7 +518,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
}
public boolean frogRidable = false;
@@ -1371,6 +1396,7 @@ public class PurpurWorldConfig {
@@ -1383,6 +1408,7 @@ public class PurpurWorldConfig {
public boolean piglinRidableInWater = false;
public boolean piglinControllable = true;
public double piglinMaxHealth = 16.0D;
@@ -526,7 +526,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1381,6 +1407,7 @@ public class PurpurWorldConfig {
@@ -1393,6 +1419,7 @@ public class PurpurWorldConfig {
set("mobs.piglin.attributes.max_health", oldValue);
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -534,7 +534,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
}
public boolean piglinBruteRidable = false;
@@ -1403,6 +1430,7 @@ public class PurpurWorldConfig {
@@ -1415,6 +1442,7 @@ public class PurpurWorldConfig {
public boolean pillagerRidableInWater = false;
public boolean pillagerControllable = true;
public double pillagerMaxHealth = 24.0D;
@@ -542,7 +542,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1413,6 +1441,7 @@ public class PurpurWorldConfig {
@@ -1425,6 +1453,7 @@ public class PurpurWorldConfig {
set("mobs.pillager.attributes.max_health", oldValue);
}
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -550,7 +550,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
}
public boolean polarBearRidable = false;
@@ -1459,6 +1488,7 @@ public class PurpurWorldConfig {
@@ -1471,6 +1500,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -558,7 +558,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1472,12 +1502,14 @@ public class PurpurWorldConfig {
@@ -1484,12 +1514,14 @@ 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);
@@ -573,7 +573,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1488,6 +1520,7 @@ public class PurpurWorldConfig {
@@ -1500,6 +1532,7 @@ public class PurpurWorldConfig {
set("mobs.ravager.attributes.max_health", oldValue);
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -581,7 +581,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
}
public boolean salmonRidable = false;
@@ -1509,6 +1542,7 @@ public class PurpurWorldConfig {
@@ -1521,6 +1554,7 @@ public class PurpurWorldConfig {
public boolean sheepControllable = true;
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
@@ -589,7 +589,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1520,6 +1554,7 @@ public class PurpurWorldConfig {
@@ -1532,6 +1566,7 @@ public class PurpurWorldConfig {
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
@@ -597,7 +597,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
}
public boolean shulkerRidable = false;
@@ -1542,6 +1577,7 @@ public class PurpurWorldConfig {
@@ -1554,6 +1589,7 @@ public class PurpurWorldConfig {
public boolean silverfishRidableInWater = false;
public boolean silverfishControllable = true;
public double silverfishMaxHealth = 8.0D;
@@ -605,7 +605,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1552,6 +1588,7 @@ public class PurpurWorldConfig {
@@ -1564,6 +1600,7 @@ public class PurpurWorldConfig {
set("mobs.silverfish.attributes.max_health", oldValue);
}
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -613,7 +613,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
}
public boolean skeletonRidable = false;
@@ -1628,6 +1665,7 @@ public class PurpurWorldConfig {
@@ -1640,6 +1677,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -621,7 +621,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1645,6 +1683,7 @@ public class PurpurWorldConfig {
@@ -1657,6 +1695,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);
@@ -629,7 +629,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
}
public boolean squidRidable = false;
@@ -1818,6 +1857,7 @@ public class PurpurWorldConfig {
@@ -1830,6 +1869,7 @@ public class PurpurWorldConfig {
public int villagerBreedingTicks = 6000;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -637,7 +637,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1834,6 +1874,7 @@ public class PurpurWorldConfig {
@@ -1846,6 +1886,7 @@ public class PurpurWorldConfig {
villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks);
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
@@ -645,7 +645,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
}
public boolean vindicatorRidable = false;
@@ -1906,6 +1947,7 @@ public class PurpurWorldConfig {
@@ -1918,6 +1959,7 @@ public class PurpurWorldConfig {
public double witherMaxHealth = 300.0D;
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
@@ -653,7 +653,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1923,6 +1965,7 @@ public class PurpurWorldConfig {
@@ -1935,6 +1977,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);
@@ -661,7 +661,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
}
public boolean witherSkeletonRidable = false;
@@ -1994,6 +2037,7 @@ public class PurpurWorldConfig {
@@ -2006,6 +2049,7 @@ public class PurpurWorldConfig {
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -669,7 +669,7 @@ index 992f6aeb2e75217d997db528de70c05a6a689cc1..56ffdcc2a4546bff83979d4d7071fbce
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2009,6 +2053,7 @@ public class PurpurWorldConfig {
@@ -2021,6 +2065,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);

252
patches/server/0132-Toggle-for-water-sensitive-mob-damage.patch
View File

File diff suppressed because it is too large Load Diff

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Configs for if Wither/Ender Dragon can ride vehicles
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
index 5d0ef91bbf71734368d59ca55903be106fccf662..8933f2a9526a6040464f6673cf3a60ace0473c12 100644
index dfddea46b0ff9b7f4fe3af5c23610a5f631acb4e..1e2304347fc369e5d9fe5d4c3cca8856766f5c1a 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
@@ -1155,6 +1155,7 @@ public class EnderDragon extends Mob implements Enemy {
@@ -29,10 +29,10 @@ index dcd6b4eadca53d202135957025b577b2cfed9eb0..2ef066f01fe4dbebc147fb5ec2591bdb
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 8fea71f17bad0805764568acd75f75972ea1b0e6..44dc44f0959c65ea4a856e39c3ca23270a9c4631 100644
index db3ea40a5221c93176dc91aad7c80cb551eb436b..52fb94f43a6396008e505866796a175e214e521a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -940,6 +940,7 @@ public class PurpurWorldConfig {
@@ -952,6 +952,7 @@ public class PurpurWorldConfig {
public boolean enderDragonAlwaysDropsFullExp = false;
public boolean enderDragonBypassMobGriefing = false;
public boolean enderDragonTakeDamageFromWater = false;
@@ -40,7 +40,7 @@ index 8fea71f17bad0805764568acd75f75972ea1b0e6..44dc44f0959c65ea4a856e39c3ca2327
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -958,6 +959,7 @@ public class PurpurWorldConfig {
@@ -970,6 +971,7 @@ public class PurpurWorldConfig {
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
enderDragonBypassMobGriefing = getBoolean("mobs.ender_dragon.bypass-mob-griefing", enderDragonBypassMobGriefing);
enderDragonTakeDamageFromWater = getBoolean("mobs.ender_dragon.takes-damage-from-water", enderDragonTakeDamageFromWater);
@@ -48,7 +48,7 @@ index 8fea71f17bad0805764568acd75f75972ea1b0e6..44dc44f0959c65ea4a856e39c3ca2327
}
public boolean endermanRidable = false;
@@ -2136,6 +2138,7 @@ public class PurpurWorldConfig {
@@ -2148,6 +2150,7 @@ public class PurpurWorldConfig {
public int witherHealthRegenDelay = 20;
public boolean witherBypassMobGriefing = false;
public boolean witherTakeDamageFromWater = false;
@@ -56,7 +56,7 @@ index 8fea71f17bad0805764568acd75f75972ea1b0e6..44dc44f0959c65ea4a856e39c3ca2327
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2155,6 +2158,7 @@ public class PurpurWorldConfig {
@@ -2167,6 +2170,7 @@ public class PurpurWorldConfig {
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
witherTakeDamageFromWater = getBoolean("mobs.wither.takes-damage-from-water", witherTakeDamageFromWater);

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

@@ -18,10 +18,10 @@ index 8e412eab1251f42f19168b58fe8500693db94116..f82bf3795d15ef51b8b5f89a232ec3b6
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 110d17b38eff5396fd7632befe90ceefea32406b..09ba595d6256764dab412e2f46909499746fdfc6 100644
index f9e4c95781e1040599e3addae93ded2c160a228b..c83c8790e601397a6a36db53c5501a31e6f57490 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -986,6 +986,8 @@ public class PurpurWorldConfig {
@@ -998,6 +998,8 @@ public class PurpurWorldConfig {
public boolean endermanDespawnEvenWithBlock = false;
public boolean endermanBypassMobGriefing = false;
public boolean endermanTakeDamageFromWater = true;
@@ -30,7 +30,7 @@ index 110d17b38eff5396fd7632befe90ceefea32406b..09ba595d6256764dab412e2f46909499
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -995,11 +997,17 @@ public class PurpurWorldConfig {
@@ -1007,11 +1009,17 @@ public class PurpurWorldConfig {
set("mobs.enderman.attributes.max-health", null);
set("mobs.enderman.attributes.max_health", oldValue);
}

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

@@ -20,10 +20,10 @@ index f82bf3795d15ef51b8b5f89a232ec3b6a411e57d..4e6b44308e153de23d617cabb35616d1
} else {
Vec3 vec3d = player.getViewVector(1.0F).normalize();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 09ba595d6256764dab412e2f46909499746fdfc6..9fdb3e1e162ff331ef14ec6ab207b29502f99396 100644
index c83c8790e601397a6a36db53c5501a31e6f57490..9cc72cb5b1466efd47fef933dc3e13a8fd44db77 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -988,6 +988,8 @@ public class PurpurWorldConfig {
@@ -1000,6 +1000,8 @@ public class PurpurWorldConfig {
public boolean endermanTakeDamageFromWater = true;
public boolean endermanAggroEndermites = true;
public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
@@ -32,7 +32,7 @@ index 09ba595d6256764dab412e2f46909499746fdfc6..9fdb3e1e162ff331ef14ec6ab207b295
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -1008,6 +1010,8 @@ public class PurpurWorldConfig {
@@ -1020,6 +1022,8 @@ public class PurpurWorldConfig {
endermanTakeDamageFromWater = getBoolean("mobs.enderman.takes-damage-from-water", endermanTakeDamageFromWater);
endermanAggroEndermites = getBoolean("mobs.enderman.aggressive-towards-endermites", endermanAggroEndermites);
endermanAggroEndermitesOnlyIfPlayerSpawned = getBoolean("mobs.enderman.aggressive-towards-endermites-only-spawned-by-player-thrown-ender-pearls", endermanAggroEndermitesOnlyIfPlayerSpawned);

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

@@ -32,10 +32,10 @@ index 5db7ddd3f4bd79dbcb241aad2abf96ade57ae4c4..c8d3f2ffb0f4d5586921421cda8acf27
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 83de63bcec03b82068f95e24c167449618967141..13f8050acaa8d50e759b320ba031e2afbf03f611 100644
index 66b1915d88446dc9b26aed13484c73fe8c0af19d..f9553b698ceffb51d89dd45908d0e9d522342782 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1320,6 +1320,7 @@ public class PurpurWorldConfig {
@@ -1332,6 +1332,7 @@ public class PurpurWorldConfig {
public double llamaMovementSpeedMax = 0.175D;
public int llamaBreedingTicks = 6000;
public boolean llamaTakeDamageFromWater = false;
@@ -43,7 +43,7 @@ index 83de63bcec03b82068f95e24c167449618967141..13f8050acaa8d50e759b320ba031e2af
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1339,6 +1340,7 @@ public class PurpurWorldConfig {
@@ -1351,6 +1352,7 @@ public class PurpurWorldConfig {
llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks);
llamaTakeDamageFromWater = getBoolean("mobs.llama.takes-damage-from-water", llamaTakeDamageFromWater);

8
patches/server/0145-Config-to-make-Creepers-explode-on-death.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Config to make Creepers explode on death
Creepers exploded after being killed in the alpha days. This brings that back.
diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
index 99eb17fcc112a4a770903b28fcbe1b9dfce495e2..7287d2bddc28f50987964862ce7eca1dc4d9420a 100644
index afac9d1ca9a42903afb7e354134bdf4451db889b..1a47785329e3f1e52d91d64e6cd321af03945154 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
@@ -63,6 +63,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -50,10 +50,10 @@ index 99eb17fcc112a4a770903b28fcbe1b9dfce495e2..7287d2bddc28f50987964862ce7eca1d
private void spawnLingeringCloud() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 13f8050acaa8d50e759b320ba031e2afbf03f611..214c46eed9e2460da40fbc3c8be7d6d9d885d7cb 100644
index f9553b698ceffb51d89dd45908d0e9d522342782..51a32d4e8a166d335e33d5c0585bb9a7be4ff2b9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -840,6 +840,7 @@ public class PurpurWorldConfig {
@@ -852,6 +852,7 @@ public class PurpurWorldConfig {
public boolean creeperAllowGriefing = true;
public boolean creeperBypassMobGriefing = false;
public boolean creeperTakeDamageFromWater = false;
@@ -61,7 +61,7 @@ index 13f8050acaa8d50e759b320ba031e2afbf03f611..214c46eed9e2460da40fbc3c8be7d6d9
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -854,6 +855,7 @@ public class PurpurWorldConfig {
@@ -866,6 +867,7 @@ public class PurpurWorldConfig {
creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing);
creeperTakeDamageFromWater = getBoolean("mobs.creeper.takes-damage-from-water", creeperTakeDamageFromWater);

8
patches/server/0146-Configurable-ravager-griefable-blocks-list.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable ravager griefable blocks list
diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
index 0e55d94669166ce37e054203d4723720049a940d..51f6cdf23150402a59b4e5977850d52d07d92342 100644
index efc4d4914ace36cd9e02473e6ff75e5e75362df4..f477cca8e6cf7cd5bb2f90a8cd08ae2797d3cd38 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
@@ -206,7 +206,7 @@ public class Ravager extends Raider {
@@ -31,10 +31,10 @@ index f0fbd16c9b9c3772492c32b3924e99e147e412f0..c0c3bba1555e356c0af7e79e1ecb2aa0
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 214c46eed9e2460da40fbc3c8be7d6d9d885d7cb..026d84d19c1a9077b17846dea050f3048eefe9e5 100644
index 51a32d4e8a166d335e33d5c0585bb9a7be4ff2b9..83d7abde6a4da43d74fcf41910e00d7a32753567 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1692,6 +1692,7 @@ public class PurpurWorldConfig {
@@ -1704,6 +1704,7 @@ public class PurpurWorldConfig {
public double ravagerMaxHealth = 100.0D;
public boolean ravagerBypassMobGriefing = false;
public boolean ravagerTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index 214c46eed9e2460da40fbc3c8be7d6d9d885d7cb..026d84d19c1a9077b17846dea050f304
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1704,6 +1705,23 @@ public class PurpurWorldConfig {
@@ -1716,6 +1717,23 @@ public class PurpurWorldConfig {
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
ravagerBypassMobGriefing = getBoolean("mobs.ravager.bypass-mob-griefing", ravagerBypassMobGriefing);
ravagerTakeDamageFromWater = getBoolean("mobs.ravager.takes-damage-from-water", ravagerTakeDamageFromWater);

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

@@ -31,10 +31,10 @@ index a028732368cdc6b249135742b4a86920d95fa76e..eed9fed34fde4d27e424507f2f05510d
this.openTradingScreen(player, this.getDisplayName(), 1);
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 4d9f2529245958ddd9f6b74e758f73420b8a7ed6..6a915354f9f3fd0fc18ea0f44cc242623c989477 100644
index 036e1350b4ea235aa4a8fc73cec8fa84f9c41be3..2cdb2ea411cf35be1b758a8d134a8af06dc55390 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2099,6 +2099,7 @@ public class PurpurWorldConfig {
@@ -2111,6 +2111,7 @@ public class PurpurWorldConfig {
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
public boolean villagerTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index 4d9f2529245958ddd9f6b74e758f73420b8a7ed6..6a915354f9f3fd0fc18ea0f44cc24262
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2117,6 +2118,7 @@ public class PurpurWorldConfig {
@@ -2129,6 +2130,7 @@ public class PurpurWorldConfig {
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater);
@@ -50,7 +50,7 @@ index 4d9f2529245958ddd9f6b74e758f73420b8a7ed6..6a915354f9f3fd0fc18ea0f44cc24262
}
public boolean vindicatorRidable = false;
@@ -2146,6 +2148,7 @@ public class PurpurWorldConfig {
@@ -2158,6 +2160,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
public boolean wanderingTraderTakeDamageFromWater = false;
@@ -58,7 +58,7 @@ index 4d9f2529245958ddd9f6b74e758f73420b8a7ed6..6a915354f9f3fd0fc18ea0f44cc24262
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -2159,6 +2162,7 @@ public class PurpurWorldConfig {
@@ -2171,6 +2174,7 @@ public class PurpurWorldConfig {
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);
wanderingTraderTakeDamageFromWater = getBoolean("mobs.wandering_trader.takes-damage-from-water", wanderingTraderTakeDamageFromWater);

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

@@ -31,10 +31,10 @@ index 03bed5ec0aa42b36f290e04c20915e934f07b629..307a05fa07bdfbc1586dde5f7672522f
pos = pos.below();
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e2a4729effa575f8a125210a7629e2a83cab7412..43489708ce0e21ea10abfb9e7f2cb92d18fa21f4 100644
index 2483b8a6a1ec5386ed160fe4aa767117d9fb61b1..e4f92f477b1cee346cdd5c03d3ff2d9b7f53f6ea 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1636,6 +1636,7 @@ public class PurpurWorldConfig {
@@ -1648,6 +1648,7 @@ public class PurpurWorldConfig {
public double piglinMaxHealth = 16.0D;
public boolean piglinBypassMobGriefing = false;
public boolean piglinTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index e2a4729effa575f8a125210a7629e2a83cab7412..43489708ce0e21ea10abfb9e7f2cb92d
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1648,6 +1649,7 @@ public class PurpurWorldConfig {
@@ -1660,6 +1661,7 @@ public class PurpurWorldConfig {
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
piglinBypassMobGriefing = getBoolean("mobs.piglin.bypass-mob-griefing", piglinBypassMobGriefing);
piglinTakeDamageFromWater = getBoolean("mobs.piglin.takes-damage-from-water", piglinTakeDamageFromWater);

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

@@ -18,10 +18,10 @@ index 9665095240a370983878350aed41badacfb6f261..623b90b263257dd633af330a63e4bb9d
if (!event.isCancelled()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 43489708ce0e21ea10abfb9e7f2cb92d18fa21f4..5c02af6ff74909bfa41323857080d3c0d1443f17 100644
index e4f92f477b1cee346cdd5c03d3ff2d9b7f53f6ea..c1ee28b83261719cb1fde84a76b73e967946c849 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2266,6 +2266,7 @@ public class PurpurWorldConfig {
@@ -2278,6 +2278,7 @@ public class PurpurWorldConfig {
public boolean witherBypassMobGriefing = false;
public boolean witherTakeDamageFromWater = false;
public boolean witherCanRideVehicles = false;
@@ -29,7 +29,7 @@ index 43489708ce0e21ea10abfb9e7f2cb92d18fa21f4..5c02af6ff74909bfa41323857080d3c0
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2286,6 +2287,7 @@ public class PurpurWorldConfig {
@@ -2298,6 +2299,7 @@ public class PurpurWorldConfig {
witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
witherTakeDamageFromWater = getBoolean("mobs.wither.takes-damage-from-water", witherTakeDamageFromWater);
witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Config for health to impact Creeper explosion radius
diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
index 7287d2bddc28f50987964862ce7eca1dc4d9420a..06f493349c76690e3ba38fe9add9171e4ffcfe7d 100644
index 1a47785329e3f1e52d91d64e6cd321af03945154..3c853919955d863a1010b11318d3e964d96a5cfb 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
@@ -372,9 +372,10 @@ public class Creeper extends Monster implements PowerableMob {
@@ -21,10 +21,10 @@ index 7287d2bddc28f50987964862ce7eca1dc4d9420a..06f493349c76690e3ba38fe9add9171e
if (!event.isCancelled()) {
this.dead = true;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 79f58ce6df2471e3348c772594524ba01dbc83aa..c52fad4471aef8fe62ce6c873d7a77741577d0b7 100644
index 708ab3e33406e2e71e6a8730738f1ecfbeb88844..7762a86d6edeef50031ab210fa485372bc49b345 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -932,6 +932,7 @@ public class PurpurWorldConfig {
@@ -944,6 +944,7 @@ public class PurpurWorldConfig {
public boolean creeperBypassMobGriefing = false;
public boolean creeperTakeDamageFromWater = false;
public boolean creeperExplodeWhenKilled = false;
@@ -32,7 +32,7 @@ index 79f58ce6df2471e3348c772594524ba01dbc83aa..c52fad4471aef8fe62ce6c873d7a7774
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -947,6 +948,7 @@ public class PurpurWorldConfig {
@@ -959,6 +960,7 @@ public class PurpurWorldConfig {
creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing);
creeperTakeDamageFromWater = getBoolean("mobs.creeper.takes-damage-from-water", creeperTakeDamageFromWater);
creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);

6
patches/server/0170-Iron-golem-calm-anger-options.patch
View File

@@ -26,10 +26,10 @@ index e3d725e656bc5ffc5fc92133794a80799fb21c48..fdad66c329ff8945a76a944deca7751a
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c52fad4471aef8fe62ce6c873d7a77741577d0b7..a590a89d8e90a70509a13c78d7c4ee93b042f1d0 100644
index 7762a86d6edeef50031ab210fa485372bc49b345..4cb0dd0f74d876dbf9dcba34441920dbc659f57c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1390,6 +1390,8 @@ public class PurpurWorldConfig {
@@ -1402,6 +1402,8 @@ public class PurpurWorldConfig {
public boolean ironGolemCanSwim = false;
public double ironGolemMaxHealth = 100.0D;
public boolean ironGolemTakeDamageFromWater = false;
@@ -38,7 +38,7 @@ index c52fad4471aef8fe62ce6c873d7a77741577d0b7..a590a89d8e90a70509a13c78d7c4ee93
private void ironGolemSettings() {
ironGolemRidable = getBoolean("mobs.iron_golem.ridable", ironGolemRidable);
ironGolemRidableInWater = getBoolean("mobs.iron_golem.ridable-in-water", ironGolemRidableInWater);
@@ -1402,6 +1404,8 @@ public class PurpurWorldConfig {
@@ -1414,6 +1416,8 @@ public class PurpurWorldConfig {
}
ironGolemMaxHealth = getDouble("mobs.iron_golem.attributes.max_health", ironGolemMaxHealth);
ironGolemTakeDamageFromWater = getBoolean("mobs.iron_golem.takes-damage-from-water", ironGolemTakeDamageFromWater);

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

@@ -50,10 +50,10 @@ index ab00e8d796ff7c903ea678dedb64cb25cf7e462e..29c13eee52a9f32a07853bd824687601
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a590a89d8e90a70509a13c78d7c4ee93b042f1d0..b1e2f45601d71f31cd001bbd3b0668650d7e5635 100644
index 4cb0dd0f74d876dbf9dcba34441920dbc659f57c..379fc7f886def1521210c32cde2bbd7a459d01d5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1560,6 +1560,7 @@ public class PurpurWorldConfig {
@@ -1572,6 +1572,7 @@ public class PurpurWorldConfig {
public double parrotMaxY = 320D;
public double parrotMaxHealth = 6.0D;
public boolean parrotTakeDamageFromWater = false;
@@ -61,7 +61,7 @@ index a590a89d8e90a70509a13c78d7c4ee93b042f1d0..b1e2f45601d71f31cd001bbd3b066865
private void parrotSettings() {
parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable);
parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater);
@@ -1572,6 +1573,7 @@ public class PurpurWorldConfig {
@@ -1584,6 +1585,7 @@ public class PurpurWorldConfig {
}
parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth);
parrotTakeDamageFromWater = getBoolean("mobs.parrot.takes-damage-from-water", parrotTakeDamageFromWater);

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

@@ -67,10 +67,10 @@ index 2170715ed0e81a3055e4ab546c8b294c5ef7f142..beae4e2b9f61df83215de860d64c4ce2
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 22baf3d82b2304c27d4a6fc50101478a9d3e7966..a94a3bc8be6f1aa518195e17d99655b02d292d14 100644
index 202b2da2c64fd6660a2f8570e324cfeb1d0f9dcc..31ca38800709dfa8d2fdc3e5f0d147e1a26f2fbc 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1926,6 +1926,11 @@ public class PurpurWorldConfig {
@@ -1938,6 +1938,11 @@ public class PurpurWorldConfig {
public boolean shulkerControllable = true;
public double shulkerMaxHealth = 30.0D;
public boolean shulkerTakeDamageFromWater = false;
@@ -82,7 +82,7 @@ index 22baf3d82b2304c27d4a6fc50101478a9d3e7966..a94a3bc8be6f1aa518195e17d99655b0
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -1937,6 +1942,11 @@ public class PurpurWorldConfig {
@@ -1949,6 +1954,11 @@ public class PurpurWorldConfig {
}
shulkerMaxHealth = getDouble("mobs.shulker.attributes.max_health", shulkerMaxHealth);
shulkerTakeDamageFromWater = getBoolean("mobs.shulker.takes-damage-from-water", shulkerTakeDamageFromWater);

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

@@ -34,10 +34,10 @@ index 037d77b47d0be69dfeda01f4a0d52ad72aea2c8d..6e0a575a95ac0bcbc9e3909178ea566a
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d3ed64a39a91e4b12df9f4fc91ffd2f426d54778..b3b7f1f624382d8105410d942eac697848cba6f5 100644
index 1cb1ac92e25a5bf899d7bd43f992efd81e3f87d6..f5f38def1250979a818588a6665fe6dc1421da41 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1072,6 +1072,7 @@ public class PurpurWorldConfig {
@@ -1084,6 +1084,7 @@ public class PurpurWorldConfig {
public double drownedJockeyChance = 0.05D;
public boolean drownedJockeyTryExistingChickens = true;
public boolean drownedTakeDamageFromWater = false;
@@ -45,7 +45,7 @@ index d3ed64a39a91e4b12df9f4fc91ffd2f426d54778..b3b7f1f624382d8105410d942eac6978
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -1087,6 +1088,7 @@ public class PurpurWorldConfig {
@@ -1099,6 +1100,7 @@ public class PurpurWorldConfig {
drownedJockeyChance = getDouble("mobs.drowned.jockey.chance", drownedJockeyChance);
drownedJockeyTryExistingChickens = getBoolean("mobs.drowned.jockey.try-existing-chickens", drownedJockeyTryExistingChickens);
drownedTakeDamageFromWater = getBoolean("mobs.drowned.takes-damage-from-water", drownedTakeDamageFromWater);

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

@@ -18,10 +18,10 @@ index 4c1e9b6f4a52d7b1506b9016cc4d30e583eeab04..0e753dd68d9506a2a4e5ad74e7f4d04c
this.tickTimer = 0;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b3b7f1f624382d8105410d942eac697848cba6f5..3cd04d8e1bf920c36fbab1968df1cb65fbcdc068 100644
index f5f38def1250979a818588a6665fe6dc1421da41..4d84107ecd394db7db8c1fbc709c5b08064cf46c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2570,4 +2570,9 @@ public class PurpurWorldConfig {
@@ -2582,4 +2582,9 @@ public class PurpurWorldConfig {
zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
zombifiedPiglinTakeDamageFromWater = getBoolean("mobs.zombified_piglin.takes-damage-from-water", zombifiedPiglinTakeDamageFromWater);
}

4
patches/server/0200-Silk-touchable-budding-amethyst.patch
View File

@@ -24,7 +24,7 @@ index bedccb8717d08d5a60058445b04ddff149e7d36c..5293ffca3da94c9c485a87d1232b6a90
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b297ce9d27c44d87e90b6893b73516e716e1df47..f39c8dc011eea4bee42bbc10dd8061d07921d8de 100644
index 6789ee452e35660371f51c63ac3466271f95ed23..03518af0e256b226d41018c0a8ab225183bc6e07 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -719,6 +719,11 @@ public class PurpurWorldConfig {
@@ -39,7 +39,7 @@ index b297ce9d27c44d87e90b6893b73516e716e1df47..f39c8dc011eea4bee42bbc10dd8061d0
public boolean chestOpenWithBlockOnTop = false;
private void chestSettings() {
chestOpenWithBlockOnTop = getBoolean("blocks.chest.open-with-solid-block-on-top", chestOpenWithBlockOnTop);
@@ -2735,3 +2740,4 @@ public class PurpurWorldConfig {
@@ -2747,3 +2752,4 @@ public class PurpurWorldConfig {
hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
}
}

6
patches/server/0203-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
View File

@@ -18,10 +18,10 @@ index 4e6b44308e153de23d617cabb35616d1b5f4ca9c..9d97e4097d11894ee0b901ba9323431e
boolean flag;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 6f94eeeeb03341621e7a8340b0d91073fa96fbbe..27b06d6ebe464c14b7795161a0692540858ad4f9 100644
index b6ac412abf45335b67d349bbe676ffe517915f44..6d739c7d355a569380f22c8c2ced499ea339b2e6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1331,6 +1331,7 @@ public class PurpurWorldConfig {
@@ -1343,6 +1343,7 @@ public class PurpurWorldConfig {
public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
public boolean endermanIgnorePlayerDragonHead = false;
public boolean endermanDisableStareAggro = false;
@@ -29,7 +29,7 @@ index 6f94eeeeb03341621e7a8340b0d91073fa96fbbe..27b06d6ebe464c14b7795161a0692540
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -1353,6 +1354,7 @@ public class PurpurWorldConfig {
@@ -1365,6 +1366,7 @@ public class PurpurWorldConfig {
endermanAggroEndermitesOnlyIfPlayerSpawned = getBoolean("mobs.enderman.aggressive-towards-endermites-only-spawned-by-player-thrown-ender-pearls", endermanAggroEndermitesOnlyIfPlayerSpawned);
endermanIgnorePlayerDragonHead = getBoolean("mobs.enderman.ignore-players-wearing-dragon-head", endermanIgnorePlayerDragonHead);
endermanDisableStareAggro = getBoolean("mobs.enderman.disable-player-stare-aggression", endermanDisableStareAggro);

6
patches/server/0207-Customizeable-Zombie-Villager-curing-times.patch
View File

@@ -18,10 +18,10 @@ index cd1e454b1e178b5bb2c2a9b83bdab2b70206bde3..4ec10cf9613d03da66fb03bec3e9b06e
return InteractionResult.SUCCESS;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e1997fa949d21d2c5f4c248ed8292fbb5d2eb4e6..674fbe85641dfcb2c93090457c24bc198aa40b65 100644
index b0ddf12ff7f27bef8012fdd0cc3cec149746452e..7794d418b84c307dab01dbe2d4f9bb949fc486de 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2719,6 +2719,8 @@ public class PurpurWorldConfig {
@@ -2731,6 +2731,8 @@ public class PurpurWorldConfig {
public double zombieVillagerJockeyChance = 0.05D;
public boolean zombieVillagerJockeyTryExistingChickens = true;
public boolean zombieVillagerTakeDamageFromWater = false;
@@ -30,7 +30,7 @@ index e1997fa949d21d2c5f4c248ed8292fbb5d2eb4e6..674fbe85641dfcb2c93090457c24bc19
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2734,6 +2736,8 @@ public class PurpurWorldConfig {
@@ -2746,6 +2748,8 @@ public class PurpurWorldConfig {
zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater);

6
patches/server/0209-Toggle-for-Wither-s-spawn-sound.patch
View File

@@ -18,10 +18,10 @@ index 97c5ffd383a02afecba035e65823ac12e03c7295..e0c5a8afa5c394ab8bbd3e982632518c
// this.world.globalLevelEvent(1023, new BlockPosition(this), 0);
int viewDistance = ((ServerLevel) this.level).getCraftServer().getViewDistance() * 16;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index df61924acdbc23e8c30d9be82ba26b74d07d2d5b..4025e00da97b1477ca76a927b01e2020cfa2d563 100644
index 53885bb9e4c3c0404069d110ad38890f156bce6b..3b7d45b75b1c3883c8019568e27eca48f552046b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2564,6 +2564,7 @@ public class PurpurWorldConfig {
@@ -2576,6 +2576,7 @@ public class PurpurWorldConfig {
public boolean witherTakeDamageFromWater = false;
public boolean witherCanRideVehicles = false;
public float witherExplosionRadius = 1.0F;
@@ -29,7 +29,7 @@ index df61924acdbc23e8c30d9be82ba26b74d07d2d5b..4025e00da97b1477ca76a927b01e2020
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2585,6 +2586,7 @@ public class PurpurWorldConfig {
@@ -2597,6 +2598,7 @@ public class PurpurWorldConfig {
witherTakeDamageFromWater = getBoolean("mobs.wither.takes-damage-from-water", witherTakeDamageFromWater);
witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);
witherExplosionRadius = (float) getDouble("mobs.wither.explosion-radius", witherExplosionRadius);

4
patches/server/0212-Conduit-behavior-configuration.patch
View File

@@ -77,10 +77,10 @@ index 05eab04e4aec4151018f25b59f92ddbbb4c09f87..3b5c502fc211940dd908f1d276fa11e3
});
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 9ebd8b4b527fe8c30483abf34a5840fe0c77355e..9207e3f4c61c478365ab43a138c8738bd4d89732 100644
index bc4795e6c53ca4f2be49fbc0a92a20f00c69f8b2..3e0f66b6511737edbf65a264c4f524f6267d0750 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2783,5 +2783,28 @@ public class PurpurWorldConfig {
@@ -2795,5 +2795,28 @@ public class PurpurWorldConfig {
private void hungerSettings() {
hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
}

4
patches/server/0213-Cauldron-fill-chances.patch
View File

@@ -47,10 +47,10 @@ index e78fdd317d59cfca6a28deb6e0bd02aabe91e930..895fea12e9780521573bfe6f6a3d9c86
if (dripChance < f1) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 9207e3f4c61c478365ab43a138c8738bd4d89732..99358fb2f2f97dde8df4c8f4606b4e2e70ee11d1 100644
index 3e0f66b6511737edbf65a264c4f524f6267d0750..7fc254745e319ce28c51dd9077a16bb110de90bb 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2806,5 +2806,16 @@ public class PurpurWorldConfig {
@@ -2818,5 +2818,16 @@ public class PurpurWorldConfig {
});
conduitBlocks = conduitBlockList.toArray(Block[]::new);
}

6
patches/server/0215-Shulker-change-color-with-dye.patch
View File

@@ -47,10 +47,10 @@ index 70237d8891889818135ea024d0c8f31cbfe75524..3e6a8c541292a7ac7ca290e79bb14b70
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 1731c84ba16f56e12640132f693639db89ceded6..ae772a31e0a53c26cb0f10dd23bdbef783df9770 100644
index 3ff68cf8938560187a653ed7b5dd7bba9894b28a..d3e6ac680c037722d39108c3811ebddd185879bd 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2139,6 +2139,7 @@ public class PurpurWorldConfig {
@@ -2151,6 +2151,7 @@ public class PurpurWorldConfig {
public double shulkerSpawnFromBulletNearbyRange = 8.0D;
public String shulkerSpawnFromBulletNearbyEquation = "(nearby - 1) / 5.0";
public boolean shulkerSpawnFromBulletRandomColor = false;
@@ -58,7 +58,7 @@ index 1731c84ba16f56e12640132f693639db89ceded6..ae772a31e0a53c26cb0f10dd23bdbef7
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -2155,6 +2156,7 @@ public class PurpurWorldConfig {
@@ -2167,6 +2168,7 @@ public class PurpurWorldConfig {
shulkerSpawnFromBulletNearbyRange = getDouble("mobs.shulker.spawn-from-bullet.nearby-range", shulkerSpawnFromBulletNearbyRange);
shulkerSpawnFromBulletNearbyEquation = getString("mobs.shulker.spawn-from-bullet.nearby-equation", shulkerSpawnFromBulletNearbyEquation);
shulkerSpawnFromBulletRandomColor = getBoolean("mobs.shulker.spawn-from-bullet.random-color", shulkerSpawnFromBulletRandomColor);

6
patches/server/0221-Dolphins-naturally-aggressive-to-players-chance.patch
View File

@@ -47,10 +47,10 @@ index b0c933644c1f4b5aa142c7c4d26a9b81cb4051f7..f8be4c96e7e7b8e6d8c538b1f425f01d
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f3778a9b35bf0b70ff786160a713e39895370bed..658e7838b0400346ee417d9b9ab238ba8c014312 100644
index cee7850db74804a66f2548aaf300430a894fb6cf..26d79ad472870f5964f34a16b7a22c54b17a42d8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1237,6 +1237,7 @@ public class PurpurWorldConfig {
@@ -1249,6 +1249,7 @@ public class PurpurWorldConfig {
public double dolphinMaxHealth = 10.0D;
public boolean dolphinDisableTreasureSearching = false;
public boolean dolphinTakeDamageFromWater = false;
@@ -58,7 +58,7 @@ index f3778a9b35bf0b70ff786160a713e39895370bed..658e7838b0400346ee417d9b9ab238ba
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinControllable = getBoolean("mobs.dolphin.controllable", dolphinControllable);
@@ -1251,6 +1252,7 @@ public class PurpurWorldConfig {
@@ -1263,6 +1264,7 @@ public class PurpurWorldConfig {
dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);
dolphinDisableTreasureSearching = getBoolean("mobs.dolphin.disable-treasure-searching", dolphinDisableTreasureSearching);
dolphinTakeDamageFromWater = getBoolean("mobs.dolphin.takes-damage-from-water", dolphinTakeDamageFromWater);

6
patches/server/0222-Cows-naturally-aggressive-to-players-chance.patch
View File

@@ -59,10 +59,10 @@ index 48d20fcd481e76e180410c11040b2164315fce23..7bf4b399d68b04a43465e85061113249
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 658e7838b0400346ee417d9b9ab238ba8c014312..9d1eb60814e57ede2235aaa695c57fc9b07fd795 100644
index 26d79ad472870f5964f34a16b7a22c54b17a42d8..b8b043c2982c556a9f40b78114ee220bddb67ec8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1186,7 +1186,14 @@ public class PurpurWorldConfig {
@@ -1198,7 +1198,14 @@ public class PurpurWorldConfig {
public int cowFeedMushrooms = 0;
public int cowBreedingTicks = 6000;
public boolean cowTakeDamageFromWater = false;
@@ -77,7 +77,7 @@ index 658e7838b0400346ee417d9b9ab238ba8c014312..9d1eb60814e57ede2235aaa695c57fc9
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
cowControllable = getBoolean("mobs.cow.controllable", cowControllable);
@@ -1199,6 +1206,8 @@ public class PurpurWorldConfig {
@@ -1211,6 +1218,8 @@ public class PurpurWorldConfig {
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
cowBreedingTicks = getInt("mobs.cow.breeding-delay-ticks", cowBreedingTicks);
cowTakeDamageFromWater = getBoolean("mobs.cow.takes-damage-from-water", cowTakeDamageFromWater);

4
patches/server/0224-Halloween-options-and-optimizations.patch
View File

@@ -60,10 +60,10 @@ index d6093557894789eb20f79b83547620b47bb65ffb..dfa2806faedf70ca5ffe77087a67822a
this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f534cb88365dce7054bec5367594fc21172c740d..512e3ce4f83c592dfb0cef2b4eb94560a2d7eb48 100644
index d09c046576bc8f8ff9a2c728aec286d84c81a2fd..a39898272437925cb65d973fa50632ff5ed90424 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1579,6 +1579,13 @@ public class PurpurWorldConfig {
@@ -1591,6 +1591,13 @@ public class PurpurWorldConfig {
guardianTakeDamageFromWater = getBoolean("mobs.guardian.takes-damage-from-water", guardianTakeDamageFromWater);
}

6
patches/server/0229-Add-option-to-disable-zombie-villagers-cure.patch
View File

@@ -18,10 +18,10 @@ index 4ec10cf9613d03da66fb03bec3e9b06ec5b56c7a..c51e04e90e6a5b5b549666fe739491c1
itemstack.shrink(1);
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 479295d603169b3858bb1bcafe6c0f63f140c5b3..138823179c7afff52f504bddfcf07fdc5302c398 100644
index c8e8497db82968ec57f3f39399db896c16028672..b572c937b6f11783d0f4366e998e53fdb91cce4b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2783,6 +2783,7 @@ public class PurpurWorldConfig {
@@ -2795,6 +2795,7 @@ public class PurpurWorldConfig {
public boolean zombieVillagerTakeDamageFromWater = false;
public int zombieVillagerCuringTimeMin = 3600;
public int zombieVillagerCuringTimeMax = 6000;
@@ -29,7 +29,7 @@ index 479295d603169b3858bb1bcafe6c0f63f140c5b3..138823179c7afff52f504bddfcf07fdc
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2800,6 +2801,7 @@ public class PurpurWorldConfig {
@@ -2812,6 +2813,7 @@ public class PurpurWorldConfig {
zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater);
zombieVillagerCuringTimeMin = getInt("mobs.zombie_villager.curing_time.min", zombieVillagerCuringTimeMin);
zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax);

262
patches/server/0233-Mobs-always-drop-experience.patch
View File

File diff suppressed because it is too large Load Diff

6
patches/server/0237-Shearing-jeb-produces-random-color-wool.patch
View File

@@ -18,10 +18,10 @@ index 492316925f06d1bc7950c6b9d37615b2bd0138fd..99dbbe59116ae4fbdfb506a72959e3a6
if (entityitem != null) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d7176a0a2732cbe9b14b0ad852a3531f4a47c3f5..3c97e3df12897a8aee762314e91ebcd45ef6ce4c 100644
index 101172bc698671d011f1196e575b9215e39a228d..e85beb8d57d9f421e793215e6b8b2d20289d477d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2260,6 +2260,7 @@ public class PurpurWorldConfig {
@@ -2272,6 +2272,7 @@ public class PurpurWorldConfig {
public boolean sheepBypassMobGriefing = false;
public boolean sheepTakeDamageFromWater = false;
public boolean sheepAlwaysDropExp = false;
@@ -29,7 +29,7 @@ index d7176a0a2732cbe9b14b0ad852a3531f4a47c3f5..3c97e3df12897a8aee762314e91ebcd4
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -2274,6 +2275,7 @@ public class PurpurWorldConfig {
@@ -2286,6 +2287,7 @@ public class PurpurWorldConfig {
sheepBypassMobGriefing = getBoolean("mobs.sheep.bypass-mob-griefing", sheepBypassMobGriefing);
sheepTakeDamageFromWater = getBoolean("mobs.sheep.takes-damage-from-water", sheepTakeDamageFromWater);
sheepAlwaysDropExp = getBoolean("mobs.sheep.always-drop-exp", sheepAlwaysDropExp);

20
patches/server/0239-Mob-head-visibility-percent.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Mob head visibility percent
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index d5980f19074fce969bb156b7b3bf0854c02ea477..c41afa080aae9939160cda2fdd8d01a415c61dcd 100644
index 7a60d00faa9434ca283f428df02a38c50c1666dc..7fc6a47dd0ded34c74c8aca3091a1d1e38cb2aa5 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1029,9 +1029,20 @@ public abstract class LivingEntity extends Entity {
@@ -32,10 +32,10 @@ index d5980f19074fce969bb156b7b3bf0854c02ea477..c41afa080aae9939160cda2fdd8d01a4
// Purpur start
if (entity instanceof LivingEntity entityliving) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 847964d820f86867a4a6e7f5f37dbd3b852a6d4c..6d474c112cd622910f168695e6e0a959b9f9f405 100644
index 0abaa61cd1ca81da3062c9732deba789309a55df..63f1a1d3c1356473f8ee2cfe5e895902f4088245 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1262,6 +1262,7 @@ public class PurpurWorldConfig {
@@ -1274,6 +1274,7 @@ public class PurpurWorldConfig {
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
@@ -43,7 +43,7 @@ index 847964d820f86867a4a6e7f5f37dbd3b852a6d4c..6d474c112cd622910f168695e6e0a959
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1279,6 +1280,7 @@ public class PurpurWorldConfig {
@@ -1291,6 +1292,7 @@ public class PurpurWorldConfig {
creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);
creeperHealthRadius = getBoolean("mobs.creeper.health-impacts-explosion", creeperHealthRadius);
creeperAlwaysDropExp = getBoolean("mobs.creeper.always-drop-exp", creeperAlwaysDropExp);
@@ -51,7 +51,7 @@ index 847964d820f86867a4a6e7f5f37dbd3b852a6d4c..6d474c112cd622910f168695e6e0a959
}
public boolean dolphinRidable = false;
@@ -2065,6 +2067,7 @@ public class PurpurWorldConfig {
@@ -2077,6 +2079,7 @@ public class PurpurWorldConfig {
public boolean piglinTakeDamageFromWater = false;
public int piglinPortalSpawnModifier = 2000;
public boolean piglinAlwaysDropExp = false;
@@ -59,7 +59,7 @@ index 847964d820f86867a4a6e7f5f37dbd3b852a6d4c..6d474c112cd622910f168695e6e0a959
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -2079,6 +2082,7 @@ public class PurpurWorldConfig {
@@ -2091,6 +2094,7 @@ public class PurpurWorldConfig {
piglinTakeDamageFromWater = getBoolean("mobs.piglin.takes-damage-from-water", piglinTakeDamageFromWater);
piglinPortalSpawnModifier = getInt("mobs.piglin.portal-spawn-modifier", piglinPortalSpawnModifier);
piglinAlwaysDropExp = getBoolean("mobs.piglin.always-drop-exp", piglinAlwaysDropExp);
@@ -67,7 +67,7 @@ index 847964d820f86867a4a6e7f5f37dbd3b852a6d4c..6d474c112cd622910f168695e6e0a959
}
public boolean piglinBruteRidable = false;
@@ -2340,6 +2344,7 @@ public class PurpurWorldConfig {
@@ -2352,6 +2356,7 @@ public class PurpurWorldConfig {
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
@@ -75,7 +75,7 @@ index 847964d820f86867a4a6e7f5f37dbd3b852a6d4c..6d474c112cd622910f168695e6e0a959
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2352,6 +2357,7 @@ public class PurpurWorldConfig {
@@ -2364,6 +2369,7 @@ public class PurpurWorldConfig {
skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
@@ -83,7 +83,7 @@ index 847964d820f86867a4a6e7f5f37dbd3b852a6d4c..6d474c112cd622910f168695e6e0a959
}
public boolean skeletonHorseRidableInWater = true;
@@ -2873,6 +2879,7 @@ public class PurpurWorldConfig {
@@ -2885,6 +2891,7 @@ public class PurpurWorldConfig {
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
@@ -91,7 +91,7 @@ index 847964d820f86867a4a6e7f5f37dbd3b852a6d4c..6d474c112cd622910f168695e6e0a959
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2891,6 +2898,7 @@ public class PurpurWorldConfig {
@@ -2903,6 +2910,7 @@ public class PurpurWorldConfig {
zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
zombieAlwaysDropExp = getBoolean("mobs.zombie.always-drop-exp", zombieAlwaysDropExp);

6
patches/server/0248-Configurable-phantom-size.patch
View File

@@ -22,10 +22,10 @@ index 35da78d79ee90acc69600adb78bc81ff75cee752..cf6f7c6c5754ab712e06a7bfb8c1ef8e
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index eb1d8693b3495c18c80f13174c1b3a5bf757b9ff..05f4d455ea04ff5a53d362b5a5a21ecede5d1d1b 100644
index f8329a1949013494cedc914c3d1c3e7fad3f1568..097aa216c717e2a866a0ff69627aecf8ab4c1db2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2005,6 +2005,8 @@ public class PurpurWorldConfig {
@@ -2017,6 +2017,8 @@ public class PurpurWorldConfig {
public boolean phantomFlamesOnSwoop = false;
public boolean phantomTakeDamageFromWater = false;
public boolean phantomAlwaysDropExp = false;
@@ -34,7 +34,7 @@ index eb1d8693b3495c18c80f13174c1b3a5bf757b9ff..05f4d455ea04ff5a53d362b5a5a21ece
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -2041,6 +2043,13 @@ public class PurpurWorldConfig {
@@ -2053,6 +2055,13 @@ public class PurpurWorldConfig {
phantomFlamesOnSwoop = getBoolean("mobs.phantom.flames-on-swoop", phantomFlamesOnSwoop);
phantomTakeDamageFromWater = getBoolean("mobs.phantom.takes-damage-from-water", phantomTakeDamageFromWater);
phantomAlwaysDropExp = getBoolean("mobs.phantom.always-drop-exp", phantomAlwaysDropExp);

6
patches/server/0251-Configurable-minimum-demand-for-trades.patch
View File

@@ -40,10 +40,10 @@ index 8a9a701baabdaf066cd9b28c05430f673fcafb4e..17cc3237c7fc8ceda136b2371fabf6f0
public ItemStack assemble() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 05f4d455ea04ff5a53d362b5a5a21ecede5d1d1b..347f8ff69dc0a9ea511e792b3e6147f796b529a4 100644
index 097aa216c717e2a866a0ff69627aecf8ab4c1db2..2451f0b0590a21f6f7ee977f6fd096db208bbacc 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2675,6 +2675,7 @@ public class PurpurWorldConfig {
@@ -2687,6 +2687,7 @@ public class PurpurWorldConfig {
public boolean villagerTakeDamageFromWater = false;
public boolean villagerAllowTrading = true;
public boolean villagerAlwaysDropExp = false;
@@ -51,7 +51,7 @@ index 05f4d455ea04ff5a53d362b5a5a21ecede5d1d1b..347f8ff69dc0a9ea511e792b3e6147f7
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2695,6 +2696,7 @@ public class PurpurWorldConfig {
@@ -2707,6 +2708,7 @@ public class PurpurWorldConfig {
villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater);
villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading);
villagerAlwaysDropExp = getBoolean("mobs.villager.always-drop-exp", villagerAlwaysDropExp);

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

@@ -110,10 +110,10 @@ index a1a8ac55e572156671e47317ba061855be79e5ac..ec3fb8865211bd7625103c37af7b96df
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 347f8ff69dc0a9ea511e792b3e6147f796b529a4..4a5cf8698b153215473dacfc5e44474484d2c864 100644
index 2451f0b0590a21f6f7ee977f6fd096db208bbacc..8faf2f7d12520e9e7c79146ee7b4066d13983961 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2676,6 +2676,8 @@ public class PurpurWorldConfig {
@@ -2688,6 +2688,8 @@ public class PurpurWorldConfig {
public boolean villagerAllowTrading = true;
public boolean villagerAlwaysDropExp = false;
public int villagerMinimumDemand = 0;
@@ -122,7 +122,7 @@ index 347f8ff69dc0a9ea511e792b3e6147f796b529a4..4a5cf8698b153215473dacfc5e444744
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2697,6 +2699,17 @@ public class PurpurWorldConfig {
@@ -2709,6 +2711,17 @@ public class PurpurWorldConfig {
villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading);
villagerAlwaysDropExp = getBoolean("mobs.villager.always-drop-exp", villagerAlwaysDropExp);
villagerMinimumDemand = getInt("mobs.villager.minimum-demand", villagerMinimumDemand);

6
patches/server/0253-Option-for-villager-display-trade-item.patch
View File

@@ -17,10 +17,10 @@ index 98373e013748817209b811d4adbb40a8787242a6..567b501f4de7556e55e2418d2f5700b4
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 4a5cf8698b153215473dacfc5e44474484d2c864..10133d45893281d40380cd62743f2b6b99fafdd1 100644
index 8faf2f7d12520e9e7c79146ee7b4066d13983961..11716e7095f9001e8965e2ede27ce73b6711d67d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2678,6 +2678,7 @@ public class PurpurWorldConfig {
@@ -2690,6 +2690,7 @@ public class PurpurWorldConfig {
public int villagerMinimumDemand = 0;
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheckInterval = 100;
@@ -28,7 +28,7 @@ index 4a5cf8698b153215473dacfc5e44474484d2c864..10133d45893281d40380cd62743f2b6b
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2710,6 +2711,7 @@ public class PurpurWorldConfig {
@@ -2722,6 +2723,7 @@ public class PurpurWorldConfig {
}
villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
villagerLobotomizeCheckInterval = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheckInterval);

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

@@ -18,10 +18,10 @@ index ab1e841f14c6776644f8a2f92f6db98e83724afc..700d32abc957769960fd081072c94168
AABB axisalignedbb = this.getBoundingBox().inflate(10.0D, 10.0D, 10.0D);
List<Villager> list = world.getEntitiesOfClass(Villager.class, axisalignedbb);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5ce6326bf776e817d9b1a5cce691a88d54c4b584..075235e1db1c2261c3917b57d752462cf4fba4d3 100644
index 6847a69ccb0201f69be339326a8dd20797c9a605..ca01415871b03d9a93859f89f236892817dff558 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2689,6 +2689,8 @@ public class PurpurWorldConfig {
@@ -2701,6 +2701,8 @@ public class PurpurWorldConfig {
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheckInterval = 100;
public boolean villagerDisplayTradeItem = true;
@@ -30,7 +30,7 @@ index 5ce6326bf776e817d9b1a5cce691a88d54c4b584..075235e1db1c2261c3917b57d752462c
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2722,6 +2724,8 @@ public class PurpurWorldConfig {
@@ -2734,6 +2736,8 @@ public class PurpurWorldConfig {
villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
villagerLobotomizeCheckInterval = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheckInterval);
villagerDisplayTradeItem = getBoolean("mobs.villager.display-trade-item", villagerDisplayTradeItem);

6
patches/server/0266-Skeletons-eat-wither-roses.patch
View File

@@ -94,10 +94,10 @@ index f5e8fbccd819f6fb66918bceb93d000da038d7ef..e0352f073c95f8caf47d6789c0bd10e5
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 39c6d09fdade9809a43b749adb8b27d82e35460a..ca54c868b4ac2f932b1614f6938775ed04b03e84 100644
index 6bee6e6fda76c2072765e3909f0f9207fbda5622..65ef8479070ad804cc2c79b488190295d29489ff 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2386,6 +2386,7 @@ public class PurpurWorldConfig {
@@ -2398,6 +2398,7 @@ public class PurpurWorldConfig {
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
public double skeletonHeadVisibilityPercent = 0.5D;
@@ -105,7 +105,7 @@ index 39c6d09fdade9809a43b749adb8b27d82e35460a..ca54c868b4ac2f932b1614f6938775ed
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2399,6 +2400,7 @@ public class PurpurWorldConfig {
@@ -2411,6 +2412,7 @@ public class PurpurWorldConfig {
skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
skeletonHeadVisibilityPercent = getDouble("mobs.skeleton.head-visibility-percent", skeletonHeadVisibilityPercent);

4
patches/server/0267-Enchantment-Table-Persists-Lapis.patch
View File

@@ -146,10 +146,10 @@ index 65e1381bb2d10bd212463feb602c60f8fdb9ade1..b7370e64fd0d50e8725d7d5afc30af2e
+ // Purpur
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ca54c868b4ac2f932b1614f6938775ed04b03e84..5122ee294a795f72a5ffa6ae4fe62b3574a2c52e 100644
index 65ef8479070ad804cc2c79b488190295d29489ff..6c1fdc7a5d665642044827a2c66124c0326298d6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1421,6 +1421,11 @@ public class PurpurWorldConfig {
@@ -1433,6 +1433,11 @@ public class PurpurWorldConfig {
elderGuardianAlwaysDropExp = getBoolean("mobs.elder_guardian.always-drop-exp", elderGuardianAlwaysDropExp);
}

6
patches/server/0286-Add-skeleton-bow-accuracy-option.patch
View File

@@ -18,10 +18,10 @@ index e542407894f58fb8c0339a7a6d2e7b2cb5891eb4..0cfe5cb3ce0ac8554bbdb68c66583693
org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getMainHandItem(), entityarrow.getPickupItem(), entityarrow, net.minecraft.world.InteractionHand.MAIN_HAND, 0.8F, true); // Paper
if (event.isCancelled()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 4a78ea6c92922dc2742e90d1726f2ba39065449f..ab6c9c87684e1be6276880e847856ee99a0b92a9 100644
index c0efea82bacda565876b8a01ed1f520706a2d127..af323d3136ca5d51ac122d5758251db965281020 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2406,6 +2406,8 @@ public class PurpurWorldConfig {
@@ -2418,6 +2418,8 @@ public class PurpurWorldConfig {
public boolean skeletonAlwaysDropExp = false;
public double skeletonHeadVisibilityPercent = 0.5D;
public int skeletonFeedWitherRoses = 0;
@@ -30,7 +30,7 @@ index 4a78ea6c92922dc2742e90d1726f2ba39065449f..ab6c9c87684e1be6276880e847856ee9
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2420,6 +2422,18 @@ public class PurpurWorldConfig {
@@ -2432,6 +2434,18 @@ public class PurpurWorldConfig {
skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
skeletonHeadVisibilityPercent = getDouble("mobs.skeleton.head-visibility-percent", skeletonHeadVisibilityPercent);
skeletonFeedWitherRoses = getInt("mobs.skeleton.feed-wither-roses", skeletonFeedWitherRoses);

6
patches/server/0292-Implement-squid-colors-for-rainglow-fabric-mod.patch
View File

@@ -40,10 +40,10 @@ index b7abcaa32341c292f9f884fa6319fd65596e1b37..5d6cddc221887be20ef75d688817dfe5
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d06be7de030dbeb153ec452cf74751642de9c0d8..ba7c9c9d0713a9f9c8cb785922e51fb88a9f13b5 100644
index b1312b36707aaae62d590994d8a3563901c32e94..88dc1c60a8f5d320f635219884896e7ca50422de 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1658,6 +1658,7 @@ public class PurpurWorldConfig {
@@ -1670,6 +1670,7 @@ public class PurpurWorldConfig {
public boolean glowSquidsCanFly = false;
public boolean glowSquidTakeDamageFromWater = false;
public boolean glowSquidAlwaysDropExp = false;
@@ -51,7 +51,7 @@ index d06be7de030dbeb153ec452cf74751642de9c0d8..ba7c9c9d0713a9f9c8cb785922e51fb8
private void glowSquidSettings() {
glowSquidRidable = getBoolean("mobs.glow_squid.ridable", glowSquidRidable);
glowSquidControllable = getBoolean("mobs.glow_squid.controllable", glowSquidControllable);
@@ -1665,6 +1666,7 @@ public class PurpurWorldConfig {
@@ -1677,6 +1678,7 @@ public class PurpurWorldConfig {
glowSquidsCanFly = getBoolean("mobs.glow_squid.can-fly", glowSquidsCanFly);
glowSquidTakeDamageFromWater = getBoolean("mobs.glow_squid.takes-damage-from-water", glowSquidTakeDamageFromWater);
glowSquidAlwaysDropExp = getBoolean("mobs.glow_squid.always-drop-exp", glowSquidAlwaysDropExp);

6
patches/server/0301-Add-option-to-allow-creeper-to-encircle-target-when-.patch
View File

@@ -24,10 +24,10 @@ index e241ae250f4f04a17ef2c583d00b065a4ca56a4c..02b567e4e808e1a809d285ef39e1abc5
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7f1334fa04fe28a41f29a437e18f1613bd69997e..3adfb90ce28ebba6e82a36894f6e625353d6d7f3 100644
index 9e24482e2dfe50a5503cdf20f0325320ecf79260..2808c30b7d74f1ca73d9b98ada30a9a818deac3b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1314,6 +1314,7 @@ public class PurpurWorldConfig {
@@ -1326,6 +1326,7 @@ public class PurpurWorldConfig {
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
public double creeperHeadVisibilityPercent = 0.5D;
@@ -35,7 +35,7 @@ index 7f1334fa04fe28a41f29a437e18f1613bd69997e..3adfb90ce28ebba6e82a36894f6e6253
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1332,6 +1333,7 @@ public class PurpurWorldConfig {
@@ -1344,6 +1345,7 @@ public class PurpurWorldConfig {
creeperHealthRadius = getBoolean("mobs.creeper.health-impacts-explosion", creeperHealthRadius);
creeperAlwaysDropExp = getBoolean("mobs.creeper.always-drop-exp", creeperAlwaysDropExp);
creeperHeadVisibilityPercent = getDouble("mobs.creeper.head-visibility-percent", creeperHeadVisibilityPercent);