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

fix config options in patches

Browse Source
This commit is contained in:
granny
2023-06-09 04:33:41 -07:00
parent 91b9a1a0ce
commit 9bed3af997
94 changed files with 603 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,7 @@ index 218eaf5f18162422b3376335e32f25d03c0655ec..9d9cb6e697c4f09badc3ca121f2ef987
return this.brain;
}
diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
index 7798e8df6156d71878b7c1f60c5636be64a25591..0dc811f18724d3142561c0dddf840dbbb28bb12e 100644
index 2ac0c8a7335450c192352da9c34151a70a2645dd..45297abb703c82f13cc206896758458afcfb3b51 100644
--- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
@@ -278,6 +278,18 @@ public class Bat extends AmbientCreature {
@@ -158,7 +158,7 @@ index 3ac30ed0a411384be5102de498815561915a7903..d26a44d634fe02e595654e573d02243b
protected void registerGoals() {
this.goalSelector.addGoal(0, new FloatGoal(this));
diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
index 057ebdba945caa27db8982fe140d858bdb84fa39..b206686fe55f56b9c4d94a7b54927bf74842b46c 100644
index b9a2064fd3a08aa21f1a25d3f367342852185974..08e9fd3581578195e5df079b086811c5964fd17a 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
@@ -154,6 +154,11 @@ public class Dolphin extends WaterAnimal {
@@ -775,7 +775,7 @@ index 5a2eb6775ecb3b01fd136c796258395b4270f7a8..f160933af318becaf99befc0ecc0204b
return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0D);
}
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
index cfde1cde09112251410495203f7daa457c5ed728..e942a677fe90f30f08100ad544aa773ead563954 100644
index 2a8f6b1fb7f3aac3100e5dc9ee64c53c0edd165b..38800a318f675ab11eeba17cb1966e9a294c69e1 100644
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
@@ -112,6 +112,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -1053,7 +1053,7 @@ index aad51022eac584fbc058c2b25e2bf1929fccca6f..b472309f97b24f1d7b97d8b6d464c479
return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, (double)0.2F);
}
diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
index ea613fe67fcd977aebaae891f95272970ba23698..cd6a25bb101555d6c763a7023d1b05691e671b5f 100644
index 519d7667e6a8bcb39c200546af5ebbf74e0e9368..2189058a752986179165fb904513796e7220438e 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
@@ -150,7 +150,10 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -1504,7 +1504,7 @@ index d434b96b878652190fac4e2882b7b7373febbbd5..62deb4a443bf65655d2a4310c0dd9f40
protected void registerGoals() {
this.goalSelector.addGoal(0, new FloatGoal(this));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ec168b917d60cc6d8c48620eb4dcd89b0b121aea..2bd21bcd94e63048f29bf7e833fabb0751308447 100644
index ec168b917d60cc6d8c48620eb4dcd89b0b121aea..d16e7c78f6da209a94ab0fd95fb8e178b1a61609 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -114,94 +114,188 @@ public class PurpurWorldConfig {
@@ -1858,7 +1858,7 @@ index ec168b917d60cc6d8c48620eb4dcd89b0b121aea..2bd21bcd94e63048f29bf7e833fabb07
}
public boolean frogRidable = false;
@@ -300,147 +475,319 @@ public class PurpurWorldConfig {
@@ -300,147 +475,316 @@ public class PurpurWorldConfig {
public boolean ghastRidableInWater = true;
public boolean ghastControllable = true;
public double ghastMaxY = 320D;
@@ -2047,9 +2047,6 @@ index ec168b917d60cc6d8c48620eb4dcd89b0b121aea..2bd21bcd94e63048f29bf7e833fabb07
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
llamaControllable = getBoolean("mobs.llama.controllable", llamaControllable);
+ llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
+ llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
+ llamaControllable = getBoolean("mobs.llama.controllable", llamaControllable);
+ if (PurpurConfig.version < 10) {
+ double oldMin = getDouble("mobs.llama.attributes.max-health.min", llamaMaxHealthMin);
+ double oldMax = getDouble("mobs.llama.attributes.max-health.max", llamaMaxHealthMax);
@@ -2178,7 +2175,7 @@ index ec168b917d60cc6d8c48620eb4dcd89b0b121aea..2bd21bcd94e63048f29bf7e833fabb07
}
public boolean phantomRidable = false;
@@ -450,6 +797,10 @@ public class PurpurWorldConfig {
@@ -450,6 +794,10 @@ public class PurpurWorldConfig {
public float phantomFlameDamage = 1.0F;
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
@@ -2189,7 +2186,7 @@ index ec168b917d60cc6d8c48620eb4dcd89b0b121aea..2bd21bcd94e63048f29bf7e833fabb07
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -458,189 +809,361 @@ public class PurpurWorldConfig {
@@ -458,189 +806,361 @@ 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);
@@ -2551,7 +2548,7 @@ index ec168b917d60cc6d8c48620eb4dcd89b0b121aea..2bd21bcd94e63048f29bf7e833fabb07
}
public boolean tadpoleRidable = false;
@@ -655,64 +1178,125 @@ public class PurpurWorldConfig {
@@ -655,64 +1175,125 @@ public class PurpurWorldConfig {
public boolean traderLlamaRidable = false;
public boolean traderLlamaRidableInWater = false;
public boolean traderLlamaControllable = true;
@@ -2677,7 +2674,7 @@ index ec168b917d60cc6d8c48620eb4dcd89b0b121aea..2bd21bcd94e63048f29bf7e833fabb07
}
public boolean wardenRidable = false;
@@ -727,81 +1311,160 @@ public class PurpurWorldConfig {
@@ -727,81 +1308,165 @@ public class PurpurWorldConfig {
public boolean witchRidable = false;
public boolean witchRidableInWater = true;
public boolean witchControllable = true;
@@ -2816,6 +2813,11 @@ index ec168b917d60cc6d8c48620eb4dcd89b0b121aea..2bd21bcd94e63048f29bf7e833fabb07
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
zombieVillagerControllable = getBoolean("mobs.zombie_villager.controllable", zombieVillagerControllable);
+ if (PurpurConfig.version < 10) {
+ double oldValue = getDouble("mobs.zombie_villager.attributes.max-health", zombieVillagerMaxHealth);
+ set("mobs.zombie_villager.attributes.max-health", null);
+ set("mobs.zombie_villager.attributes.max_health", oldValue);
+ }
+ zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
+ zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
}

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

@@ -30,10 +30,10 @@ index 9168a02ede5b2fc924dbcf0063109f8e72d94d61..e2b1433034b1ab9bad821983515a37fd
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 c1996047ebfb4f515a037bf4b8d7872eb8363739..aee48b41a0a550dd4db9b33d7c02961753a5c4ed 100644
index 7eed48428c5b5449010bbb8d07cddeab7140f603..ff50c86268ff722350fef6b81dbe4c4b0d752ef6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1491,6 +1491,7 @@ public class PurpurWorldConfig {
@@ -1488,6 +1488,7 @@ public class PurpurWorldConfig {
public double zombieHorseJumpStrengthMax = 1.0D;
public double zombieHorseMovementSpeedMin = 0.2D;
public double zombieHorseMovementSpeedMax = 0.2D;
@@ -41,7 +41,7 @@ index c1996047ebfb4f515a037bf4b8d7872eb8363739..aee48b41a0a550dd4db9b33d7c029617
private void zombieHorseSettings() {
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
@@ -1506,6 +1507,7 @@ public class PurpurWorldConfig {
@@ -1503,6 +1504,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/0026-Rabbit-naturally-spawn-toast-and-killer.patch
View File

@@ -33,10 +33,10 @@ index db37932e56d88717a61eb8608b44c6911513aa35..2f373666e982a8c4e769168b565ca26e
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 e9fbb9f7aeadd2860491a8afdc200de40b51320b..81d72372bc205796f55a742655ef2b01d53db24a 100644
index 1f4f075c257d96d73e96a4640248e011919e4b1e..9d81b796df992393f23d6eded02f46c41f0b385b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -995,6 +995,8 @@ public class PurpurWorldConfig {
@@ -992,6 +992,8 @@ public class PurpurWorldConfig {
public boolean rabbitRidableInWater = true;
public boolean rabbitControllable = true;
public double rabbitMaxHealth = 3.0D;
@@ -45,7 +45,7 @@ index e9fbb9f7aeadd2860491a8afdc200de40b51320b..81d72372bc205796f55a742655ef2b01
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1005,6 +1007,8 @@ public class PurpurWorldConfig {
@@ -1002,6 +1004,8 @@ public class PurpurWorldConfig {
set("mobs.rabbit.attributes.max_health", oldValue);
}
rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth);

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

@@ -59,10 +59,10 @@ index 48ec595e76c09cf719477a543364f1206664afa5..b2cf680e377f849a7cc17136ebca3cf3
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 15e98301b1b77c0e0df42aa923d3d55913bd4767..a7873252ba4ff059beeaa69017e51772468b58a2 100644
index 4c83055430523377aa0590440841d0a09224bb70..e226eee1e9483c16bb5b1677bdcbfea72761c301 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -967,6 +967,8 @@ public class PurpurWorldConfig {
@@ -964,6 +964,8 @@ public class PurpurWorldConfig {
public boolean polarBearRidableInWater = true;
public boolean polarBearControllable = true;
public double polarBearMaxHealth = 30.0D;
@@ -71,7 +71,7 @@ index 15e98301b1b77c0e0df42aa923d3d55913bd4767..a7873252ba4ff059beeaa69017e51772
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -977,6 +979,9 @@ public class PurpurWorldConfig {
@@ -974,6 +976,9 @@ public class PurpurWorldConfig {
set("mobs.polar_bear.attributes.max_health", oldValue);
}
polarBearMaxHealth = getDouble("mobs.polar_bear.attributes.max_health", polarBearMaxHealth);

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

@@ -27,10 +27,10 @@ index a22e5b6c13b48b46d16a859531d4231376bc1bfc..ff98a81f7104bbaf67ed85b8ad0946ed
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 ed32ff8a2ab16226a8679daff5835cc819b3b709..8b4bedef0c02f72b07400564976ac55380291efc 100644
index 143735894cb1aca700373e92aa1a4fbf3edae5af..d24d01f389ccb4ceecc6fc810c4536ba727adb34 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -918,6 +918,7 @@ public class PurpurWorldConfig {
@@ -915,6 +915,7 @@ public class PurpurWorldConfig {
public boolean pigRidableInWater = false;
public boolean pigControllable = true;
public double pigMaxHealth = 10.0D;
@@ -38,7 +38,7 @@ index ed32ff8a2ab16226a8679daff5835cc819b3b709..8b4bedef0c02f72b07400564976ac553
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -928,6 +929,7 @@ public class PurpurWorldConfig {
@@ -925,6 +926,7 @@ public class PurpurWorldConfig {
set("mobs.pig.attributes.max_health", oldValue);
}
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);

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

@@ -32,10 +32,10 @@ index a8b411cc3dd1f61b4f949862a077e87e26e424de..2a5ffaf5614e19305f4e08e157523649
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 8b4bedef0c02f72b07400564976ac55380291efc..3c8cbb7c114f9c14837da9977632fb6442075e35 100644
index d24d01f389ccb4ceecc6fc810c4536ba727adb34..fa08a977ee3e42ae2793eebc21a550b93c99246e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1181,6 +1181,8 @@ public class PurpurWorldConfig {
@@ -1178,6 +1178,8 @@ public class PurpurWorldConfig {
public boolean snowGolemControllable = true;
public boolean snowGolemLeaveTrailWhenRidden = false;
public double snowGolemMaxHealth = 4.0D;
@@ -44,7 +44,7 @@ index 8b4bedef0c02f72b07400564976ac55380291efc..3c8cbb7c114f9c14837da9977632fb64
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1192,6 +1194,8 @@ public class PurpurWorldConfig {
@@ -1189,6 +1191,8 @@ public class PurpurWorldConfig {
set("mobs.snow_golem.attributes.max_health", oldValue);
}
snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);

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

@@ -54,10 +54,10 @@ index 62deb4a443bf65655d2a4310c0dd9f40a02cb401..1c7359431533716b2681176b3b59b502
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 ee5931cdc3352d8ea8664edb26de348f98c69fed..7baa48a5537cf7e5f47b106b39da039767547148 100644
index c45b2383fba314e39dbbefcf687be8444683318a..68f1e89cf4a0ba87a15277e91e7b636ae26a6f45 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1442,6 +1442,7 @@ public class PurpurWorldConfig {
@@ -1439,6 +1439,7 @@ public class PurpurWorldConfig {
public boolean villagerRidableInWater = true;
public boolean villagerControllable = true;
public double villagerMaxHealth = 20.0D;
@@ -65,7 +65,7 @@ index ee5931cdc3352d8ea8664edb26de348f98c69fed..7baa48a5537cf7e5f47b106b39da0397
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1452,6 +1453,7 @@ public class PurpurWorldConfig {
@@ -1449,6 +1450,7 @@ public class PurpurWorldConfig {
set("mobs.villager.attributes.max_health", oldValue);
}
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
@@ -73,7 +73,7 @@ index ee5931cdc3352d8ea8664edb26de348f98c69fed..7baa48a5537cf7e5f47b106b39da0397
}
public boolean vindicatorRidable = false;
@@ -1474,6 +1476,7 @@ public class PurpurWorldConfig {
@@ -1471,6 +1473,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderRidableInWater = true;
public boolean wanderingTraderControllable = true;
public double wanderingTraderMaxHealth = 20.0D;
@@ -81,7 +81,7 @@ index ee5931cdc3352d8ea8664edb26de348f98c69fed..7baa48a5537cf7e5f47b106b39da0397
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1484,6 +1487,7 @@ public class PurpurWorldConfig {
@@ -1481,6 +1484,7 @@ public class PurpurWorldConfig {
set("mobs.wandering_trader.attributes.max_health", oldValue);
}
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);

12
patches/server/0049-Allow-leashing-villagers.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow leashing villagers
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 89ea4208bc30bcf3ed59b3a28384c0796b9204c4..0c1aa12dafb34ed76dd899893748556f9fe23487 100644
index d2ae293a23f8d02b3a2f0a60e4389497be77b60d..75c2653d75254f421db0f714acb864d9bb9f070a 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1302,6 +1302,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -49,10 +49,10 @@ index 1c7359431533716b2681176b3b59b5028aa043c2..41ddf073ecb8ea97cca8021390500d65
protected void registerGoals() {
this.goalSelector.addGoal(0, new FloatGoal(this));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7baa48a5537cf7e5f47b106b39da039767547148..97710a3988ead1049b35de2a9be89cec738ed149 100644
index 68f1e89cf4a0ba87a15277e91e7b636ae26a6f45..807dfd6f54a12e299c53762e835144cd2a3d9858 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1443,6 +1443,7 @@ public class PurpurWorldConfig {
@@ -1440,6 +1440,7 @@ public class PurpurWorldConfig {
public boolean villagerControllable = true;
public double villagerMaxHealth = 20.0D;
public boolean villagerFollowEmeraldBlock = false;
@@ -60,7 +60,7 @@ index 7baa48a5537cf7e5f47b106b39da039767547148..97710a3988ead1049b35de2a9be89cec
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1454,6 +1455,7 @@ public class PurpurWorldConfig {
@@ -1451,6 +1452,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 7baa48a5537cf7e5f47b106b39da039767547148..97710a3988ead1049b35de2a9be89cec
}
public boolean vindicatorRidable = false;
@@ -1477,6 +1479,7 @@ public class PurpurWorldConfig {
@@ -1474,6 +1476,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderControllable = true;
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
@@ -76,7 +76,7 @@ index 7baa48a5537cf7e5f47b106b39da039767547148..97710a3988ead1049b35de2a9be89cec
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1488,6 +1491,7 @@ public class PurpurWorldConfig {
@@ -1485,6 +1488,7 @@ public class PurpurWorldConfig {
}
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);

15
patches/server/0064-Configurable-jockey-options.patch
View File

@@ -167,7 +167,7 @@ index 8f22bfcde4bb8ad73794f2b98b156113e5a2a6c9..3d61b27c23d90e87fdfc8c170eafc116
public void setPersistentAngerTarget(@Nullable UUID angryAt) {
this.persistentAngerTarget = angryAt;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 023eb3bc381803d9ab712965f44e2e3f3790ddbe..d96d87fd198e54802712b8cfde2a0563812a3136 100644
index f69b94022b78cd9dad74858a90eb61904944e17e..1d9c99f3740cec7fb41602835cda3277ea4a36c3 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -587,6 +587,9 @@ public class PurpurWorldConfig {
@@ -210,7 +210,7 @@ index 023eb3bc381803d9ab712965f44e2e3f3790ddbe..d96d87fd198e54802712b8cfde2a0563
}
public boolean illusionerRidable = false;
@@ -1676,6 +1688,9 @@ public class PurpurWorldConfig {
@@ -1673,6 +1685,9 @@ public class PurpurWorldConfig {
public boolean zombieControllable = true;
public double zombieMaxHealth = 20.0D;
public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index 023eb3bc381803d9ab712965f44e2e3f3790ddbe..d96d87fd198e54802712b8cfde2a0563
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1687,6 +1702,9 @@ public class PurpurWorldConfig {
@@ -1684,6 +1699,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 023eb3bc381803d9ab712965f44e2e3f3790ddbe..d96d87fd198e54802712b8cfde2a0563
}
public boolean zombieHorseRidableInWater = false;
@@ -1721,12 +1739,18 @@ public class PurpurWorldConfig {
@@ -1718,6 +1736,9 @@ public class PurpurWorldConfig {
public boolean zombieVillagerControllable = true;
public double zombieVillagerMaxHealth = 20.0D;
public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,8 @@ index 023eb3bc381803d9ab712965f44e2e3f3790ddbe..d96d87fd198e54802712b8cfde2a0563
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
zombieVillagerControllable = getBoolean("mobs.zombie_villager.controllable", zombieVillagerControllable);
@@ -1729,6 +1750,9 @@ public class PurpurWorldConfig {
}
zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
+ zombieVillagerJockeyOnlyBaby = getBoolean("mobs.zombie_villager.jockey.only-babies", zombieVillagerJockeyOnlyBaby);
@@ -249,7 +250,7 @@ index 023eb3bc381803d9ab712965f44e2e3f3790ddbe..d96d87fd198e54802712b8cfde2a0563
}
public boolean zombifiedPiglinRidable = false;
@@ -1734,6 +1758,9 @@ public class PurpurWorldConfig {
@@ -1736,6 +1760,9 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinControllable = true;
public double zombifiedPiglinMaxHealth = 20.0D;
public double zombifiedPiglinSpawnReinforcements = 0.0D;
@@ -259,7 +260,7 @@ index 023eb3bc381803d9ab712965f44e2e3f3790ddbe..d96d87fd198e54802712b8cfde2a0563
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1745,5 +1772,8 @@ public class PurpurWorldConfig {
@@ -1747,5 +1774,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/0065-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -258,10 +258,10 @@ index 2189058a752986179165fb904513796e7220438e..b0aad0632ed2c6004222a4715c2643ef
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 d96d87fd198e54802712b8cfde2a0563812a3136..fd4c91cba23954d1614ad3d3cdb0b12d6ffdecaa 100644
index 1d9c99f3740cec7fb41602835cda3277ea4a36c3..7b7140769db9ca063d64fcc2295bacba178ae705 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1067,6 +1067,9 @@ public class PurpurWorldConfig {
@@ -1064,6 +1064,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 d96d87fd198e54802712b8cfde2a0563812a3136..fd4c91cba23954d1614ad3d3cdb0b12d
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1088,6 +1091,9 @@ public class PurpurWorldConfig {
@@ -1085,6 +1088,9 @@ public class PurpurWorldConfig {
phantomAttackDamage = getString("mobs.phantom.attributes.attack_damage", phantomAttackDamage);
phantomMaxHealthCache.clear();
phantomAttackDamageCache.clear();

10
patches/server/0066-Add-phantom-spawning-options.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 3 Jul 2020 00:03:52 -0500
From: granny <granny@purpurmc.org>
Date: Fri, 9 Jun 2023 03:21:11 -0700
Subject: [PATCH] Add phantom spawning options
@@ -40,10 +40,10 @@ index bc7648dbc132551dc6591ab49a1919a623c30f60..5b880677c895d0e747a1ed6a380ae356
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 fd4c91cba23954d1614ad3d3cdb0b12d6ffdecaa..a6a71ea8dda8a1c42f3e32f9fccb9dc5366d9295 100644
index 7b7140769db9ca063d64fcc2295bacba178ae705..b786dd8e852fec75165d3a699028730cf6594d82 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1070,6 +1070,12 @@ public class PurpurWorldConfig {
@@ -1067,6 +1067,12 @@ public class PurpurWorldConfig {
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
public double phantomOrbitCrystalRadius = 0.0D;
@@ -56,7 +56,7 @@ index fd4c91cba23954d1614ad3d3cdb0b12d6ffdecaa..a6a71ea8dda8a1c42f3e32f9fccb9dc5
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1094,6 +1100,12 @@ public class PurpurWorldConfig {
@@ -1091,6 +1097,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);

6
patches/server/0073-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 7a6c463c91ec2de4dc118299bd3e7b3eabcd62ee..d9696e006ecd97d01996cdd77fd151fc4c907adb 100644
index ff68169ac99096373789d5af790db3697b73a17b..0eead11fc1e6a2c93b4ac0410fd8b4209398310d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1455,6 +1455,7 @@ public class PurpurWorldConfig {
@@ -1452,6 +1452,7 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public boolean squidControllable = true;
public double squidMaxHealth = 10.0D;
@@ -16,7 +16,7 @@ index 7a6c463c91ec2de4dc118299bd3e7b3eabcd62ee..d9696e006ecd97d01996cdd77fd151fc
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -1464,6 +1465,7 @@ public class PurpurWorldConfig {
@@ -1461,6 +1462,7 @@ public class PurpurWorldConfig {
set("mobs.squid.attributes.max_health", oldValue);
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);

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

@@ -52,10 +52,10 @@ index b0aad0632ed2c6004222a4715c2643eff13f030c..776602b545f5ee3b566787befb0f4307
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 d9696e006ecd97d01996cdd77fd151fc4c907adb..243f427b181d4b24810e6357968b2d5996873566 100644
index 0eead11fc1e6a2c93b4ac0410fd8b4209398310d..61864baa60313dcff327720adb3a316079430306 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1125,6 +1125,9 @@ public class PurpurWorldConfig {
@@ -1122,6 +1122,9 @@ public class PurpurWorldConfig {
public double phantomSpawnLocalDifficultyChance = 3.0D;
public int phantomSpawnMinPerAttempt = 1;
public int phantomSpawnMaxPerAttempt = -1;
@@ -65,7 +65,7 @@ index d9696e006ecd97d01996cdd77fd151fc4c907adb..243f427b181d4b24810e6357968b2d59
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1155,6 +1158,9 @@ public class PurpurWorldConfig {
@@ -1152,6 +1155,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/0075-Configurable-villager-breeding.patch
View File

@@ -18,10 +18,10 @@ index 813b9708d218589afaaa2d0578affcc78f0c075f..52a84f354cc51b3ca875756514588b2e
private boolean hungry() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 243f427b181d4b24810e6357968b2d5996873566..769cc5910468fddab1fbe8751e9dc4d30d4647f0 100644
index 61864baa60313dcff327720adb3a316079430306..883489dc77c0d157045f443345df8063af61a15f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1613,6 +1613,7 @@ public class PurpurWorldConfig {
@@ -1610,6 +1610,7 @@ public class PurpurWorldConfig {
public double villagerMaxHealth = 20.0D;
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
@@ -29,7 +29,7 @@ index 243f427b181d4b24810e6357968b2d5996873566..769cc5910468fddab1fbe8751e9dc4d3
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1625,6 +1626,7 @@ public class PurpurWorldConfig {
@@ -1622,6 +1623,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/0078-Add-vindicator-johnny-spawn-chance.patch
View File

@@ -22,10 +22,10 @@ index 40858ac2a9b58108472748d0ef2c2fd5ef5cfd98..2a5b6b94b15bf066b5722e7a4f782bc8
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d30c6b98d394576c8eab5c298b9c731e6bd70cfa..c1e72cdb13d37f82721033dc619e643bc6d6aece 100644
index 577d45bc6bbd2a119a2f77c7d5651875fbb7ea87..5aea1f5b50493ee2d5752442007c5979c2f2ddc8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1640,6 +1640,7 @@ public class PurpurWorldConfig {
@@ -1637,6 +1637,7 @@ public class PurpurWorldConfig {
public boolean vindicatorRidableInWater = true;
public boolean vindicatorControllable = true;
public double vindicatorMaxHealth = 24.0D;
@@ -33,7 +33,7 @@ index d30c6b98d394576c8eab5c298b9c731e6bd70cfa..c1e72cdb13d37f82721033dc619e643b
private void vindicatorSettings() {
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
@@ -1650,6 +1651,7 @@ public class PurpurWorldConfig {
@@ -1647,6 +1648,7 @@ public class PurpurWorldConfig {
set("mobs.vindicator.attributes.max_health", oldValue);
}
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);

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

@@ -54,10 +54,10 @@ index ffc76354ead6937daf366c3d87bcb51d3e4c47f5..5b98d42b5d6bc07265fbb017e51a6281
+ // Purpur
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a82912b348921f55962b48d052a4e492c7fbb224..506a61275a5baf285a061afb92ea8bd5fd22b541 100644
index a07a7e650aaf980348e55e3556e880cbb0773f84..5749edd65f332773716202e8ec2e92ecb9eff0ed 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1480,6 +1480,7 @@ public class PurpurWorldConfig {
@@ -1477,6 +1477,7 @@ public class PurpurWorldConfig {
public boolean squidControllable = true;
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
@@ -65,7 +65,7 @@ index a82912b348921f55962b48d052a4e492c7fbb224..506a61275a5baf285a061afb92ea8bd5
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -1490,6 +1491,7 @@ public class PurpurWorldConfig {
@@ -1487,6 +1488,7 @@ public class PurpurWorldConfig {
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);

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

@@ -23,10 +23,10 @@ index a20017a6086421061ee13df9cf37e08eeb515a5b..c2f4ae412684cc2f8d3cc2206003be5c
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 aa723588cb7209ae44bb6796c8d78c168efc6b08..1e95bf6efe93c22f135fb15c4600c181580daf0a 100644
index b83b293a9c017f4e4da9944fe4c928909030628e..76c1d65e1df2c98c22669c1e3d4328aaede58fb0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1719,6 +1719,8 @@ public class PurpurWorldConfig {
@@ -1716,6 +1716,8 @@ public class PurpurWorldConfig {
public boolean witherControllable = true;
public double witherMaxY = 320D;
public double witherMaxHealth = 300.0D;
@@ -35,7 +35,7 @@ index aa723588cb7209ae44bb6796c8d78c168efc6b08..1e95bf6efe93c22f135fb15c4600c181
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1734,6 +1736,8 @@ public class PurpurWorldConfig {
@@ -1731,6 +1733,8 @@ public class PurpurWorldConfig {
set("mobs.wither.attributes.max_health", oldValue);
}
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);

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

@@ -70,10 +70,10 @@ index b2b04d7b7bbc400fb66cac385fa754d4fb47c7d9..bd75aa78a7dd437d6fce79a6cb182981
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 9d3f312eabca30f9012acfe575eb13bf8ec221bd..a6fac67bc5defd71d9e5ccd580047b7c5f5d779f 100644
index 8c386c03ff153b72570c667af1b35677bb47f898..7e42867fb666d8f4de17b2b50924eba6382be100 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1852,6 +1852,7 @@ public class PurpurWorldConfig {
@@ -1849,6 +1849,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyOnlyBaby = true;
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
@@ -81,7 +81,7 @@ index 9d3f312eabca30f9012acfe575eb13bf8ec221bd..a6fac67bc5defd71d9e5ccd580047b7c
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1866,6 +1867,7 @@ public class PurpurWorldConfig {
@@ -1863,6 +1864,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);

6
patches/server/0094-Flying-squids-Oh-my.patch
View File

@@ -58,7 +58,7 @@ index de0a015cc944c36358fc34a3142ecbf9d2a332b5..1431d7f295614641c1a5a5197f4bac3f
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 a6fac67bc5defd71d9e5ccd580047b7c5f5d779f..dd1eced37919d62f571b9b4a524fb08cbe0cdf41 100644
index 7e42867fb666d8f4de17b2b50924eba6382be100..35a4cf5fd61beeed1f62fa6e1854492377b7569c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -901,10 +901,12 @@ public class PurpurWorldConfig {
@@ -74,7 +74,7 @@ index a6fac67bc5defd71d9e5ccd580047b7c5f5d779f..dd1eced37919d62f571b9b4a524fb08c
}
public boolean goatRidable = false;
@@ -1539,6 +1541,7 @@ public class PurpurWorldConfig {
@@ -1536,6 +1538,7 @@ public class PurpurWorldConfig {
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
public double squidOffsetWaterCheck = 0.0D;
@@ -82,7 +82,7 @@ index a6fac67bc5defd71d9e5ccd580047b7c5f5d779f..dd1eced37919d62f571b9b4a524fb08c
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -1550,6 +1553,7 @@ public class PurpurWorldConfig {
@@ -1547,6 +1550,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);

68
patches/server/0102-Make-entity-breeding-times-configurable.patch
View File

@@ -525,7 +525,7 @@ index 853fe631a7d665e2379296c89e433e761495a814..ae4d404b837da202e52d246dabfc00c8
public boolean canBeLeashed(Player player) {
return !this.isLeashed();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2b5a1681b 100644
index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7c25454a8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -502,10 +502,12 @@ public class PurpurWorldConfig {
@@ -557,14 +557,14 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean blazeRidable = false;
@@ -582,6 +586,7 @@ public class PurpurWorldConfig {
public double camelJumpStrengthMax = 0.42D;
public double camelMovementSpeedMin = 0.09D;
public double camelMovementSpeedMax = 0.09D;
@@ -576,6 +580,7 @@ public class PurpurWorldConfig {
blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
}
+ public int camelBreedingTicks = 6000;
private void camelSettings() {
camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin);
camelMaxHealthMax = getDouble("mobs.camel.attributes.max_health.max", camelMaxHealthMax);
public double camelMaxHealthMin = 32.0D;
public double camelMaxHealthMax = 32.0D;
public double camelJumpStrengthMin = 0.42D;
@@ -589,6 +594,7 @@ public class PurpurWorldConfig {
camelJumpStrengthMax = getDouble("mobs.camel.attributes.jump_strength.max", camelJumpStrengthMax);
camelMovementSpeedMin = getDouble("mobs.camel.attributes.movement_speed.min", camelMovementSpeedMin);
@@ -720,7 +720,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1107,6 +1132,7 @@ public class PurpurWorldConfig {
@@ -1104,6 +1129,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);
@@ -728,7 +728,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean magmaCubeRidable = false;
@@ -1135,6 +1161,7 @@ public class PurpurWorldConfig {
@@ -1132,6 +1158,7 @@ public class PurpurWorldConfig {
public boolean mooshroomRidableInWater = true;
public boolean mooshroomControllable = true;
public double mooshroomMaxHealth = 10.0D;
@@ -736,7 +736,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1145,6 +1172,7 @@ public class PurpurWorldConfig {
@@ -1142,6 +1169,7 @@ public class PurpurWorldConfig {
set("mobs.mooshroom.attributes.max_health", oldValue);
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -744,7 +744,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean muleRidableInWater = false;
@@ -1154,6 +1182,7 @@ public class PurpurWorldConfig {
@@ -1151,6 +1179,7 @@ public class PurpurWorldConfig {
public double muleJumpStrengthMax = 0.5D;
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
@@ -752,7 +752,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1169,12 +1198,14 @@ public class PurpurWorldConfig {
@@ -1166,12 +1195,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);
@@ -767,7 +767,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1185,12 +1216,14 @@ public class PurpurWorldConfig {
@@ -1182,12 +1213,14 @@ public class PurpurWorldConfig {
set("mobs.ocelot.attributes.max_health", oldValue);
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -782,7 +782,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1201,6 +1234,7 @@ public class PurpurWorldConfig {
@@ -1198,6 +1231,7 @@ public class PurpurWorldConfig {
set("mobs.panda.attributes.max_health", oldValue);
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -790,7 +790,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean parrotRidable = false;
@@ -1284,6 +1318,7 @@ public class PurpurWorldConfig {
@@ -1281,6 +1315,7 @@ public class PurpurWorldConfig {
public boolean pigControllable = true;
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
@@ -798,7 +798,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1295,6 +1330,7 @@ public class PurpurWorldConfig {
@@ -1292,6 +1327,7 @@ public class PurpurWorldConfig {
}
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
@@ -806,7 +806,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean piglinRidable = false;
@@ -1351,6 +1387,7 @@ public class PurpurWorldConfig {
@@ -1348,6 +1384,7 @@ public class PurpurWorldConfig {
public double polarBearMaxHealth = 30.0D;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -814,7 +814,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1364,6 +1401,7 @@ public class PurpurWorldConfig {
@@ -1361,6 +1398,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;
@@ -822,7 +822,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean pufferfishRidable = false;
@@ -1386,6 +1424,7 @@ public class PurpurWorldConfig {
@@ -1383,6 +1421,7 @@ public class PurpurWorldConfig {
public double rabbitMaxHealth = 3.0D;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -830,7 +830,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1398,6 +1437,7 @@ public class PurpurWorldConfig {
@@ -1395,6 +1434,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);
@@ -838,7 +838,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean ravagerRidable = false;
@@ -1434,6 +1474,7 @@ public class PurpurWorldConfig {
@@ -1431,6 +1471,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = true;
public boolean sheepControllable = true;
public double sheepMaxHealth = 8.0D;
@@ -846,7 +846,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1444,6 +1485,7 @@ public class PurpurWorldConfig {
@@ -1441,6 +1482,7 @@ public class PurpurWorldConfig {
set("mobs.sheep.attributes.max_health", oldValue);
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -854,7 +854,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean shulkerRidable = false;
@@ -1567,11 +1609,13 @@ public class PurpurWorldConfig {
@@ -1564,11 +1606,13 @@ public class PurpurWorldConfig {
public boolean snifferRidableInWater = true;
public boolean snifferControllable = true;
public double snifferMaxHealth = 14.0D;
@@ -868,7 +868,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean squidRidable = false;
@@ -1630,6 +1674,7 @@ public class PurpurWorldConfig {
@@ -1627,6 +1671,7 @@ public class PurpurWorldConfig {
public boolean striderRidableInWater = false;
public boolean striderControllable = true;
public double striderMaxHealth = 20.0D;
@@ -876,7 +876,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1640,6 +1685,7 @@ public class PurpurWorldConfig {
@@ -1637,6 +1682,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -884,7 +884,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean tadpoleRidable = false;
@@ -1660,6 +1706,7 @@ public class PurpurWorldConfig {
@@ -1657,6 +1703,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -892,7 +892,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1677,6 +1724,7 @@ public class PurpurWorldConfig {
@@ -1674,6 +1721,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);
@@ -900,7 +900,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean tropicalFishRidable = false;
@@ -1697,6 +1745,7 @@ public class PurpurWorldConfig {
@@ -1694,6 +1742,7 @@ public class PurpurWorldConfig {
public boolean turtleRidableInWater = true;
public boolean turtleControllable = true;
public double turtleMaxHealth = 30.0D;
@@ -908,7 +908,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void turtleSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1707,6 +1756,7 @@ public class PurpurWorldConfig {
@@ -1704,6 +1753,7 @@ public class PurpurWorldConfig {
set("mobs.turtle.attributes.max_health", oldValue);
}
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
@@ -916,7 +916,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean vexRidable = false;
@@ -1734,6 +1784,7 @@ public class PurpurWorldConfig {
@@ -1731,6 +1781,7 @@ public class PurpurWorldConfig {
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
public boolean villagerCanBreed = true;
@@ -924,7 +924,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1747,6 +1798,7 @@ public class PurpurWorldConfig {
@@ -1744,6 +1795,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);
@@ -932,7 +932,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean vindicatorRidable = false;
@@ -1858,6 +1910,7 @@ public class PurpurWorldConfig {
@@ -1855,6 +1907,7 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = true;
public boolean wolfControllable = true;
public double wolfMaxHealth = 8.0D;
@@ -940,7 +940,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1868,6 +1921,7 @@ public class PurpurWorldConfig {
@@ -1865,6 +1918,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

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

@@ -23,10 +23,10 @@ index 2a5ffaf5614e19305f4e08e15752364919e68a49..ecc0f221fca332b6f4d8feb72dbafc52
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 b991de8c4761f6fd82d0c8f325d90fa9e2425d9f..45654f3d541a8e66d283f044d20d2d48ee4f40a7 100644
index d7da9c83923f01e83ab6b8d50369d8281c6d6a63..64d7d6578d30c85792ac7b382907f1652af61b7d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1607,6 +1607,10 @@ public class PurpurWorldConfig {
@@ -1604,6 +1604,10 @@ public class PurpurWorldConfig {
public double snowGolemMaxHealth = 4.0D;
public boolean snowGolemDropsPumpkin = true;
public boolean snowGolemPutPumpkinBack = false;
@@ -37,7 +37,7 @@ index b991de8c4761f6fd82d0c8f325d90fa9e2425d9f..45654f3d541a8e66d283f044d20d2d48
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1620,6 +1624,10 @@ public class PurpurWorldConfig {
@@ -1617,6 +1621,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/0111-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
View File

@@ -176,10 +176,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 45654f3d541a8e66d283f044d20d2d48ee4f40a7..a22eefcf7929f8c36fdac4b96a7cdb70bc67e291 100644
index 64d7d6578d30c85792ac7b382907f1652af61b7d..441fc2eeb3695b690734e7767f71c9091e29aa58 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1810,6 +1810,8 @@ public class PurpurWorldConfig {
@@ -1807,6 +1807,8 @@ public class PurpurWorldConfig {
public boolean villagerCanBeLeashed = false;
public boolean villagerCanBreed = true;
public int villagerBreedingTicks = 6000;
@@ -188,7 +188,7 @@ index 45654f3d541a8e66d283f044d20d2d48ee4f40a7..a22eefcf7929f8c36fdac4b96a7cdb70
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1824,6 +1826,8 @@ public class PurpurWorldConfig {
@@ -1821,6 +1823,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/0112-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
View File

@@ -35,10 +35,10 @@ index 3d61b27c23d90e87fdfc8c170eafc116716ac047..67fd554cfd6b848ca1f2cf804ad4543a
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a22eefcf7929f8c36fdac4b96a7cdb70bc67e291..f1b84d4c4e19133e1d9b96c66dea83878469861e 100644
index 441fc2eeb3695b690734e7767f71c9091e29aa58..a6bead57f322850192534cdb798c2f946a447647 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2049,6 +2049,7 @@ public class PurpurWorldConfig {
@@ -2051,6 +2051,7 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinJockeyOnlyBaby = true;
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
@@ -46,7 +46,7 @@ index a22eefcf7929f8c36fdac4b96a7cdb70bc67e291..f1b84d4c4e19133e1d9b96c66dea8387
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -2063,5 +2064,6 @@ public class PurpurWorldConfig {
@@ -2065,5 +2066,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/0113-Configurable-chance-for-wolves-to-spawn-rabid.patch
View File

@@ -221,10 +221,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 f1b84d4c4e19133e1d9b96c66dea83878469861e..f30d14be52e736a14f3fde8be1b37e4c20ee80e2 100644
index a6bead57f322850192534cdb798c2f946a447647..eedb9ddaf04de55f5a5b42adc032be63c5f7a8b5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1939,6 +1939,8 @@ public class PurpurWorldConfig {
@@ -1936,6 +1936,8 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = true;
public boolean wolfControllable = true;
public double wolfMaxHealth = 8.0D;
@@ -233,7 +233,7 @@ index f1b84d4c4e19133e1d9b96c66dea83878469861e..f30d14be52e736a14f3fde8be1b37e4c
public int wolfBreedingTicks = 6000;
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
@@ -1950,6 +1952,8 @@ public class PurpurWorldConfig {
@@ -1947,6 +1949,8 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

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

@@ -43,7 +43,7 @@ index aa484d03ed31f6c60c0b4456a4047bc38a40ea4a..89627025c0b5464900a5ea818c7aaf5d
protected void registerGoals() {
this.goalSelector.addGoal(1, new FloatGoal(this));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f30d14be52e736a14f3fde8be1b37e4c20ee80e2..b4c1ab716d7428d663ddcaca9bb1a12ffcea99c9 100644
index eedb9ddaf04de55f5a5b42adc032be63c5f7a8b5..48272adb3d1d2ecbc68926605b92b85644f67fd9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -620,6 +620,7 @@ public class PurpurWorldConfig {
@@ -66,7 +66,7 @@ index f30d14be52e736a14f3fde8be1b37e4c20ee80e2..b4c1ab716d7428d663ddcaca9bb1a12f
}
public boolean caveSpiderRidable = false;
@@ -1939,6 +1945,7 @@ public class PurpurWorldConfig {
@@ -1936,6 +1942,7 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = true;
public boolean wolfControllable = true;
public double wolfMaxHealth = 8.0D;
@@ -74,7 +74,7 @@ index f30d14be52e736a14f3fde8be1b37e4c20ee80e2..b4c1ab716d7428d663ddcaca9bb1a12f
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -1952,6 +1959,11 @@ public class PurpurWorldConfig {
@@ -1949,6 +1956,11 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

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

@@ -17,10 +17,10 @@ index 776602b545f5ee3b566787befb0f43075ce02a29..29167ec21bc68e43c6505b6b1ee376d7
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b4c1ab716d7428d663ddcaca9bb1a12ffcea99c9..27b506558ad224c46fb47b984129ed392398ea09 100644
index 48272adb3d1d2ecbc68926605b92b85644f67fd9..8c5c8cab455fe134538c3af1eaeffbdb67472be9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1301,6 +1301,7 @@ public class PurpurWorldConfig {
@@ -1298,6 +1298,7 @@ public class PurpurWorldConfig {
public int phantomBurnInLight = 0;
public boolean phantomIgnorePlayersWithTorch = false;
public boolean phantomBurnInDaylight = true;
@@ -28,7 +28,7 @@ index b4c1ab716d7428d663ddcaca9bb1a12ffcea99c9..27b506558ad224c46fb47b984129ed39
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1334,6 +1335,7 @@ public class PurpurWorldConfig {
@@ -1331,6 +1332,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/0118-Striders-give-saddle-back.patch
View File

@@ -29,10 +29,10 @@ index 93dca4758ed995373fe1585930f225604a4153fa..4c077c94b654f54465ece2aa45c5ead0
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 a2a630df5880a32ae6cc05af7a4c39c0885ccc03..0f41f154f74d056e507742bea279c4fb2d2ffae5 100644
index 7e5c40ade6c26a5b6e2d8b1272cb8dcf15ab3d87..7da81baadd9159e6a72c39065a126e5958f9afd8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1713,6 +1713,7 @@ public class PurpurWorldConfig {
@@ -1710,6 +1710,7 @@ public class PurpurWorldConfig {
public boolean striderControllable = true;
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
@@ -40,7 +40,7 @@ index a2a630df5880a32ae6cc05af7a4c39c0885ccc03..0f41f154f74d056e507742bea279c4fb
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1724,6 +1725,7 @@ public class PurpurWorldConfig {
@@ -1721,6 +1722,7 @@ public class PurpurWorldConfig {
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);

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

@@ -374,7 +374,7 @@ index 1942649e868fc985a488034c411a6721595ecc67..7495e0e8beedad59fff24ebf189b58b3
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207abcc5e38 100644
index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c366eb863 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -117,8 +117,11 @@ public class PurpurWorldConfig {
@@ -518,7 +518,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
}
public boolean frogRidable = false;
@@ -1380,6 +1405,7 @@ public class PurpurWorldConfig {
@@ -1377,6 +1402,7 @@ public class PurpurWorldConfig {
public boolean piglinRidableInWater = true;
public boolean piglinControllable = true;
public double piglinMaxHealth = 16.0D;
@@ -526,7 +526,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1390,6 +1416,7 @@ public class PurpurWorldConfig {
@@ -1387,6 +1413,7 @@ public class PurpurWorldConfig {
set("mobs.piglin.attributes.max_health", oldValue);
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -534,7 +534,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
}
public boolean piglinBruteRidable = false;
@@ -1412,6 +1439,7 @@ public class PurpurWorldConfig {
@@ -1409,6 +1436,7 @@ public class PurpurWorldConfig {
public boolean pillagerRidableInWater = true;
public boolean pillagerControllable = true;
public double pillagerMaxHealth = 24.0D;
@@ -542,7 +542,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1422,6 +1450,7 @@ public class PurpurWorldConfig {
@@ -1419,6 +1447,7 @@ public class PurpurWorldConfig {
set("mobs.pillager.attributes.max_health", oldValue);
}
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -550,7 +550,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
}
public boolean polarBearRidable = false;
@@ -1468,6 +1497,7 @@ public class PurpurWorldConfig {
@@ -1465,6 +1494,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -558,7 +558,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1481,12 +1511,14 @@ public class PurpurWorldConfig {
@@ -1478,12 +1508,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 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1497,6 +1529,7 @@ public class PurpurWorldConfig {
@@ -1494,6 +1526,7 @@ public class PurpurWorldConfig {
set("mobs.ravager.attributes.max_health", oldValue);
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -581,7 +581,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
}
public boolean salmonRidable = false;
@@ -1518,6 +1551,7 @@ public class PurpurWorldConfig {
@@ -1515,6 +1548,7 @@ public class PurpurWorldConfig {
public boolean sheepControllable = true;
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
@@ -589,7 +589,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1529,6 +1563,7 @@ public class PurpurWorldConfig {
@@ -1526,6 +1560,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 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
}
public boolean shulkerRidable = false;
@@ -1551,6 +1586,7 @@ public class PurpurWorldConfig {
@@ -1548,6 +1583,7 @@ public class PurpurWorldConfig {
public boolean silverfishRidableInWater = true;
public boolean silverfishControllable = true;
public double silverfishMaxHealth = 8.0D;
@@ -605,7 +605,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1561,6 +1597,7 @@ public class PurpurWorldConfig {
@@ -1558,6 +1594,7 @@ public class PurpurWorldConfig {
set("mobs.silverfish.attributes.max_health", oldValue);
}
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -613,7 +613,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
}
public boolean skeletonRidable = false;
@@ -1637,6 +1674,7 @@ public class PurpurWorldConfig {
@@ -1634,6 +1671,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -621,7 +621,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1654,6 +1692,7 @@ public class PurpurWorldConfig {
@@ -1651,6 +1689,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 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
}
public boolean snifferRidable = false;
@@ -1840,6 +1879,7 @@ public class PurpurWorldConfig {
@@ -1837,6 +1876,7 @@ public class PurpurWorldConfig {
public int villagerBreedingTicks = 6000;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -637,7 +637,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1856,6 +1896,7 @@ public class PurpurWorldConfig {
@@ -1853,6 +1893,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 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
}
public boolean vindicatorRidable = false;
@@ -1928,6 +1969,7 @@ public class PurpurWorldConfig {
@@ -1925,6 +1966,7 @@ public class PurpurWorldConfig {
public double witherMaxHealth = 300.0D;
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
@@ -653,7 +653,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1945,6 +1987,7 @@ public class PurpurWorldConfig {
@@ -1942,6 +1984,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 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
}
public boolean witherSkeletonRidable = false;
@@ -2016,6 +2059,7 @@ public class PurpurWorldConfig {
@@ -2013,6 +2056,7 @@ public class PurpurWorldConfig {
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -669,7 +669,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2031,6 +2075,7 @@ public class PurpurWorldConfig {
@@ -2028,6 +2072,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);

158
patches/server/0128-Toggle-for-water-sensitive-mob-damage.patch
View File

@@ -1197,7 +1197,7 @@ index 41ddf073ecb8ea97cca8021390500d65866488a5..e2a9179bb7a5ecbc31d98a2410a09f5e
protected void registerGoals() {
this.goalSelector.addGoal(0, new FloatGoal(this));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca2d863351 100644
index 3b0ca461865113dfb8b033091ab9aeff2a2b9089..9ef200a75e65ce6813172e5426380df72a02d562 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -569,11 +569,13 @@ public class PurpurWorldConfig {
@@ -1261,7 +1261,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
+ blazeTakeDamageFromWater = getBoolean("mobs.blaze.takes-damage-from-water", blazeTakeDamageFromWater);
}
public double camelMaxHealthMin = 32.0D;
public int camelBreedingTicks = 6000;
@@ -672,6 +680,7 @@ public class PurpurWorldConfig {
public int catSpawnVillageScanRange = 48;
public int catBreedingTicks = 6000;
@@ -1658,7 +1658,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1217,6 +1276,7 @@ public class PurpurWorldConfig {
@@ -1214,6 +1273,7 @@ public class PurpurWorldConfig {
llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks);
@@ -1666,7 +1666,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean magmaCubeRidable = false;
@@ -1226,6 +1286,7 @@ public class PurpurWorldConfig {
@@ -1223,6 +1283,7 @@ public class PurpurWorldConfig {
public String magmaCubeAttackDamage = "size";
public Map<Integer, Double> magmaCubeMaxHealthCache = new HashMap<>();
public Map<Integer, Double> magmaCubeAttackDamageCache = new HashMap<>();
@@ -1674,7 +1674,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void magmaCubeSettings() {
magmaCubeRidable = getBoolean("mobs.magma_cube.ridable", magmaCubeRidable);
magmaCubeRidableInWater = getBoolean("mobs.magma_cube.ridable-in-water", magmaCubeRidableInWater);
@@ -1239,6 +1300,7 @@ public class PurpurWorldConfig {
@@ -1236,6 +1297,7 @@ public class PurpurWorldConfig {
magmaCubeAttackDamage = getString("mobs.magma_cube.attributes.attack_damage", magmaCubeAttackDamage);
magmaCubeMaxHealthCache.clear();
magmaCubeAttackDamageCache.clear();
@@ -1682,7 +1682,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean mooshroomRidable = false;
@@ -1246,6 +1308,7 @@ public class PurpurWorldConfig {
@@ -1243,6 +1305,7 @@ public class PurpurWorldConfig {
public boolean mooshroomControllable = true;
public double mooshroomMaxHealth = 10.0D;
public int mooshroomBreedingTicks = 6000;
@@ -1690,7 +1690,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1257,6 +1320,7 @@ public class PurpurWorldConfig {
@@ -1254,6 +1317,7 @@ public class PurpurWorldConfig {
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
mooshroomBreedingTicks = getInt("mobs.mooshroom.breeding-delay-ticks", mooshroomBreedingTicks);
@@ -1698,7 +1698,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean muleRidableInWater = false;
@@ -1267,6 +1331,7 @@ public class PurpurWorldConfig {
@@ -1264,6 +1328,7 @@ public class PurpurWorldConfig {
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
public int muleBreedingTicks = 6000;
@@ -1706,7 +1706,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1283,6 +1348,7 @@ public class PurpurWorldConfig {
@@ -1280,6 +1345,7 @@ public class PurpurWorldConfig {
muleMovementSpeedMin = getDouble("mobs.mule.attributes.movement_speed.min", muleMovementSpeedMin);
muleMovementSpeedMax = getDouble("mobs.mule.attributes.movement_speed.max", muleMovementSpeedMax);
muleBreedingTicks = getInt("mobs.mule.breeding-delay-ticks", muleBreedingTicks);
@@ -1714,7 +1714,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean ocelotRidable = false;
@@ -1290,6 +1356,7 @@ public class PurpurWorldConfig {
@@ -1287,6 +1353,7 @@ public class PurpurWorldConfig {
public boolean ocelotControllable = true;
public double ocelotMaxHealth = 10.0D;
public int ocelotBreedingTicks = 6000;
@@ -1722,7 +1722,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1301,6 +1368,7 @@ public class PurpurWorldConfig {
@@ -1298,6 +1365,7 @@ public class PurpurWorldConfig {
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
ocelotBreedingTicks = getInt("mobs.ocelot.breeding-delay-ticks", ocelotBreedingTicks);
@@ -1730,7 +1730,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean pandaRidable = false;
@@ -1308,6 +1376,7 @@ public class PurpurWorldConfig {
@@ -1305,6 +1373,7 @@ public class PurpurWorldConfig {
public boolean pandaControllable = true;
public double pandaMaxHealth = 20.0D;
public int pandaBreedingTicks = 6000;
@@ -1738,7 +1738,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1319,6 +1388,7 @@ public class PurpurWorldConfig {
@@ -1316,6 +1385,7 @@ public class PurpurWorldConfig {
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
pandaBreedingTicks = getInt("mobs.panda.breeding-delay-ticks", pandaBreedingTicks);
@@ -1746,7 +1746,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean parrotRidable = false;
@@ -1326,6 +1396,7 @@ public class PurpurWorldConfig {
@@ -1323,6 +1393,7 @@ public class PurpurWorldConfig {
public boolean parrotControllable = true;
public double parrotMaxY = 320D;
public double parrotMaxHealth = 6.0D;
@@ -1754,7 +1754,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void parrotSettings() {
parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable);
parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater);
@@ -1337,6 +1408,7 @@ public class PurpurWorldConfig {
@@ -1334,6 +1405,7 @@ public class PurpurWorldConfig {
set("mobs.parrot.attributes.max_health", oldValue);
}
parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth);
@@ -1762,7 +1762,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean phantomRidable = false;
@@ -1363,6 +1435,7 @@ public class PurpurWorldConfig {
@@ -1360,6 +1432,7 @@ public class PurpurWorldConfig {
public boolean phantomIgnorePlayersWithTorch = false;
public boolean phantomBurnInDaylight = true;
public boolean phantomFlamesOnSwoop = false;
@@ -1770,7 +1770,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1397,6 +1470,7 @@ public class PurpurWorldConfig {
@@ -1394,6 +1467,7 @@ public class PurpurWorldConfig {
phantomBurnInDaylight = getBoolean("mobs.phantom.burn-in-daylight", phantomBurnInDaylight);
phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch);
phantomFlamesOnSwoop = getBoolean("mobs.phantom.flames-on-swoop", phantomFlamesOnSwoop);
@@ -1778,7 +1778,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean pigRidable = false;
@@ -1405,6 +1479,7 @@ public class PurpurWorldConfig {
@@ -1402,6 +1476,7 @@ public class PurpurWorldConfig {
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
public int pigBreedingTicks = 6000;
@@ -1786,7 +1786,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1417,6 +1492,7 @@ public class PurpurWorldConfig {
@@ -1414,6 +1489,7 @@ public class PurpurWorldConfig {
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
pigBreedingTicks = getInt("mobs.pig.breeding-delay-ticks", pigBreedingTicks);
@@ -1794,7 +1794,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean piglinRidable = false;
@@ -1424,6 +1500,7 @@ public class PurpurWorldConfig {
@@ -1421,6 +1497,7 @@ public class PurpurWorldConfig {
public boolean piglinControllable = true;
public double piglinMaxHealth = 16.0D;
public boolean piglinBypassMobGriefing = false;
@@ -1802,7 +1802,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1435,12 +1512,14 @@ public class PurpurWorldConfig {
@@ -1432,12 +1509,14 @@ public class PurpurWorldConfig {
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
piglinBypassMobGriefing = getBoolean("mobs.piglin.bypass-mob-griefing", piglinBypassMobGriefing);
@@ -1817,7 +1817,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void piglinBruteSettings() {
piglinBruteRidable = getBoolean("mobs.piglin_brute.ridable", piglinBruteRidable);
piglinBruteRidableInWater = getBoolean("mobs.piglin_brute.ridable-in-water", piglinBruteRidableInWater);
@@ -1451,6 +1530,7 @@ public class PurpurWorldConfig {
@@ -1448,6 +1527,7 @@ public class PurpurWorldConfig {
set("mobs.piglin_brute.attributes.max_health", oldValue);
}
piglinBruteMaxHealth = getDouble("mobs.piglin_brute.attributes.max_health", piglinBruteMaxHealth);
@@ -1825,7 +1825,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean pillagerRidable = false;
@@ -1458,6 +1538,7 @@ public class PurpurWorldConfig {
@@ -1455,6 +1535,7 @@ public class PurpurWorldConfig {
public boolean pillagerControllable = true;
public double pillagerMaxHealth = 24.0D;
public boolean pillagerBypassMobGriefing = false;
@@ -1833,7 +1833,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1469,6 +1550,7 @@ public class PurpurWorldConfig {
@@ -1466,6 +1547,7 @@ public class PurpurWorldConfig {
}
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
pillagerBypassMobGriefing = getBoolean("mobs.pillager.bypass-mob-griefing", pillagerBypassMobGriefing);
@@ -1841,7 +1841,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean polarBearRidable = false;
@@ -1478,6 +1560,7 @@ public class PurpurWorldConfig {
@@ -1475,6 +1557,7 @@ public class PurpurWorldConfig {
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
public int polarBearBreedingTicks = 6000;
@@ -1849,7 +1849,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1492,11 +1575,13 @@ public class PurpurWorldConfig {
@@ -1489,11 +1572,13 @@ public class PurpurWorldConfig {
Item item = BuiltInRegistries.ITEM.get(new ResourceLocation(polarBearBreedableItemString));
if (item != Items.AIR) polarBearBreedableItem = item;
polarBearBreedingTicks = getInt("mobs.polar_bear.breeding-delay-ticks", polarBearBreedingTicks);
@@ -1863,7 +1863,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void pufferfishSettings() {
pufferfishRidable = getBoolean("mobs.pufferfish.ridable", pufferfishRidable);
pufferfishControllable = getBoolean("mobs.pufferfish.controllable", pufferfishControllable);
@@ -1506,6 +1591,7 @@ public class PurpurWorldConfig {
@@ -1503,6 +1588,7 @@ public class PurpurWorldConfig {
set("mobs.pufferfish.attributes.max_health", oldValue);
}
pufferfishMaxHealth = getDouble("mobs.pufferfish.attributes.max_health", pufferfishMaxHealth);
@@ -1871,7 +1871,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean rabbitRidable = false;
@@ -1516,6 +1602,7 @@ public class PurpurWorldConfig {
@@ -1513,6 +1599,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
public boolean rabbitBypassMobGriefing = false;
@@ -1879,7 +1879,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1530,6 +1617,7 @@ public class PurpurWorldConfig {
@@ -1527,6 +1614,7 @@ public class PurpurWorldConfig {
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks);
rabbitBypassMobGriefing = getBoolean("mobs.rabbit.bypass-mob-griefing", rabbitBypassMobGriefing);
@@ -1887,7 +1887,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean ravagerRidable = false;
@@ -1537,6 +1625,7 @@ public class PurpurWorldConfig {
@@ -1534,6 +1622,7 @@ public class PurpurWorldConfig {
public boolean ravagerControllable = true;
public double ravagerMaxHealth = 100.0D;
public boolean ravagerBypassMobGriefing = false;
@@ -1895,7 +1895,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1548,11 +1637,13 @@ public class PurpurWorldConfig {
@@ -1545,11 +1634,13 @@ public class PurpurWorldConfig {
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
ravagerBypassMobGriefing = getBoolean("mobs.ravager.bypass-mob-griefing", ravagerBypassMobGriefing);
@@ -1909,7 +1909,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void salmonSettings() {
salmonRidable = getBoolean("mobs.salmon.ridable", salmonRidable);
salmonControllable = getBoolean("mobs.salmon.controllable", salmonControllable);
@@ -1562,6 +1653,7 @@ public class PurpurWorldConfig {
@@ -1559,6 +1650,7 @@ public class PurpurWorldConfig {
set("mobs.salmon.attributes.max_health", oldValue);
}
salmonMaxHealth = getDouble("mobs.salmon.attributes.max_health", salmonMaxHealth);
@@ -1917,7 +1917,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean sheepRidable = false;
@@ -1570,6 +1662,7 @@ public class PurpurWorldConfig {
@@ -1567,6 +1659,7 @@ public class PurpurWorldConfig {
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
public boolean sheepBypassMobGriefing = false;
@@ -1925,7 +1925,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1582,12 +1675,14 @@ public class PurpurWorldConfig {
@@ -1579,12 +1672,14 @@ public class PurpurWorldConfig {
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
sheepBypassMobGriefing = getBoolean("mobs.sheep.bypass-mob-griefing", sheepBypassMobGriefing);
@@ -1940,7 +1940,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -1598,6 +1693,7 @@ public class PurpurWorldConfig {
@@ -1595,6 +1690,7 @@ public class PurpurWorldConfig {
set("mobs.shulker.attributes.max_health", oldValue);
}
shulkerMaxHealth = getDouble("mobs.shulker.attributes.max_health", shulkerMaxHealth);
@@ -1948,7 +1948,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean silverfishRidable = false;
@@ -1605,6 +1701,7 @@ public class PurpurWorldConfig {
@@ -1602,6 +1698,7 @@ public class PurpurWorldConfig {
public boolean silverfishControllable = true;
public double silverfishMaxHealth = 8.0D;
public boolean silverfishBypassMobGriefing = false;
@@ -1956,7 +1956,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1616,12 +1713,14 @@ public class PurpurWorldConfig {
@@ -1613,12 +1710,14 @@ public class PurpurWorldConfig {
}
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
silverfishBypassMobGriefing = getBoolean("mobs.silverfish.bypass-mob-griefing", silverfishBypassMobGriefing);
@@ -1971,7 +1971,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -1632,6 +1731,7 @@ public class PurpurWorldConfig {
@@ -1629,6 +1728,7 @@ public class PurpurWorldConfig {
set("mobs.skeleton.attributes.max_health", oldValue);
}
skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
@@ -1979,7 +1979,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean skeletonHorseRidableInWater = true;
@@ -1642,6 +1742,7 @@ public class PurpurWorldConfig {
@@ -1639,6 +1739,7 @@ public class PurpurWorldConfig {
public double skeletonHorseJumpStrengthMax = 1.0D;
public double skeletonHorseMovementSpeedMin = 0.2D;
public double skeletonHorseMovementSpeedMax = 0.2D;
@@ -1987,7 +1987,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void skeletonHorseSettings() {
skeletonHorseRidableInWater = getBoolean("mobs.skeleton_horse.ridable-in-water", skeletonHorseRidableInWater);
skeletonHorseCanSwim = getBoolean("mobs.skeleton_horse.can-swim", skeletonHorseCanSwim);
@@ -1657,6 +1758,7 @@ public class PurpurWorldConfig {
@@ -1654,6 +1755,7 @@ public class PurpurWorldConfig {
skeletonHorseJumpStrengthMax = getDouble("mobs.skeleton_horse.attributes.jump_strength.max", skeletonHorseJumpStrengthMax);
skeletonHorseMovementSpeedMin = getDouble("mobs.skeleton_horse.attributes.movement_speed.min", skeletonHorseMovementSpeedMin);
skeletonHorseMovementSpeedMax = getDouble("mobs.skeleton_horse.attributes.movement_speed.max", skeletonHorseMovementSpeedMax);
@@ -1995,7 +1995,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean slimeRidable = false;
@@ -1666,6 +1768,7 @@ public class PurpurWorldConfig {
@@ -1663,6 +1765,7 @@ public class PurpurWorldConfig {
public String slimeAttackDamage = "size";
public Map<Integer, Double> slimeMaxHealthCache = new HashMap<>();
public Map<Integer, Double> slimeAttackDamageCache = new HashMap<>();
@@ -2003,7 +2003,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void slimeSettings() {
slimeRidable = getBoolean("mobs.slime.ridable", slimeRidable);
slimeRidableInWater = getBoolean("mobs.slime.ridable-in-water", slimeRidableInWater);
@@ -1679,6 +1782,7 @@ public class PurpurWorldConfig {
@@ -1676,6 +1779,7 @@ public class PurpurWorldConfig {
slimeAttackDamage = getString("mobs.slime.attributes.attack_damage", slimeAttackDamage);
slimeMaxHealthCache.clear();
slimeAttackDamageCache.clear();
@@ -2011,7 +2011,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean snowGolemRidable = false;
@@ -1693,6 +1797,7 @@ public class PurpurWorldConfig {
@@ -1690,6 +1794,7 @@ public class PurpurWorldConfig {
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
public boolean snowGolemBypassMobGriefing = false;
@@ -2019,7 +2019,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1711,6 +1816,7 @@ public class PurpurWorldConfig {
@@ -1708,6 +1813,7 @@ public class PurpurWorldConfig {
snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
snowGolemBypassMobGriefing = getBoolean("mobs.snow_golem.bypass-mob-griefing", snowGolemBypassMobGriefing);
@@ -2027,7 +2027,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean snifferRidable = false;
@@ -1732,6 +1838,7 @@ public class PurpurWorldConfig {
@@ -1729,6 +1835,7 @@ public class PurpurWorldConfig {
public boolean squidImmuneToEAR = true;
public double squidOffsetWaterCheck = 0.0D;
public boolean squidsCanFly = false;
@@ -2035,7 +2035,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -1744,12 +1851,14 @@ public class PurpurWorldConfig {
@@ -1741,12 +1848,14 @@ public class PurpurWorldConfig {
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);
squidsCanFly = getBoolean("mobs.squid.can-fly", squidsCanFly);
@@ -2050,7 +2050,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void spiderSettings() {
spiderRidable = getBoolean("mobs.spider.ridable", spiderRidable);
spiderRidableInWater = getBoolean("mobs.spider.ridable-in-water", spiderRidableInWater);
@@ -1760,12 +1869,14 @@ public class PurpurWorldConfig {
@@ -1757,12 +1866,14 @@ public class PurpurWorldConfig {
set("mobs.spider.attributes.max_health", oldValue);
}
spiderMaxHealth = getDouble("mobs.spider.attributes.max_health", spiderMaxHealth);
@@ -2065,7 +2065,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void straySettings() {
strayRidable = getBoolean("mobs.stray.ridable", strayRidable);
strayRidableInWater = getBoolean("mobs.stray.ridable-in-water", strayRidableInWater);
@@ -1776,6 +1887,7 @@ public class PurpurWorldConfig {
@@ -1773,6 +1884,7 @@ public class PurpurWorldConfig {
set("mobs.stray.attributes.max_health", oldValue);
}
strayMaxHealth = getDouble("mobs.stray.attributes.max_health", strayMaxHealth);
@@ -2073,7 +2073,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean striderRidable = false;
@@ -1784,6 +1896,7 @@ public class PurpurWorldConfig {
@@ -1781,6 +1893,7 @@ public class PurpurWorldConfig {
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
@@ -2081,7 +2081,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1796,6 +1909,7 @@ public class PurpurWorldConfig {
@@ -1793,6 +1906,7 @@ public class PurpurWorldConfig {
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);
striderGiveSaddleBack = getBoolean("mobs.strider.give-saddle-back", striderGiveSaddleBack);
@@ -2089,7 +2089,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean tadpoleRidable = false;
@@ -1817,6 +1931,7 @@ public class PurpurWorldConfig {
@@ -1814,6 +1928,7 @@ public class PurpurWorldConfig {
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
public int traderLlamaBreedingTicks = 6000;
@@ -2097,7 +2097,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1835,11 +1950,13 @@ public class PurpurWorldConfig {
@@ -1832,11 +1947,13 @@ public class PurpurWorldConfig {
traderLlamaMovementSpeedMin = getDouble("mobs.trader_llama.attributes.movement_speed.min", traderLlamaMovementSpeedMin);
traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
traderLlamaBreedingTicks = getInt("mobs.trader_llama.breeding-delay-ticks", traderLlamaBreedingTicks);
@@ -2111,7 +2111,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void tropicalFishSettings() {
tropicalFishRidable = getBoolean("mobs.tropical_fish.ridable", tropicalFishRidable);
tropicalFishControllable = getBoolean("mobs.tropical_fish.controllable", tropicalFishControllable);
@@ -1849,6 +1966,7 @@ public class PurpurWorldConfig {
@@ -1846,6 +1963,7 @@ public class PurpurWorldConfig {
set("mobs.tropical_fish.attributes.max_health", oldValue);
}
tropicalFishMaxHealth = getDouble("mobs.tropical_fish.attributes.max_health", tropicalFishMaxHealth);
@@ -2119,7 +2119,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean turtleRidable = false;
@@ -1856,6 +1974,7 @@ public class PurpurWorldConfig {
@@ -1853,6 +1971,7 @@ public class PurpurWorldConfig {
public boolean turtleControllable = true;
public double turtleMaxHealth = 30.0D;
public int turtleBreedingTicks = 6000;
@@ -2127,7 +2127,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void turtleSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1867,6 +1986,7 @@ public class PurpurWorldConfig {
@@ -1864,6 +1983,7 @@ public class PurpurWorldConfig {
}
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
turtleBreedingTicks = getInt("mobs.turtle.breeding-delay-ticks", turtleBreedingTicks);
@@ -2135,7 +2135,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean vexRidable = false;
@@ -1874,6 +1994,7 @@ public class PurpurWorldConfig {
@@ -1871,6 +1991,7 @@ public class PurpurWorldConfig {
public boolean vexControllable = true;
public double vexMaxY = 320D;
public double vexMaxHealth = 14.0D;
@@ -2143,7 +2143,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void vexSettings() {
vexRidable = getBoolean("mobs.vex.ridable", vexRidable);
vexRidableInWater = getBoolean("mobs.vex.ridable-in-water", vexRidableInWater);
@@ -1885,6 +2006,7 @@ public class PurpurWorldConfig {
@@ -1882,6 +2003,7 @@ public class PurpurWorldConfig {
set("mobs.vex.attributes.max_health", oldValue);
}
vexMaxHealth = getDouble("mobs.vex.attributes.max_health", vexMaxHealth);
@@ -2151,7 +2151,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean villagerRidable = false;
@@ -1898,6 +2020,7 @@ public class PurpurWorldConfig {
@@ -1895,6 +2017,7 @@ public class PurpurWorldConfig {
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
@@ -2159,7 +2159,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1915,6 +2038,7 @@ public class PurpurWorldConfig {
@@ -1912,6 +2035,7 @@ public class PurpurWorldConfig {
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
@@ -2167,7 +2167,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean vindicatorRidable = false;
@@ -1922,6 +2046,7 @@ public class PurpurWorldConfig {
@@ -1919,6 +2043,7 @@ public class PurpurWorldConfig {
public boolean vindicatorControllable = true;
public double vindicatorMaxHealth = 24.0D;
public double vindicatorJohnnySpawnChance = 0D;
@@ -2175,7 +2175,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void vindicatorSettings() {
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
@@ -1933,6 +2058,7 @@ public class PurpurWorldConfig {
@@ -1930,6 +2055,7 @@ public class PurpurWorldConfig {
}
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);
vindicatorJohnnySpawnChance = getDouble("mobs.vindicator.johnny.spawn-chance", vindicatorJohnnySpawnChance);
@@ -2183,7 +2183,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean wanderingTraderRidable = false;
@@ -1941,6 +2067,7 @@ public class PurpurWorldConfig {
@@ -1938,6 +2064,7 @@ public class PurpurWorldConfig {
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
@@ -2191,7 +2191,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1953,6 +2080,7 @@ public class PurpurWorldConfig {
@@ -1950,6 +2077,7 @@ public class PurpurWorldConfig {
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);
@@ -2199,7 +2199,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean wardenRidable = false;
@@ -1968,6 +2096,7 @@ public class PurpurWorldConfig {
@@ -1965,6 +2093,7 @@ public class PurpurWorldConfig {
public boolean witchRidableInWater = true;
public boolean witchControllable = true;
public double witchMaxHealth = 26.0D;
@@ -2207,7 +2207,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void witchSettings() {
witchRidable = getBoolean("mobs.witch.ridable", witchRidable);
witchRidableInWater = getBoolean("mobs.witch.ridable-in-water", witchRidableInWater);
@@ -1978,6 +2107,7 @@ public class PurpurWorldConfig {
@@ -1975,6 +2104,7 @@ public class PurpurWorldConfig {
set("mobs.witch.attributes.max_health", oldValue);
}
witchMaxHealth = getDouble("mobs.witch.attributes.max_health", witchMaxHealth);
@@ -2215,7 +2215,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean witherRidable = false;
@@ -1988,6 +2118,7 @@ public class PurpurWorldConfig {
@@ -1985,6 +2115,7 @@ public class PurpurWorldConfig {
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
public boolean witherBypassMobGriefing = false;
@@ -2223,7 +2223,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2006,12 +2137,14 @@ public class PurpurWorldConfig {
@@ -2003,12 +2134,14 @@ public class PurpurWorldConfig {
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
@@ -2238,7 +2238,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void witherSkeletonSettings() {
witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable);
witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater);
@@ -2022,6 +2155,7 @@ public class PurpurWorldConfig {
@@ -2019,6 +2152,7 @@ public class PurpurWorldConfig {
set("mobs.wither_skeleton.attributes.max_health", oldValue);
}
witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth);
@@ -2246,7 +2246,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean wolfRidable = false;
@@ -2032,6 +2166,7 @@ public class PurpurWorldConfig {
@@ -2029,6 +2163,7 @@ public class PurpurWorldConfig {
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -2254,7 +2254,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -2050,12 +2185,14 @@ public class PurpurWorldConfig {
@@ -2047,12 +2182,14 @@ public class PurpurWorldConfig {
wolfMilkCuresRabies = getBoolean("mobs.wolf.milk-cures-rabid-wolves", wolfMilkCuresRabies);
wolfNaturalRabid = getDouble("mobs.wolf.spawn-rabid-chance", wolfNaturalRabid);
wolfBreedingTicks = getInt("mobs.wolf.breeding-delay-ticks", wolfBreedingTicks);
@@ -2269,7 +2269,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void zoglinSettings() {
zoglinRidable = getBoolean("mobs.zoglin.ridable", zoglinRidable);
zoglinRidableInWater = getBoolean("mobs.zoglin.ridable-in-water", zoglinRidableInWater);
@@ -2066,6 +2203,7 @@ public class PurpurWorldConfig {
@@ -2063,6 +2200,7 @@ public class PurpurWorldConfig {
set("mobs.zoglin.attributes.max_health", oldValue);
}
zoglinMaxHealth = getDouble("mobs.zoglin.attributes.max_health", zoglinMaxHealth);
@@ -2277,7 +2277,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean zombieRidable = false;
@@ -2078,6 +2216,7 @@ public class PurpurWorldConfig {
@@ -2075,6 +2213,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public boolean zombieBypassMobGriefing = false;
@@ -2285,7 +2285,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2094,6 +2233,7 @@ public class PurpurWorldConfig {
@@ -2091,6 +2230,7 @@ public class PurpurWorldConfig {
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
@@ -2293,7 +2293,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean zombieHorseRidableInWater = false;
@@ -2105,6 +2245,7 @@ public class PurpurWorldConfig {
@@ -2102,6 +2242,7 @@ public class PurpurWorldConfig {
public double zombieHorseMovementSpeedMin = 0.2D;
public double zombieHorseMovementSpeedMax = 0.2D;
public double zombieHorseSpawnChance = 0.0D;
@@ -2301,7 +2301,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void zombieHorseSettings() {
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
@@ -2121,6 +2262,7 @@ public class PurpurWorldConfig {
@@ -2118,6 +2259,7 @@ public class PurpurWorldConfig {
zombieHorseMovementSpeedMin = getDouble("mobs.zombie_horse.attributes.movement_speed.min", zombieHorseMovementSpeedMin);
zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);
zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
@@ -2309,7 +2309,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean zombieVillagerRidable = false;
@@ -2131,6 +2273,7 @@ public class PurpurWorldConfig {
@@ -2128,6 +2270,7 @@ public class PurpurWorldConfig {
public boolean zombieVillagerJockeyOnlyBaby = true;
public double zombieVillagerJockeyChance = 0.05D;
public boolean zombieVillagerJockeyTryExistingChickens = true;
@@ -2317,7 +2317,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2140,6 +2283,7 @@ public class PurpurWorldConfig {
@@ -2142,6 +2285,7 @@ public class PurpurWorldConfig {
zombieVillagerJockeyOnlyBaby = getBoolean("mobs.zombie_villager.jockey.only-babies", zombieVillagerJockeyOnlyBaby);
zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
@@ -2325,7 +2325,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
}
public boolean zombifiedPiglinRidable = false;
@@ -2151,6 +2295,7 @@ public class PurpurWorldConfig {
@@ -2153,6 +2297,7 @@ public class PurpurWorldConfig {
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
@@ -2333,7 +2333,7 @@ index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -2166,5 +2311,6 @@ public class PurpurWorldConfig {
@@ -2168,5 +2313,6 @@ public class PurpurWorldConfig {
zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);

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

@@ -29,7 +29,7 @@ index 94027ef3f833c7170a99a8437740b7f99f30ab81..1f9a57c4fd251e2969b49a883ee12d3c
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 81d720ae34e0daa6b55c46dd2f65464abe9e87a5..d0f08bd9028bdc1720a3bc47e82a1fd8103f2ffe 100644
index c513307cb020ef6edefe3da16c00a5569b6d6624..260ff2fc3f3c0c22f41add4efa39bcebf8f256e1 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -946,6 +946,7 @@ public class PurpurWorldConfig {
@@ -48,7 +48,7 @@ index 81d720ae34e0daa6b55c46dd2f65464abe9e87a5..d0f08bd9028bdc1720a3bc47e82a1fd8
}
public boolean endermanRidable = false;
@@ -2158,6 +2160,7 @@ public class PurpurWorldConfig {
@@ -2155,6 +2157,7 @@ public class PurpurWorldConfig {
public int witherHealthRegenDelay = 20;
public boolean witherBypassMobGriefing = false;
public boolean witherTakeDamageFromWater = false;
@@ -56,7 +56,7 @@ index 81d720ae34e0daa6b55c46dd2f65464abe9e87a5..d0f08bd9028bdc1720a3bc47e82a1fd8
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2177,6 +2180,7 @@ public class PurpurWorldConfig {
@@ -2174,6 +2177,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);

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

@@ -32,7 +32,7 @@ index 2c5f4ead1141269a029176140c4df848c75b9620..26ed1eef3b38e643dfc6738e4b7880c9
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 998947e5f110e00af1dfcc5043be936ef460ef71..40f19ca373028a84e46d4ad9bc2b836968d677d5 100644
index e87dfc7d4966e2f24c6aeeb638cbe4452e6b4445..256a3fc6f65a4a31dcad512615e9224116ee035f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1330,6 +1330,7 @@ public class PurpurWorldConfig {
@@ -43,7 +43,7 @@ index 998947e5f110e00af1dfcc5043be936ef460ef71..40f19ca373028a84e46d4ad9bc2b8369
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1352,6 +1353,7 @@ public class PurpurWorldConfig {
@@ -1349,6 +1350,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);

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

@@ -31,10 +31,10 @@ index cf7007cabe4ba7505f2728e79e4c56e2d1bc878b..c431ec19212821ba7722c073e5ee6ad7
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f6f374858a16135347da30d86ba051569062c7d4..29d0653160a3035e0a7dfea906cf2ab7fc67205e 100644
index dd953c9814560855f5e2c1bafb3df7f08065354c..ffb2cbd940ec795c680e3254161dafb57fa35fef 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1705,6 +1705,7 @@ public class PurpurWorldConfig {
@@ -1702,6 +1702,7 @@ public class PurpurWorldConfig {
public double ravagerMaxHealth = 100.0D;
public boolean ravagerBypassMobGriefing = false;
public boolean ravagerTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index f6f374858a16135347da30d86ba051569062c7d4..29d0653160a3035e0a7dfea906cf2ab7
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1717,6 +1718,23 @@ public class PurpurWorldConfig {
@@ -1714,6 +1715,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/0145-Add-config-for-villager-trading.patch
View File

@@ -31,10 +31,10 @@ index e2a9179bb7a5ecbc31d98a2410a09f5e2107234b..8fd8778e918566504666213a102a7ee2
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 80b76a20848321e982e8b542aa9f5295cfd7e3dd..f2efffa40204c658375f3ebba8ab710bf3cacb80 100644
index 564b9165f226a0973eb64a0f867b1a16e6861b12..7ab515dd4278aec16b3c7fc6cb5f820e12c3e710 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2125,6 +2125,7 @@ public class PurpurWorldConfig {
@@ -2122,6 +2122,7 @@ public class PurpurWorldConfig {
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
public boolean villagerTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index 80b76a20848321e982e8b542aa9f5295cfd7e3dd..f2efffa40204c658375f3ebba8ab710b
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2143,6 +2144,7 @@ public class PurpurWorldConfig {
@@ -2140,6 +2141,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 80b76a20848321e982e8b542aa9f5295cfd7e3dd..f2efffa40204c658375f3ebba8ab710b
}
public boolean vindicatorRidable = false;
@@ -2172,6 +2174,7 @@ public class PurpurWorldConfig {
@@ -2169,6 +2171,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
public boolean wanderingTraderTakeDamageFromWater = false;
@@ -58,7 +58,7 @@ index 80b76a20848321e982e8b542aa9f5295cfd7e3dd..f2efffa40204c658375f3ebba8ab710b
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -2185,6 +2188,7 @@ public class PurpurWorldConfig {
@@ -2182,6 +2185,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/0156-Piglin-portal-spawn-modifier.patch
View File

@@ -31,10 +31,10 @@ index 2c085c4a154cb0f8a1d38453f43474a764398784..589b437e7c97c846410f293e2f014bdc
pos = pos.below();
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5e0648856dcb71f218464d8b0b74e00e2d520efa..644652189ca1b173776537fa9d17aa31b38cdfe1 100644
index 03035b639d70e82e777d01f0c0bfeb097febc18f..df6650f918309c8da89409a691aa088266a204a3 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1649,6 +1649,7 @@ public class PurpurWorldConfig {
@@ -1646,6 +1646,7 @@ public class PurpurWorldConfig {
public double piglinMaxHealth = 16.0D;
public boolean piglinBypassMobGriefing = false;
public boolean piglinTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index 5e0648856dcb71f218464d8b0b74e00e2d520efa..644652189ca1b173776537fa9d17aa31
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1661,6 +1662,7 @@ public class PurpurWorldConfig {
@@ -1658,6 +1659,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/0158-Config-for-wither-explosion-radius.patch
View File

@@ -18,10 +18,10 @@ index 80b86d5dd68c3d288a1a61ea8aa1cba9d899aa1c..7847915fb90e45e44ba514957193fa7b
if (!event.isCancelled()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 644652189ca1b173776537fa9d17aa31b38cdfe1..3ff04b2071b6a8d52fd122a39f215ff816eed393 100644
index df6650f918309c8da89409a691aa088266a204a3..23d463f2c2c37576a11bb79605943513bc86a9b6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2292,6 +2292,7 @@ public class PurpurWorldConfig {
@@ -2289,6 +2289,7 @@ public class PurpurWorldConfig {
public boolean witherBypassMobGriefing = false;
public boolean witherTakeDamageFromWater = false;
public boolean witherCanRideVehicles = false;
@@ -29,7 +29,7 @@ index 644652189ca1b173776537fa9d17aa31b38cdfe1..3ff04b2071b6a8d52fd122a39f215ff8
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2312,6 +2313,7 @@ public class PurpurWorldConfig {
@@ -2309,6 +2310,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);

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

@@ -50,10 +50,10 @@ index 08935a1f2c4a3f43483719686e5baab5063cdfce..bfae3b94ab035e1c27c988cfcc3b449c
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 8116edb1eab9da68d86c33633f4558a474b25388..460a9d7191caa63a896b39e6e4b72239bfd3d967 100644
index 24d2790b9d4d83b2bcd102d16b138d83f7f982ed..609ddb73472ba1825a5896cdfa44cf18df98e234 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1573,6 +1573,7 @@ public class PurpurWorldConfig {
@@ -1570,6 +1570,7 @@ public class PurpurWorldConfig {
public double parrotMaxY = 320D;
public double parrotMaxHealth = 6.0D;
public boolean parrotTakeDamageFromWater = false;
@@ -61,7 +61,7 @@ index 8116edb1eab9da68d86c33633f4558a474b25388..460a9d7191caa63a896b39e6e4b72239
private void parrotSettings() {
parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable);
parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater);
@@ -1585,6 +1586,7 @@ public class PurpurWorldConfig {
@@ -1582,6 +1583,7 @@ public class PurpurWorldConfig {
}
parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth);
parrotTakeDamageFromWater = getBoolean("mobs.parrot.takes-damage-from-water", parrotTakeDamageFromWater);

12
patches/server/0173-ShulkerBox-allow-oversized-stacks.patch
View File

@@ -35,11 +35,11 @@ index b51155ad12515b2d0dd0f202580b9f455c114d9a..dd6c82a418ee299d7a5614cb0260949c
blockEntity.saveToItem(itemStack);
if (shulkerBoxBlockEntity.hasCustomName()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5660dacaa679b41e0a72daf09f6b2ae948377eef..f6c4d1cbccc7213d322426588f815064eebc5512 100644
index 9a4b594658a5815430d3c74d32c2adc3b8fc9984..b09cab96a780cadf6b4aad287cc3ca70dd2d60a7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -695,6 +695,11 @@ public class PurpurWorldConfig {
spongeAbsorptionRadius = getInt("blocks.sponge.absorption.radius", spongeAbsorptionRadius);
@@ -678,6 +678,11 @@ public class PurpurWorldConfig {
}
}
+ public boolean shulkerBoxAllowOversizedStacks = false;
@@ -47,6 +47,6 @@ index 5660dacaa679b41e0a72daf09f6b2ae948377eef..f6c4d1cbccc7213d322426588f815064
+ shulkerBoxAllowOversizedStacks = getBoolean("blocks.shulker_box.allow-oversized-stacks", shulkerBoxAllowOversizedStacks);
+ }
+
public boolean turtleEggsBreakFromExpOrbs = true;
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;
public boolean slabHalfBreak = false;
private void slabSettings() {
slabHalfBreak = getBoolean("blocks.slab.break-individual-slabs-when-sneaking", slabHalfBreak);

6
patches/server/0178-Add-toggle-for-sand-duping-fix.patch
View File

@@ -27,11 +27,11 @@ index eff81e846f696349b3bd3d26c02442f157b169f0..bdadc6bb8c0ddcbf4ec1a9d2b4267c9e
}
// Paper end - fix sand duping
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5ab074818ee68a1d41e4bddd0e04e652d343eabd..911b30143e7807a432ac793352bb9be6866823d8 100644
index 2e3a27c7392ba4e07f6c4bc7cee1ee2d4f27987e..b906d348b49c017a03337d599a1f87f2f8417c50 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -721,6 +721,11 @@ public class PurpurWorldConfig {
spongeAbsorptionRadius = getInt("blocks.sponge.absorption.radius", spongeAbsorptionRadius);
@@ -704,6 +704,11 @@ public class PurpurWorldConfig {
}
}
+ public boolean fixSandDuping = true;

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

@@ -68,10 +68,10 @@ index 88e1c2431d51d8cdc3d555b711e506648225d289..ac8735cc9d127fc1f867b40d4000c033
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 77f776dc1ce999a135d539e8b478f2eb87e89d1f..06065f28353e210bcacc4a578bc8d55587937a74 100644
index 6c31fa844ce12f5f9fcc5a85f3ce027e7d315103..4da1ac24dd26cdaa0271181314adbb3cef1402d3 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1943,6 +1943,11 @@ public class PurpurWorldConfig {
@@ -1940,6 +1940,11 @@ public class PurpurWorldConfig {
public boolean shulkerControllable = true;
public double shulkerMaxHealth = 30.0D;
public boolean shulkerTakeDamageFromWater = false;
@@ -83,7 +83,7 @@ index 77f776dc1ce999a135d539e8b478f2eb87e89d1f..06065f28353e210bcacc4a578bc8d555
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -1954,6 +1959,11 @@ public class PurpurWorldConfig {
@@ -1951,6 +1956,11 @@ public class PurpurWorldConfig {
}
shulkerMaxHealth = getDouble("mobs.shulker.attributes.max_health", shulkerMaxHealth);
shulkerTakeDamageFromWater = getBoolean("mobs.shulker.takes-damage-from-water", shulkerTakeDamageFromWater);

14
patches/server/0187-Configurable-hunger-starvation-damage.patch
View File

@@ -18,18 +18,16 @@ index 31ec6022b305df0ae02364c916ecf18425a0bc36..e54af9ff2a786e919b8261aa27509be9
this.tickTimer = 0;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index cad1bcf613b9b1e8feb7ca33b10dc46cf4ea015d..6bc005d6680df416c3ee2cf88dd20abe87f20475 100644
index db8cffb5be04816d48983d1138c0628543166c32..a5048df62f2144f19784d154719b627b1f5db27b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -757,6 +757,11 @@ public class PurpurWorldConfig {
turtleEggsBypassMobGriefing = getBoolean("blocks.turtle_egg.bypass-mob-griefing", turtleEggsBypassMobGriefing);
@@ -2597,4 +2597,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);
}
+
+ public float hungerStarvationDamage = 1.0F;
+ private void hungerSettings() {
+ hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
+ }
+
public boolean babiesAreRidable = true;
public boolean untamedTamablesAreRidable = true;
public boolean useNightVisionWhenRiding = false;
}

6
patches/server/0195-Silk-touchable-budding-amethyst.patch
View File

@@ -24,7 +24,7 @@ index 4dae2a98070affd84bc4523a927dc9cbfe7379c6..51faa4cfda3d36f2e3bc7cbc47cacf57
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 96c5b143e826d31015ec48eb1bd706b12965009f..a749e65e66002c31fd83183744b5cfc4c036b0f6 100644
index e2be69415db5cc82f9c88c5f39dc1fe2a6aa0067..f08f7a2acafa9196eaa1cab17edb1003da419d53 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -730,6 +730,11 @@ public class PurpurWorldConfig {
@@ -39,8 +39,8 @@ index 96c5b143e826d31015ec48eb1bd706b12965009f..a749e65e66002c31fd83183744b5cfc4
public boolean chestOpenWithBlockOnTop = false;
private void chestSettings() {
chestOpenWithBlockOnTop = getBoolean("blocks.chest.open-with-solid-block-on-top", chestOpenWithBlockOnTop);
@@ -2764,3 +2769,4 @@ public class PurpurWorldConfig {
zombifiedPiglinTakeDamageFromWater = getBoolean("mobs.zombified_piglin.takes-damage-from-water", zombifiedPiglinTakeDamageFromWater);
@@ -2766,3 +2771,4 @@ public class PurpurWorldConfig {
hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
}
}
+

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

@@ -17,10 +17,10 @@ index 6f7dc1f55d52a0957dc0f3b19644e3dce33ccb0f..f9bc9e2d57111b6260b5303fa2dbc405
for (int i = 0; i < 64; ++i) {
if (this.teleport()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 255411a070a06bf71adac3abffc6342add068ff0..a915227d554449221123d5dfa6dde029d6abb687 100644
index 9bc8738612bafcf526ebbe311a3301798f662559..437235f4a1b2054e85e465fda5c71c5d2baf3c2b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1354,6 +1354,7 @@ public class PurpurWorldConfig {
@@ -1349,6 +1349,7 @@ public class PurpurWorldConfig {
public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
public boolean endermanIgnorePlayerDragonHead = false;
public boolean endermanDisableStareAggro = false;
@@ -28,7 +28,7 @@ index 255411a070a06bf71adac3abffc6342add068ff0..a915227d554449221123d5dfa6dde029
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -1376,6 +1377,7 @@ public class PurpurWorldConfig {
@@ -1371,6 +1372,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/0202-Customizeable-Zombie-Villager-curing-times.patch
View File

@@ -18,10 +18,10 @@ index c3f220a85b91a25662c943b5ee4508cd7a18c75d..40b3498c57c62f8bdaac50546ca47f49
return InteractionResult.SUCCESS;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c3009eea0137f90eff1defcd93720c2aadc91047..f12ee1e122ad3dba669c0bf198aa45c1ff0e3842 100644
index 2045b5a7d1627d70771428b56c3275849d236bdb..3a9691cdd5e1d80ac551743f3fcab02d39949a88 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2758,6 +2758,8 @@ public class PurpurWorldConfig {
@@ -2750,6 +2750,8 @@ public class PurpurWorldConfig {
public double zombieVillagerJockeyChance = 0.05D;
public boolean zombieVillagerJockeyTryExistingChickens = true;
public boolean zombieVillagerTakeDamageFromWater = false;
@@ -30,7 +30,7 @@ index c3009eea0137f90eff1defcd93720c2aadc91047..f12ee1e122ad3dba669c0bf198aa45c1
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2768,6 +2770,8 @@ public class PurpurWorldConfig {
@@ -2765,6 +2767,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);

20
patches/server/0203-Option-for-sponges-to-work-on-lava.patch
View File

@@ -18,18 +18,18 @@ index e4e926dc89f843886d0df5da31e00053284f5dae..5964949a6048194476e6dd501503caf0
// NOP
} else if (iblockdata.getBlock() instanceof LiquidBlock) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f12ee1e122ad3dba669c0bf198aa45c1ff0e3842..79f9ebf126ca5c6ee30020576d73dc1d8f76262e 100644
index 3a9691cdd5e1d80ac551743f3fcab02d39949a88..d311fb97d7aeba0692827aadce4661c444ccc517 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -941,6 +941,11 @@ public class PurpurWorldConfig {
shulkerBoxAllowOversizedStacks = getBoolean("blocks.shulker_box.allow-oversized-stacks", shulkerBoxAllowOversizedStacks);
@@ -936,9 +936,11 @@ public class PurpurWorldConfig {
public int spongeAbsorptionArea = 64;
public int spongeAbsorptionRadius = 6;
+ public boolean spongeAbsorbsLava = false;
private void spongeSettings() {
spongeAbsorptionArea = getInt("blocks.sponge.absorption.area", spongeAbsorptionArea);
spongeAbsorptionRadius = getInt("blocks.sponge.absorption.radius", spongeAbsorptionRadius);
+ spongeAbsorbsLava = getBoolean("blocks.sponge.absorbs-lava", spongeAbsorbsLava);
}
+ public boolean spongeAbsorbsLava = false;
+ private void spongeSettings() {
+ spongeAbsorbsLava = getBoolean("blocks.sponge.absorbs-lava", spongeAbsorbsLava);
+ }
+
public boolean turtleEggsBreakFromExpOrbs = true;
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;

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

@@ -18,10 +18,10 @@ index 24fc4934f2193806fa38c8c3b0ad4cbfc53650a6..bd38dad0a38a60a0421ee62e52ef7009
// this.level().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 79f9ebf126ca5c6ee30020576d73dc1d8f76262e..42183ead1b420821923f4bc540098d2011bcdb39 100644
index d311fb97d7aeba0692827aadce4661c444ccc517..a513d117d98e68758654f1765d956652cdcd702e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2606,6 +2606,7 @@ public class PurpurWorldConfig {
@@ -2595,6 +2595,7 @@ public class PurpurWorldConfig {
public boolean witherTakeDamageFromWater = false;
public boolean witherCanRideVehicles = false;
public float witherExplosionRadius = 1.0F;
@@ -29,7 +29,7 @@ index 79f9ebf126ca5c6ee30020576d73dc1d8f76262e..42183ead1b420821923f4bc540098d20
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2627,6 +2628,7 @@ public class PurpurWorldConfig {
@@ -2616,6 +2617,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);

17
patches/server/0207-Conduit-behavior-configuration.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Encode42 <me@encode42.dev>
Date: Sun, 8 Aug 2021 18:14:31 -0400
From: granny <granny@purpurmc.org>
Date: Fri, 9 Jun 2023 04:12:23 -0700
Subject: [PATCH] Conduit behavior configuration
@@ -77,13 +77,14 @@ index 963a596154091b79ca139af6274aa323518ad1ad..4dcac3899a500d8586580bcfd5b4516e
});
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 8d8a4666b98e91d31976e72e261ee33886004520..e3e77d8745259edaccc21ffb3e2658b55f54495a 100644
index 37b4c1ca0337b4e512e90ceeae9f741527f43b49..db47831cb239219d869f95275b5572f680631650 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -969,6 +969,29 @@ public class PurpurWorldConfig {
@@ -2814,5 +2814,28 @@ public class PurpurWorldConfig {
private void hungerSettings() {
hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
}
+
+ public int conduitDistance = 16;
+ public double conduitDamageDistance = 8;
+ public float conduitDamageAmount = 4;
@@ -106,7 +107,5 @@ index 8d8a4666b98e91d31976e72e261ee33886004520..e3e77d8745259edaccc21ffb3e2658b5
+ });
+ conduitBlocks = conduitBlockList.toArray(Block[]::new);
+ }
+
public boolean babiesAreRidable = true;
public boolean untamedTamablesAreRidable = true;
public boolean useNightVisionWhenRiding = false;
}

17
patches/server/0208-Cauldron-fill-chances.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Encode42 <me@encode42.dev>
Date: Sun, 8 Aug 2021 18:38:44 -0400
From: granny <granny@purpurmc.org>
Date: Fri, 9 Jun 2023 04:13:39 -0700
Subject: [PATCH] Cauldron fill chances
@@ -47,13 +47,14 @@ index e978132e51cde52f7ff1ba31ad521fc2cb4f0dce..60a95c42a333d68d9fd14539e0051c08
if (dripChance < f1) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e3e77d8745259edaccc21ffb3e2658b55f54495a..1025ade27a3a7302e69001ce482b593b9f07c010 100644
index db47831cb239219d869f95275b5572f680631650..98482f44838d0a6fab1fbd40a8748893ab996c1c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -992,6 +992,17 @@ public class PurpurWorldConfig {
@@ -2837,5 +2837,16 @@ public class PurpurWorldConfig {
});
conduitBlocks = conduitBlockList.toArray(Block[]::new);
}
+
+ public float cauldronRainChance = 0.05F;
+ public float cauldronPowderSnowChance = 0.1F;
+ public float cauldronDripstoneWaterFillChance = 0.17578125F;
@@ -64,7 +65,5 @@ index e3e77d8745259edaccc21ffb3e2658b55f54495a..1025ade27a3a7302e69001ce482b593b
+ cauldronDripstoneWaterFillChance = (float) getDouble("blocks.cauldron.fill-chances.dripstone-water", cauldronDripstoneWaterFillChance);
+ cauldronDripstoneLavaFillChance = (float) getDouble("blocks.cauldron.fill-chances.dripstone-lava", cauldronDripstoneLavaFillChance);
+ }
+
public boolean babiesAreRidable = true;
public boolean untamedTamablesAreRidable = true;
public boolean useNightVisionWhenRiding = false;
}

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

@@ -47,10 +47,10 @@ index 48fcfef45ab149328573f4e80c8f0289f9eebbe8..fbafb9e2ea9dfd237560d34f9cd6f295
protected void registerGoals() {
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index eae27b1dea745b400cfe99e96ae02bed9d3dd580..b0b8918135e4a363f1fbf01064be4cf79886b72c 100644
index b29bb2eaa56f8c5abba784ff84b7e7ab965a2095..ec78d180407418ae0e55d80ddbaea2044a99d03b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2202,6 +2202,7 @@ public class PurpurWorldConfig {
@@ -2157,6 +2157,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 eae27b1dea745b400cfe99e96ae02bed9d3dd580..b0b8918135e4a363f1fbf01064be4cf7
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -2218,6 +2219,7 @@ public class PurpurWorldConfig {
@@ -2173,6 +2174,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/0216-Dolphins-naturally-aggressive-to-players-chance.patch
View File

@@ -48,10 +48,10 @@ index 6006b9c996a8070336c4471f2a915d70c6371c76..3755ffc395ec4644a2263c59cdacfdba
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 453ba32578e4dc9340332f048cce734bc0b06139..23e62e59e84bfeb607b5190347dbf65119ee7efc 100644
index 80a2988193865830e789d0fe5a981d0b55a4f175..a4196f2f0e3458e13ee527943c1ca78d5015af3b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1297,6 +1297,7 @@ public class PurpurWorldConfig {
@@ -1255,6 +1255,7 @@ public class PurpurWorldConfig {
public double dolphinMaxHealth = 10.0D;
public boolean dolphinDisableTreasureSearching = false;
public boolean dolphinTakeDamageFromWater = false;
@@ -59,7 +59,7 @@ index 453ba32578e4dc9340332f048cce734bc0b06139..23e62e59e84bfeb607b5190347dbf651
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinControllable = getBoolean("mobs.dolphin.controllable", dolphinControllable);
@@ -1311,6 +1312,7 @@ public class PurpurWorldConfig {
@@ -1269,6 +1270,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);

15
patches/server/0217-Cows-naturally-aggressive-to-players-chance.patch
View File

@@ -57,28 +57,25 @@ index c6e5278641fb4a246a8df988fdf5068a044e2c4e..30e87b71ad237d76ec5adb4976edeca9
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 23e62e59e84bfeb607b5190347dbf65119ee7efc..f9f88452e3907add31568a7665e0bf8710c4fa14 100644
index a4196f2f0e3458e13ee527943c1ca78d5015af3b..dd69498eef7d80fba94792ec56926df3bbca1f9d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1246,6 +1246,8 @@ public class PurpurWorldConfig {
@@ -1204,7 +1204,14 @@ public class PurpurWorldConfig {
public int cowFeedMushrooms = 0;
public int cowBreedingTicks = 6000;
public boolean cowTakeDamageFromWater = false;
+ public double cowNaturallyAggressiveToPlayersChance = 0.0D;
+ public double cowNaturallyAggressiveToPlayersDamage = 2.0D;
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -1255,10 +1257,17 @@ public class PurpurWorldConfig {
set("mobs.cow.attributes.max-health", null);
set("mobs.cow.attributes.max_health", oldValue);
}
+ if (PurpurConfig.version < 22) {
+ double oldValue = getDouble("mobs.cow.naturally-aggressive-to-players-chance", cowNaturallyAggressiveToPlayersChance);
+ set("mobs.cow.naturally-aggressive-to-players-chance", null);
+ set("mobs.cow.naturally-aggressive-to-players.chance", oldValue);
+ }
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
cowControllable = getBoolean("mobs.cow.controllable", cowControllable);
@@ -1217,6 +1224,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);

30
patches/server/0219-Halloween-options-and-optimizations.patch
View File

@@ -60,24 +60,20 @@ index 0bc90b6d5c5a3cb3477d41336a9bb1130ff32fa1..a8d2f8654ee370e98bb1c4e7e1111deb
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 73335990e53945d5776360585a7a5c8239284c4b..5373ff14665fb2c6ea832c03d796121c2f04fa38 100644
index aeedc052ac2438650dda2130ed3baa7bf41bd122..468c3ef2b414816bd3364b84599d824c965b3407 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -143,6 +143,8 @@ public class PurpurWorldConfig {
public boolean mobsIgnoreRails = false;
public boolean rainStopsAfterSleep = true;
public boolean thunderStopsAfterSleep = true;
+ public boolean forceHalloweenSeason = false;
+ public float chanceHeadHalloweenOnEntity = 0.25F;
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
alwaysTameInCreative = getBoolean("gameplay-mechanics.always-tame-in-creative", alwaysTameInCreative);
@@ -167,6 +169,8 @@ public class PurpurWorldConfig {
mobsIgnoreRails = getBoolean("gameplay-mechanics.mobs-ignore-rails", mobsIgnoreRails);
rainStopsAfterSleep = getBoolean("gameplay-mechanics.rain-stops-after-sleep", rainStopsAfterSleep);
thunderStopsAfterSleep = getBoolean("gameplay-mechanics.thunder-stops-after-sleep", thunderStopsAfterSleep);
+ forceHalloweenSeason = getBoolean("gameplay-mechanics.halloween.force", forceHalloweenSeason);
+ chanceHeadHalloweenOnEntity = (float) getDouble("gameplay-mechanics.halloween.head-chance", chanceHeadHalloweenOnEntity);
@@ -1597,6 +1597,13 @@ public class PurpurWorldConfig {
guardianTakeDamageFromWater = getBoolean("mobs.guardian.takes-damage-from-water", guardianTakeDamageFromWater);
}
public int daytimeTicks = 12000;
+ public boolean forceHalloweenSeason = false;
+ public float chanceHeadHalloweenOnEntity = 0.25F;
+ private void halloweenSetting() {
+ forceHalloweenSeason = getBoolean("gameplay-mechanics.halloween.force", forceHalloweenSeason);
+ chanceHeadHalloweenOnEntity = (float) getDouble("gameplay-mechanics.halloween.head-chance", chanceHeadHalloweenOnEntity);
+ }
+
public boolean hoglinRidable = false;
public boolean hoglinRidableInWater = true;
public boolean hoglinControllable = true;

4
patches/server/0222-Campfire-option-for-lit-when-placed.patch
View File

@@ -18,10 +18,10 @@ index 219c87dcf065e86512f330fbeec59e55f4675083..f8fd3b320494d1c1e8ee3d170f2feebd
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5373ff14665fb2c6ea832c03d796121c2f04fa38..1b4b06adfa32e18ff004afe635773ad48df35c4c 100644
index 468c3ef2b414816bd3364b84599d824c965b3407..3d2e5b3c4a71f4ca1367f603851d7c51bd6d4e7e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -788,6 +788,11 @@ public class PurpurWorldConfig {
@@ -784,6 +784,11 @@ public class PurpurWorldConfig {
cactusBreaksFromSolidNeighbors = getBoolean("blocks.cactus.breaks-from-solid-neighbors", cactusBreaksFromSolidNeighbors);
}

6
patches/server/0223-options-to-extinguish-fire-blocks-with-snowballs.patch
View File

@@ -46,10 +46,10 @@ index b90cedad282e95a067aca176fafa9f72a726f520..9a8a1e773f247f4c4af4e9789deb70cd
protected void onHit(HitResult hitResult) {
super.onHit(hitResult);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 1b4b06adfa32e18ff004afe635773ad48df35c4c..39bf3aedbcf90ece9deaa97ba40196160a2eb928 100644
index 3d2e5b3c4a71f4ca1367f603851d7c51bd6d4e7e..6f1e3e75963c98bc632eca8a3a2a6a01ca73b032 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -237,6 +237,9 @@ public class PurpurWorldConfig {
@@ -233,6 +233,9 @@ public class PurpurWorldConfig {
public int glowBerriesEatGlowDuration = 0;
public boolean shulkerBoxItemDropContentsWhenDestroyed = true;
public boolean compassItemShowsBossBar = false;
@@ -59,7 +59,7 @@ index 1b4b06adfa32e18ff004afe635773ad48df35c4c..39bf3aedbcf90ece9deaa97ba4019616
private void itemSettings() {
itemImmuneToCactus.clear();
getList("gameplay-mechanics.item.immune.cactus", new ArrayList<>()).forEach(key -> {
@@ -285,6 +288,9 @@ public class PurpurWorldConfig {
@@ -281,6 +284,9 @@ public class PurpurWorldConfig {
glowBerriesEatGlowDuration = getInt("gameplay-mechanics.item.glow_berries.eat-glow-duration", glowBerriesEatGlowDuration);
shulkerBoxItemDropContentsWhenDestroyed = getBoolean("gameplay-mechanics.item.shulker_box.drop-contents-when-destroyed", shulkerBoxItemDropContentsWhenDestroyed);
compassItemShowsBossBar = getBoolean("gameplay-mechanics.item.compass.holding-shows-bossbar", compassItemShowsBossBar);

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

@@ -18,10 +18,10 @@ index 40b3498c57c62f8bdaac50546ca47f4927db7bfa..b8e0ae0714fd2b77831fb714b1bad901
itemstack.shrink(1);
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 39bf3aedbcf90ece9deaa97ba40196160a2eb928..e92d1ffccad9b3262b80288296b52fb008fe77ca 100644
index 6f1e3e75963c98bc632eca8a3a2a6a01ca73b032..70fc3bb9fcfb27b1cb7e8df2597fecbf9d1116ae 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2856,6 +2856,7 @@ public class PurpurWorldConfig {
@@ -2814,6 +2814,7 @@ public class PurpurWorldConfig {
public boolean zombieVillagerTakeDamageFromWater = false;
public int zombieVillagerCuringTimeMin = 3600;
public int zombieVillagerCuringTimeMax = 6000;
@@ -29,7 +29,7 @@ index 39bf3aedbcf90ece9deaa97ba40196160a2eb928..e92d1ffccad9b3262b80288296b52fb0
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2868,6 +2869,7 @@ public class PurpurWorldConfig {
@@ -2831,6 +2832,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);

4
patches/server/0225-Persistent-BlockEntity-Lore-and-DisplayName.patch
View File

@@ -195,7 +195,7 @@ index 370a25d2deb54f10a35ee24d9e7e92fbfde60edf..2f19f6ac5de454845f5d13a3ebb93af6
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e92d1ffccad9b3262b80288296b52fb008fe77ca..00e147d0097e4797b378310154942a141f6e1298 100644
index 70fc3bb9fcfb27b1cb7e8df2597fecbf9d1116ae..336d57ca9db99bc8df69d37b1002cc35c7ae21c4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -132,6 +132,7 @@ public class PurpurWorldConfig {
@@ -206,7 +206,7 @@ index e92d1ffccad9b3262b80288296b52fb008fe77ca..00e147d0097e4797b378310154942a14
public boolean projectilesBypassMobGriefing = false;
public boolean tickFluids = true;
public double mobsBlindnessMultiplier = 1;
@@ -157,6 +158,7 @@ public class PurpurWorldConfig {
@@ -155,6 +156,7 @@ public class PurpurWorldConfig {
imposeTeleportRestrictionsOnGateways = getBoolean("gameplay-mechanics.impose-teleport-restrictions-on-gateways", imposeTeleportRestrictionsOnGateways);
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
noteBlockIgnoreAbove = getBoolean("gameplay-mechanics.note-block-ignore-above", noteBlockIgnoreAbove);

6
patches/server/0226-Signs-allow-color-codes.patch
View File

@@ -67,11 +67,11 @@ index 80695b2698d2904cec2c54ebe0ef880d95ed9583..c884b119fd956c3543864f06c1b1cd60
public CompoundTag getUpdateTag() {
return this.saveWithoutMetadata();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 00e147d0097e4797b378310154942a141f6e1298..75e0a56a381e05f0b99e7e7b85d38b4219a5da95 100644
index 336d57ca9db99bc8df69d37b1002cc35c7ae21c4..5aa2acfba5e4f1154c66e7950c34354c6e4b04d5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -958,6 +958,11 @@ public class PurpurWorldConfig {
}
@@ -964,6 +964,11 @@ public class PurpurWorldConfig {
shulkerBoxAllowOversizedStacks = getBoolean("blocks.shulker_box.allow-oversized-stacks", shulkerBoxAllowOversizedStacks);
}
+ public boolean signAllowColors = false;

284
patches/server/0228-Mobs-always-drop-experience.patch
View File

File diff suppressed because it is too large Load Diff

6
patches/server/0231-Ability-for-hoe-to-replant-crops-and-nether-warts.patch
View File

@@ -74,10 +74,10 @@ index e55720c4d2fbdf6aae526910e87a67c29cf906fd..0e4026e9d39735b840f12e59f84469b9
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f00d995a35fe7c33f2c5d1fffeb5d46b12b26e6f..f81c1cd9bcbb78b6a91b1ab6b8f83a1ac448ca0d 100644
index 07faa306549156f83ab099745c4e07b327783885..ab91dfb2e55002d69422231ac5628f88c2f712c6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -567,6 +567,8 @@ public class PurpurWorldConfig {
@@ -563,6 +563,8 @@ public class PurpurWorldConfig {
public Map<Block, Waxable> axeWaxables = new HashMap<>();
public Map<Block, Weatherable> axeWeatherables = new HashMap<>();
public Map<Block, Tillable> hoeTillables = new HashMap<>();
@@ -86,7 +86,7 @@ index f00d995a35fe7c33f2c5d1fffeb5d46b12b26e6f..f81c1cd9bcbb78b6a91b1ab6b8f83a1a
private void toolSettings() {
axeStrippables.clear();
axeWaxables.clear();
@@ -722,6 +724,8 @@ public class PurpurWorldConfig {
@@ -718,6 +720,8 @@ public class PurpurWorldConfig {
});
hoeTillables.put(block, new Tillable(condition, into, drops));
});

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

@@ -18,10 +18,10 @@ index a1b323ecba25910e97f154e487acc94943117e0c..62d8ae4c689170420c7850fbbb402be8
if (entityitem != null) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f81c1cd9bcbb78b6a91b1ab6b8f83a1ac448ca0d..7a8c32a9b4f6ffcf186920c4b6afa9d3fd34120a 100644
index ab91dfb2e55002d69422231ac5628f88c2f712c6..2b6067e2dd5b562c22e961def0e5623395fde55a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2323,6 +2323,7 @@ public class PurpurWorldConfig {
@@ -2281,6 +2281,7 @@ public class PurpurWorldConfig {
public boolean sheepBypassMobGriefing = false;
public boolean sheepTakeDamageFromWater = false;
public boolean sheepAlwaysDropExp = false;
@@ -29,7 +29,7 @@ index f81c1cd9bcbb78b6a91b1ab6b8f83a1ac448ca0d..7a8c32a9b4f6ffcf186920c4b6afa9d3
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -2337,6 +2338,7 @@ public class PurpurWorldConfig {
@@ -2295,6 +2296,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);

6
patches/server/0233-Turtle-eggs-random-tick-crack-chance.patch
View File

@@ -18,10 +18,10 @@ index 7495e0e8beedad59fff24ebf189b58b307f7d796..70997b83fd7631ebf3c5bda67ef77bef
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7a8c32a9b4f6ffcf186920c4b6afa9d3fd34120a..d01bbdd7d5d5b96a505d4bd4db599c98b0b1f403 100644
index 2b6067e2dd5b562c22e961def0e5623395fde55a..ccaed082001b197719af4eaca8d5eb84a41606c3 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1003,11 +1003,13 @@ public class PurpurWorldConfig {
@@ -996,11 +996,13 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;
public boolean turtleEggsBypassMobGriefing = false;
@@ -34,4 +34,4 @@ index 7a8c32a9b4f6ffcf186920c4b6afa9d3fd34120a..d01bbdd7d5d5b96a505d4bd4db599c98
+ turtleEggsRandomTickCrackChance = getInt("blocks.turtle_egg.random-tick-crack-chance", turtleEggsRandomTickCrackChance);
}
public float hungerStarvationDamage = 1.0F;
public boolean babiesAreRidable = true;

18
patches/server/0234-Mob-head-visibility-percent.patch
View File

@@ -32,10 +32,10 @@ index 7a35d45f8449a8399cb417357f0f0a6419bfbe3a..39ee6fbc6ce17b61abf88deba69b0ade
// 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 d01bbdd7d5d5b96a505d4bd4db599c98b0b1f403..86c71f100800655605dc160944edfffcab097d15 100644
index ccaed082001b197719af4eaca8d5eb84a41606c3..5ebf050a48506a4dc97e2df357e57ee315a5b6b8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1329,6 +1329,7 @@ public class PurpurWorldConfig {
@@ -1283,6 +1283,7 @@ public class PurpurWorldConfig {
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
@@ -43,7 +43,7 @@ index d01bbdd7d5d5b96a505d4bd4db599c98b0b1f403..86c71f100800655605dc160944edfffc
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1346,6 +1347,7 @@ public class PurpurWorldConfig {
@@ -1300,6 +1301,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 d01bbdd7d5d5b96a505d4bd4db599c98b0b1f403..86c71f100800655605dc160944edfffc
}
public boolean dolphinRidable = false;
@@ -2128,6 +2130,7 @@ public class PurpurWorldConfig {
@@ -2086,6 +2088,7 @@ public class PurpurWorldConfig {
public boolean piglinTakeDamageFromWater = false;
public int piglinPortalSpawnModifier = 2000;
public boolean piglinAlwaysDropExp = false;
@@ -59,7 +59,7 @@ index d01bbdd7d5d5b96a505d4bd4db599c98b0b1f403..86c71f100800655605dc160944edfffc
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -2142,6 +2145,7 @@ public class PurpurWorldConfig {
@@ -2100,6 +2103,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 d01bbdd7d5d5b96a505d4bd4db599c98b0b1f403..86c71f100800655605dc160944edfffc
}
public boolean piglinBruteRidable = false;
@@ -2403,6 +2407,7 @@ public class PurpurWorldConfig {
@@ -2361,6 +2365,7 @@ public class PurpurWorldConfig {
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
@@ -75,7 +75,7 @@ index d01bbdd7d5d5b96a505d4bd4db599c98b0b1f403..86c71f100800655605dc160944edfffc
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2415,6 +2420,7 @@ public class PurpurWorldConfig {
@@ -2373,6 +2378,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 d01bbdd7d5d5b96a505d4bd4db599c98b0b1f403..86c71f100800655605dc160944edfffc
}
public boolean skeletonHorseRidableInWater = true;
@@ -2949,6 +2955,7 @@ public class PurpurWorldConfig {
@@ -2907,6 +2913,7 @@ public class PurpurWorldConfig {
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
@@ -91,7 +91,7 @@ index d01bbdd7d5d5b96a505d4bd4db599c98b0b1f403..86c71f100800655605dc160944edfffc
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2967,6 +2974,7 @@ public class PurpurWorldConfig {
@@ -2925,6 +2932,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/0237-Stop-bees-from-dying-after-stinging.patch
View File

@@ -17,10 +17,10 @@ index fad2da0ba194d349de73777a7ab43bb6447298e7..2afe5a4f3abaa3f9883b13fa3895e1e1
++this.timeSinceSting;
if (this.timeSinceSting % 5 == 0 && this.random.nextInt(Mth.clamp(1200 - this.timeSinceSting, 1, 1200)) == 0) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 86c71f100800655605dc160944edfffcab097d15..8d9efad91f907be8adfc4ac2c7ab08f1049e5289 100644
index 5ebf050a48506a4dc97e2df357e57ee315a5b6b8..45abfce546fafc1e1c375ee55c99f8360cf934ab 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1132,6 +1132,7 @@ public class PurpurWorldConfig {
@@ -1086,6 +1086,7 @@ public class PurpurWorldConfig {
public boolean beeCanWorkAtNight = false;
public boolean beeCanWorkInRain = false;
public boolean beeAlwaysDropExp = false;
@@ -28,7 +28,7 @@ index 86c71f100800655605dc160944edfffcab097d15..8d9efad91f907be8adfc4ac2c7ab08f1
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -1148,6 +1149,7 @@ public class PurpurWorldConfig {
@@ -1102,6 +1103,7 @@ public class PurpurWorldConfig {
beeCanWorkAtNight = getBoolean("mobs.bee.can-work-at-night", beeCanWorkAtNight);
beeCanWorkInRain = getBoolean("mobs.bee.can-work-in-rain", beeCanWorkInRain);
beeAlwaysDropExp = getBoolean("mobs.bee.always-drop-exp", beeAlwaysDropExp);

6
patches/server/0239-Configurable-farmland-trample-height.patch
View File

@@ -35,10 +35,10 @@ index 1064a13f37b991e60213b052e252a183b8340449..2b1bd583d9c7f049bfb798aa38ef021a
org.bukkit.event.Cancellable cancellable;
if (entity instanceof Player) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 8d9efad91f907be8adfc4ac2c7ab08f1049e5289..861f9d7e54a0afeac46a75b820ff102a3405ed5a 100644
index 45abfce546fafc1e1c375ee55c99f8360cf934ab..a64f33a9dd1710fb95dc17c98e5b70e5ceef792b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -880,6 +880,7 @@ public class PurpurWorldConfig {
@@ -876,6 +876,7 @@ public class PurpurWorldConfig {
public boolean farmlandTramplingDisabled = false;
public boolean farmlandTramplingOnlyPlayers = false;
public boolean farmlandTramplingFeatherFalling = false;
@@ -46,7 +46,7 @@ index 8d9efad91f907be8adfc4ac2c7ab08f1049e5289..861f9d7e54a0afeac46a75b820ff102a
private void farmlandSettings() {
farmlandBypassMobGriefing = getBoolean("blocks.farmland.bypass-mob-griefing", farmlandBypassMobGriefing);
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
@@ -887,6 +888,7 @@ public class PurpurWorldConfig {
@@ -883,6 +884,7 @@ public class PurpurWorldConfig {
farmlandTramplingDisabled = getBoolean("blocks.farmland.disable-trampling", farmlandTramplingDisabled);
farmlandTramplingOnlyPlayers = getBoolean("blocks.farmland.only-players-trample", farmlandTramplingOnlyPlayers);
farmlandTramplingFeatherFalling = getBoolean("blocks.farmland.feather-fall-distance-affects-trampling", farmlandTramplingFeatherFalling);

6
patches/server/0240-Configurable-player-pickup-exp-delay.patch
View File

@@ -35,10 +35,10 @@ index 0a9d8b22c7127b87826d9d256a5f36c34f2bfc0f..d00035e31cf4773a418d1cc6a6018d08
} else if (!entity.isRemoved()) {
this.touch(entity);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 861f9d7e54a0afeac46a75b820ff102a3405ed5a..c41319dc1ae070b48d07555a9c1a116d623d3b04 100644
index a64f33a9dd1710fb95dc17c98e5b70e5ceef792b..8320fe867358376fc80073a632c9436b0d7d0a79 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -430,6 +430,7 @@ public class PurpurWorldConfig {
@@ -426,6 +426,7 @@ public class PurpurWorldConfig {
public boolean playerRidableInWater = false;
public boolean playerRemoveBindingWithWeakness = false;
public int shiftRightClickRepairsMendingPoints = 0;
@@ -46,7 +46,7 @@ index 861f9d7e54a0afeac46a75b820ff102a3405ed5a..c41319dc1ae070b48d07555a9c1a116d
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -459,6 +460,7 @@ public class PurpurWorldConfig {
@@ -455,6 +456,7 @@ public class PurpurWorldConfig {
playerRidableInWater = getBoolean("gameplay-mechanics.player.ridable-in-water", playerRidableInWater);
playerRemoveBindingWithWeakness = getBoolean("gameplay-mechanics.player.curse-of-binding.remove-with-weakness", playerRemoveBindingWithWeakness);
shiftRightClickRepairsMendingPoints = getInt("gameplay-mechanics.player.shift-right-click-repairs-mending-points", shiftRightClickRepairsMendingPoints);

6
patches/server/0241-Allow-void-trading.patch
View File

@@ -18,10 +18,10 @@ index d48132f978a4395e489b3ba21f634f19790134b3..c490c88fd7798c0ac186b1de22a0dfc4
}
// Paper end
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c41319dc1ae070b48d07555a9c1a116d623d3b04..037ed21666279af26a44bb21eba01d9ba0ae2597 100644
index 8320fe867358376fc80073a632c9436b0d7d0a79..60cc0d990edf1ec072a8d017550072e24e80e221 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -431,6 +431,7 @@ public class PurpurWorldConfig {
@@ -427,6 +427,7 @@ public class PurpurWorldConfig {
public boolean playerRemoveBindingWithWeakness = false;
public int shiftRightClickRepairsMendingPoints = 0;
public int playerExpPickupDelay = 2;
@@ -29,7 +29,7 @@ index c41319dc1ae070b48d07555a9c1a116d623d3b04..037ed21666279af26a44bb21eba01d9b
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -461,6 +462,7 @@ public class PurpurWorldConfig {
@@ -457,6 +458,7 @@ public class PurpurWorldConfig {
playerRemoveBindingWithWeakness = getBoolean("gameplay-mechanics.player.curse-of-binding.remove-with-weakness", playerRemoveBindingWithWeakness);
shiftRightClickRepairsMendingPoints = getInt("gameplay-mechanics.player.shift-right-click-repairs-mending-points", shiftRightClickRepairsMendingPoints);
playerExpPickupDelay = getInt("gameplay-mechanics.player.exp-pickup-delay-ticks", playerExpPickupDelay);

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

@@ -22,10 +22,10 @@ index c3b9878de5ac74b9a1aaa77030edb4a2b53586c3..85adeb1c4061d95c53359331256dbbd1
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 037ed21666279af26a44bb21eba01d9ba0ae2597..ed361a28500a10caf30572ec006cbf3ce04a09ac 100644
index 60cc0d990edf1ec072a8d017550072e24e80e221..e5d1910905334b7b8e12418aca41535f65389d68 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2068,6 +2068,8 @@ public class PurpurWorldConfig {
@@ -2026,6 +2026,8 @@ public class PurpurWorldConfig {
public boolean phantomFlamesOnSwoop = false;
public boolean phantomTakeDamageFromWater = false;
public boolean phantomAlwaysDropExp = false;
@@ -34,7 +34,7 @@ index 037ed21666279af26a44bb21eba01d9ba0ae2597..ed361a28500a10caf30572ec006cbf3c
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -2104,6 +2106,13 @@ public class PurpurWorldConfig {
@@ -2062,6 +2064,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/0246-Configurable-minimum-demand-for-trades.patch
View File

@@ -40,10 +40,10 @@ index 28bdcb14cb5b458d3c990fcf343ef97f08e4f3c6..48167334162443365bb8a6d082a51b2c
public ItemStack assemble() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ed361a28500a10caf30572ec006cbf3ce04a09ac..0cfc3fc9677b9f647d1ee2208dfb8916441c8de6 100644
index e5d1910905334b7b8e12418aca41535f65389d68..4502ce8cbb0a7f4162efb3360860b4b88deff26d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2751,6 +2751,7 @@ public class PurpurWorldConfig {
@@ -2709,6 +2709,7 @@ public class PurpurWorldConfig {
public boolean villagerTakeDamageFromWater = false;
public boolean villagerAllowTrading = true;
public boolean villagerAlwaysDropExp = false;
@@ -51,7 +51,7 @@ index ed361a28500a10caf30572ec006cbf3ce04a09ac..0cfc3fc9677b9f647d1ee2208dfb8916
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2771,6 +2772,7 @@ public class PurpurWorldConfig {
@@ -2729,6 +2730,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/0247-Lobotomize-stuck-villagers.patch
View File

@@ -105,10 +105,10 @@ index e986767316a717bdbdff7a9ccaaeba068ab2a6d8..4d0b37957eb02b5d48beb76295ebc7c4
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 0cfc3fc9677b9f647d1ee2208dfb8916441c8de6..aff078bafad0eb28512aa9f7bb94d34638e2fab7 100644
index 4502ce8cbb0a7f4162efb3360860b4b88deff26d..5cbc9ab88b4690adb6c32958363cc455396b7b9d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2752,6 +2752,8 @@ public class PurpurWorldConfig {
@@ -2710,6 +2710,8 @@ public class PurpurWorldConfig {
public boolean villagerAllowTrading = true;
public boolean villagerAlwaysDropExp = false;
public int villagerMinimumDemand = 0;
@@ -117,7 +117,7 @@ index 0cfc3fc9677b9f647d1ee2208dfb8916441c8de6..aff078bafad0eb28512aa9f7bb94d346
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2773,6 +2775,17 @@ public class PurpurWorldConfig {
@@ -2731,6 +2733,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/0248-Option-for-villager-display-trade-item.patch
View File

@@ -17,10 +17,10 @@ index 050be72c815010bf3f4b72427e2052b00420e8ee..8a213205f57c8dcd2226d7194d74b1b1
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index aff078bafad0eb28512aa9f7bb94d34638e2fab7..62a643d7fde3cef5f10f97a300ac410f6ad13204 100644
index 5cbc9ab88b4690adb6c32958363cc455396b7b9d..9e7bc34f5015d5fee6e0d440cffb769fd4d8ccd0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2754,6 +2754,7 @@ public class PurpurWorldConfig {
@@ -2712,6 +2712,7 @@ public class PurpurWorldConfig {
public int villagerMinimumDemand = 0;
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheckInterval = 100;
@@ -28,7 +28,7 @@ index aff078bafad0eb28512aa9f7bb94d34638e2fab7..62a643d7fde3cef5f10f97a300ac410f
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2786,6 +2787,7 @@ public class PurpurWorldConfig {
@@ -2744,6 +2745,7 @@ public class PurpurWorldConfig {
}
villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
villagerLobotomizeCheckInterval = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheckInterval);

4
patches/server/0249-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
View File

@@ -17,10 +17,10 @@ index cd2ce5bcb8c30e4657cd0e340d80544c7e805905..c8c6fed3f93903bb5c6145930538d415
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 62a643d7fde3cef5f10f97a300ac410f6ad13204..cfb15f59fb13159b18381d05dc4447ae405be39b 100644
index 9e7bc34f5015d5fee6e0d440cffb769fd4d8ccd0..48376dbdb6a83dc9b29be0cb80435c1762ca3b44 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -979,8 +979,10 @@ public class PurpurWorldConfig {
@@ -985,8 +985,10 @@ public class PurpurWorldConfig {
}
public boolean spawnerDeactivateByRedstone = false;

14
patches/server/0250-Config-for-mob-last-hurt-by-player-time.patch
View File

@@ -38,21 +38,21 @@ index 641caa0f74a40ea52f71f3150c0168272b378edf..d5ed0e06c13f6df41b073a8b90992a20
// Paper end
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index cfb15f59fb13159b18381d05dc4447ae405be39b..cf81aa6512789212738ca30c8d7736c3814b8dcc 100644
index 48376dbdb6a83dc9b29be0cb80435c1762ca3b44..12a41aef32b0181d6109cf2324f066183c720ab2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -146,6 +146,7 @@ public class PurpurWorldConfig {
@@ -144,6 +144,7 @@ public class PurpurWorldConfig {
public boolean mobsIgnoreRails = false;
public boolean rainStopsAfterSleep = true;
public boolean thunderStopsAfterSleep = true;
public boolean forceHalloweenSeason = false;
public float chanceHeadHalloweenOnEntity = 0.25F;
+ public int mobLastHurtByPlayerTime = 100;
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
alwaysTameInCreative = getBoolean("gameplay-mechanics.always-tame-in-creative", alwaysTameInCreative);
@@ -173,6 +174,7 @@ public class PurpurWorldConfig {
@@ -169,6 +170,7 @@ public class PurpurWorldConfig {
mobsIgnoreRails = getBoolean("gameplay-mechanics.mobs-ignore-rails", mobsIgnoreRails);
rainStopsAfterSleep = getBoolean("gameplay-mechanics.rain-stops-after-sleep", rainStopsAfterSleep);
thunderStopsAfterSleep = getBoolean("gameplay-mechanics.thunder-stops-after-sleep", thunderStopsAfterSleep);
forceHalloweenSeason = getBoolean("gameplay-mechanics.halloween.force", forceHalloweenSeason);
chanceHeadHalloweenOnEntity = (float) getDouble("gameplay-mechanics.halloween.head-chance", chanceHeadHalloweenOnEntity);
+ mobLastHurtByPlayerTime = getInt("gameplay-mechanics.mob-last-hurt-by-player-time", mobLastHurtByPlayerTime);
}

4
patches/server/0251-Anvil-repair-damage-options.patch
View File

@@ -64,10 +64,10 @@ index 5c5a3b169795bf8a527b316c666cbc2105c66622..020afeca950d2c7fb6c7b179d424548f
return InteractionResult.SUCCESS;
} else {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index cf81aa6512789212738ca30c8d7736c3814b8dcc..5d9fe48bcf840b179aa70b9082efe95ff485603a 100644
index 12a41aef32b0181d6109cf2324f066183c720ab2..ef8b68c10b8b2e23c4e51457ec7c8650a0f15303 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -736,9 +736,13 @@ public class PurpurWorldConfig {
@@ -732,9 +732,13 @@ public class PurpurWorldConfig {
public boolean anvilAllowColors = false;
public boolean anvilColorsUseMiniMessage;

6
patches/server/0253-Option-to-disable-turtle-egg-trampling-with-feather-.patch
View File

@@ -24,10 +24,10 @@ index 70997b83fd7631ebf3c5bda67ef77bef605eb464..a8c227e2cb62cfa8225798329cde9078
return world.purpurConfig.turtleEggsBypassMobGriefing || world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
// Purpur end
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5d9fe48bcf840b179aa70b9082efe95ff485603a..cd6aca9278283f919879873edd4abdfc196237fc 100644
index ef8b68c10b8b2e23c4e51457ec7c8650a0f15303..f0e8d9f4d3c134b5e6a0e28d0aa53e63bbbae1a5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1018,12 +1018,14 @@ public class PurpurWorldConfig {
@@ -1011,12 +1011,14 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromMinecarts = true;
public boolean turtleEggsBypassMobGriefing = false;
public int turtleEggsRandomTickCrackChance = 500;
@@ -41,4 +41,4 @@ index 5d9fe48bcf840b179aa70b9082efe95ff485603a..cd6aca9278283f919879873edd4abdfc
+ turtleEggsTramplingFeatherFalling = getBoolean("blocks.turtle_egg.feather-fall-distance-affects-trampling", turtleEggsTramplingFeatherFalling);
}
public float hungerStarvationDamage = 1.0F;
public boolean babiesAreRidable = true;

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

@@ -18,10 +18,10 @@ index 43afded0ddd88094971ace2dd02d2aca6c3e86ae..25bf930258065b6cc6d6c3a790835ddf
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 cd6aca9278283f919879873edd4abdfc196237fc..48e3757a3d71ac6c13189369df47053bf3145e62 100644
index f0e8d9f4d3c134b5e6a0e28d0aa53e63bbbae1a5..1bf29a6bb49bc31d974329fe33c802ec7e14a65f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2765,6 +2765,8 @@ public class PurpurWorldConfig {
@@ -2723,6 +2723,8 @@ public class PurpurWorldConfig {
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheckInterval = 100;
public boolean villagerDisplayTradeItem = true;
@@ -30,7 +30,7 @@ index cd6aca9278283f919879873edd4abdfc196237fc..48e3757a3d71ac6c13189369df47053b
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2798,6 +2800,8 @@ public class PurpurWorldConfig {
@@ -2756,6 +2758,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);

4
patches/server/0257-Stonecutter-damage.patch
View File

@@ -63,10 +63,10 @@ index 3de2e7a17e1234367e4ec6d944b1145781aefeba..15ed564a579237dd1f5d6ce56ccb473f
public static boolean advancementOnlyBroadcastToAffectedPlayer = false;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 48e3757a3d71ac6c13189369df47053bf3145e62..998397ff5b395b41ac540f72a0d58b3b53d038a1 100644
index 1bf29a6bb49bc31d974329fe33c802ec7e14a65f..9e4160027df7ddd61b5d4766e45544dba0ae59d0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1013,6 +1013,11 @@ public class PurpurWorldConfig {
@@ -1006,6 +1006,11 @@ public class PurpurWorldConfig {
spongeAbsorbsLava = getBoolean("blocks.sponge.absorbs-lava", spongeAbsorbsLava);
}

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

@@ -18,10 +18,10 @@ index 1b766045687e4dcded5cbcc50b746c55b9a34e22..be365914856593bb3c4e1945cc990786
entity.hurt(world.damageSources().hotFloor(), 1.0F);
org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 998397ff5b395b41ac540f72a0d58b3b53d038a1..9e8356a41258fb8d739d43af0ba8cbe590fe235b 100644
index 9e4160027df7ddd61b5d4766e45544dba0ae59d0..e4586bc34f3659dce18c1f3bd9c2ddf02d299564 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -943,6 +943,13 @@ public class PurpurWorldConfig {
@@ -939,6 +939,13 @@ public class PurpurWorldConfig {
pistonBlockPushLimit = getInt("blocks.piston.block-push-limit", pistonBlockPushLimit);
}

4
patches/server/0259-Add-config-for-snow-on-blue-ice.patch
View File

@@ -22,10 +22,10 @@ index 14e00c7feb1c051d56a3d27cd00dcef072dd771a..4952fb1aaaafb55baa0fddb389f966a1
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 9e8356a41258fb8d739d43af0ba8cbe590fe235b..4a2e02d6c877ad163c310328aa6389adf6a89f2b 100644
index e4586bc34f3659dce18c1f3bd9c2ddf02d299564..eb1ef5a02900172f7228bcd25cac9be3b586e50c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -924,9 +924,11 @@ public class PurpurWorldConfig {
@@ -920,9 +920,11 @@ public class PurpurWorldConfig {
public boolean mobsSpawnOnPackedIce = true;
public boolean mobsSpawnOnBlueIce = true;

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

@@ -94,10 +94,10 @@ index 9b43150a00d7fac85aa69f5a2dbffd0dfdae4b86..f4a47ac2c86cc95178922cce7320ba1e
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 4a2e02d6c877ad163c310328aa6389adf6a89f2b..2b0eb7a01e6b8280af443a0cdfe7a9e78e0c3a7d 100644
index eb1ef5a02900172f7228bcd25cac9be3b586e50c..4e7bd8ecb1571b5d986c70a12a2d2fdf151d6420 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2449,6 +2449,7 @@ public class PurpurWorldConfig {
@@ -2407,6 +2407,7 @@ public class PurpurWorldConfig {
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
public double skeletonHeadVisibilityPercent = 0.5D;
@@ -105,7 +105,7 @@ index 4a2e02d6c877ad163c310328aa6389adf6a89f2b..2b0eb7a01e6b8280af443a0cdfe7a9e7
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2462,6 +2463,7 @@ public class PurpurWorldConfig {
@@ -2420,6 +2421,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);

12
patches/server/0261-Enchantment-Table-Persists-Lapis.patch
View File

@@ -146,11 +146,11 @@ 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 2b0eb7a01e6b8280af443a0cdfe7a9e78e0c3a7d..0498cbf9740c66842ab4a7d5150a54f1290bccb6 100644
index 4e7bd8ecb1571b5d986c70a12a2d2fdf151d6420..0996409b857de7cf3531290935bceca34159a2ef 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -745,6 +745,11 @@ public class PurpurWorldConfig {
anvilDamageObsidianAmount = getInt("blocks.anvil.obsidian-used-for-damage", anvilDamageObsidianAmount);
@@ -1442,6 +1442,11 @@ public class PurpurWorldConfig {
elderGuardianAlwaysDropExp = getBoolean("mobs.elder_guardian.always-drop-exp", elderGuardianAlwaysDropExp);
}
+ public boolean enchantmentTableLapisPersists = false;
@@ -158,6 +158,6 @@ index 2b0eb7a01e6b8280af443a0cdfe7a9e78e0c3a7d..0498cbf9740c66842ab4a7d5150a54f1
+ enchantmentTableLapisPersists = getBoolean("blocks.enchantment-table.lapis-persists", enchantmentTableLapisPersists);
+ }
+
public double azaleaGrowthChance = 0.0D;
private void azaleaSettings() {
azaleaGrowthChance = getDouble("blocks.azalea.growth-chance", azaleaGrowthChance);
public boolean enderDragonRidable = false;
public boolean enderDragonRidableInWater = true;
public boolean enderDragonControllable = true;

4
patches/server/0264-Config-for-sculk-shrieker-can_summon-state.patch
View File

@@ -18,10 +18,10 @@ index 02d01eabb9606ae8c3b76ad9fa4bb9a525e247b1..ce51fec4a874f9466f9966684c535315
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 0498cbf9740c66842ab4a7d5150a54f1290bccb6..d18a8d8ce7bdf43847a81765481ed5570fb39e09 100644
index 0996409b857de7cf3531290935bceca34159a2ef..d19754041ab8d82eff3971492faa7dd1523f475b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1017,6 +1017,11 @@ public class PurpurWorldConfig {
@@ -984,6 +984,11 @@ public class PurpurWorldConfig {
fixSandDuping = getBoolean("blocks.sand.fix-duping", fixSandDuping);
}

4
patches/server/0265-Config-to-not-let-coral-die.patch
View File

@@ -29,10 +29,10 @@ index 88faea00be60a519f56f975a5311df5e1eb3e6b8..cbb726ac367be81e27d3a86643baf7c4
int i = aenumdirection.length;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d18a8d8ce7bdf43847a81765481ed5570fb39e09..ee7de1ff4f672562f371630c284c9eecda5a9d94 100644
index d19754041ab8d82eff3971492faa7dd1523f475b..f7c21ff0da5e83b3e2c04df6478fbb5038e8e568 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -830,6 +830,11 @@ public class PurpurWorldConfig {
@@ -821,6 +821,11 @@ public class PurpurWorldConfig {
composterBulkProcess = getBoolean("blocks.composter.sneak-to-bulk-process", composterBulkProcess);
}

4
patches/server/0267-Add-toggle-for-RNG-manipulation.patch
View File

@@ -33,10 +33,10 @@ index beef2f6a42eebeaf5761bac841300f780bfdf4f2..41797940d89fec55cb7de4c63eb3ea5c
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ee7de1ff4f672562f371630c284c9eecda5a9d94..829c1062efed4429964c8f4ef9da977c0961aa44 100644
index f7c21ff0da5e83b3e2c04df6478fbb5038e8e568..2cf32b572bf9d737bbecf6777ec3db62dd9b0283 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -210,9 +210,11 @@ public class PurpurWorldConfig {
@@ -206,9 +206,11 @@ public class PurpurWorldConfig {
public int entityLifeSpan = 0;
public float entityLeftHandedChance = 0.05f;

6
patches/server/0277-mob-spawning-option-to-ignore-creative-players.patch
View File

@@ -18,10 +18,10 @@ index 03fc9c6ef0fb320924038f2730c6f08426f0842c..029cceb339c86abe05d9eee944b60c08
if (entityhuman != null) {
double d2 = entityhuman.distanceToSqr(d0, (double) i, d1);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 829c1062efed4429964c8f4ef9da977c0961aa44..5caf5461e921144e8a170e267757ef3101a059d8 100644
index 2cf32b572bf9d737bbecf6777ec3db62dd9b0283..ded437b33e88b1cef1797e293e3278321a12e216 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -383,6 +383,7 @@ public class PurpurWorldConfig {
@@ -379,6 +379,7 @@ public class PurpurWorldConfig {
public boolean phantomSpawning;
public boolean villagerTraderSpawning;
public boolean villageSiegeSpawning;
@@ -29,7 +29,7 @@ index 829c1062efed4429964c8f4ef9da977c0961aa44..5caf5461e921144e8a170e267757ef31
private void mobSpawnerSettings() {
// values of "default" or null will default to true only if the world environment is normal (aka overworld)
Predicate<Boolean> predicate = (bool) -> (bool != null && bool) || (bool == null && environment == World.Environment.NORMAL);
@@ -391,6 +392,7 @@ public class PurpurWorldConfig {
@@ -387,6 +388,7 @@ public class PurpurWorldConfig {
phantomSpawning = getBoolean("gameplay-mechanics.mob-spawning.phantoms", predicate);
villagerTraderSpawning = getBoolean("gameplay-mechanics.mob-spawning.wandering-traders", predicate);
villageSiegeSpawning = getBoolean("gameplay-mechanics.mob-spawning.village-sieges", predicate);

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

@@ -18,10 +18,10 @@ index 41376b705748e14c1c4174e07732ce09ad8e581f..dd84433a988712da9d799cbda2487a90
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 5caf5461e921144e8a170e267757ef3101a059d8..5c26ea9b1bb8efe9bd213e24e3371ab7cc017077 100644
index ded437b33e88b1cef1797e293e3278321a12e216..2d9f50dea1c686af49a79c6ffe9c34928e725a2a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2469,6 +2469,8 @@ public class PurpurWorldConfig {
@@ -2427,6 +2427,8 @@ public class PurpurWorldConfig {
public boolean skeletonAlwaysDropExp = false;
public double skeletonHeadVisibilityPercent = 0.5D;
public int skeletonFeedWitherRoses = 0;
@@ -30,7 +30,7 @@ index 5caf5461e921144e8a170e267757ef3101a059d8..5c26ea9b1bb8efe9bd213e24e3371ab7
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2483,6 +2485,18 @@ public class PurpurWorldConfig {
@@ -2441,6 +2443,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);

4
patches/server/0279-Allay-respect-item-NBT.patch
View File

@@ -44,10 +44,10 @@ index 15c4531865d829ea90d060ee83122a80ab39028b..379d168eb4ba958622398efa79fa43d5
private boolean allayConsidersItemEqual(ItemStack stack, ItemStack stack2) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5c26ea9b1bb8efe9bd213e24e3371ab7cc017077..dacb06c132f90493d4c402e73a56bf3bc709cedf 100644
index 2d9f50dea1c686af49a79c6ffe9c34928e725a2a..54ca27fcf2b5c21218c6a97408e5940d49ab18aa 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1114,10 +1114,13 @@ public class PurpurWorldConfig {
@@ -1063,10 +1063,13 @@ public class PurpurWorldConfig {
public boolean allayRidable = false;
public boolean allayRidableInWater = true;
public boolean allayControllable = true;

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

@@ -40,10 +40,10 @@ index 43cdda0cb26c5d5cc9025199eb71673d71c2abea..83660fad1e4c0ce5800f6e62f915ccd8
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index dacb06c132f90493d4c402e73a56bf3bc709cedf..cfeb1ac47735a4bb933d9f92adbf2ab3df3584f0 100644
index 54ca27fcf2b5c21218c6a97408e5940d49ab18aa..ff33ae3591a23386ba870a92e1260a827c8b2ee4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1725,6 +1725,7 @@ public class PurpurWorldConfig {
@@ -1679,6 +1679,7 @@ public class PurpurWorldConfig {
public boolean glowSquidsCanFly = false;
public boolean glowSquidTakeDamageFromWater = false;
public boolean glowSquidAlwaysDropExp = false;
@@ -51,7 +51,7 @@ index dacb06c132f90493d4c402e73a56bf3bc709cedf..cfeb1ac47735a4bb933d9f92adbf2ab3
private void glowSquidSettings() {
glowSquidRidable = getBoolean("mobs.glow_squid.ridable", glowSquidRidable);
glowSquidControllable = getBoolean("mobs.glow_squid.controllable", glowSquidControllable);
@@ -1732,6 +1733,7 @@ public class PurpurWorldConfig {
@@ -1686,6 +1687,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);

4
patches/server/0289-Milk-Keeps-Beneficial-Effects.patch
View File

@@ -30,7 +30,7 @@ index 7fa248b2d1b73e20085f0d3cdfead38547e4e924..ecfb5d8b47c461ae661149f1c7b9bace
this.goalSelector.addGoal(1, new TradeWithPlayerGoal(this));
this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Zombie.class, 8.0F, 0.5D, 0.5D));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index cfeb1ac47735a4bb933d9f92adbf2ab3df3584f0..c4057abdd8fb96adf981e233159e121f1e4f7c4f 100644
index ff33ae3591a23386ba870a92e1260a827c8b2ee4..560491ac60ed89d2103b4b1baada5e032a33345b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -130,6 +130,7 @@ public class PurpurWorldConfig {
@@ -41,7 +41,7 @@ index cfeb1ac47735a4bb933d9f92adbf2ab3df3584f0..c4057abdd8fb96adf981e233159e121f
public boolean noteBlockIgnoreAbove = false;
public boolean persistentDroppableEntityDisplayNames = true;
public boolean persistentTileEntityDisplayNames = false;
@@ -158,6 +159,7 @@ public class PurpurWorldConfig {
@@ -156,6 +157,7 @@ public class PurpurWorldConfig {
fireballsBypassMobGriefing = getBoolean("gameplay-mechanics.fireballs-bypass-mob-griefing", fireballsBypassMobGriefing);
imposeTeleportRestrictionsOnGateways = getBoolean("gameplay-mechanics.impose-teleport-restrictions-on-gateways", imposeTeleportRestrictionsOnGateways);
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);

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

@@ -24,10 +24,10 @@ index e241ae250f4f04a17ef2c583d00b065a4ca56a4c..7b99c3446b50939241d3e220d93e0564
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c4057abdd8fb96adf981e233159e121f1e4f7c4f..690c08d633446ac7dfccae860f1c23f39cb4f939 100644
index 560491ac60ed89d2103b4b1baada5e032a33345b..bc88e8f1553d321c6c93c0f0753fa0b473f638c4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1386,6 +1386,7 @@ public class PurpurWorldConfig {
@@ -1335,6 +1335,7 @@ public class PurpurWorldConfig {
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
public double creeperHeadVisibilityPercent = 0.5D;
@@ -35,7 +35,7 @@ index c4057abdd8fb96adf981e233159e121f1e4f7c4f..690c08d633446ac7dfccae860f1c23f3
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1404,6 +1405,7 @@ public class PurpurWorldConfig {
@@ -1353,6 +1354,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);

6
patches/server/0295-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
View File

@@ -25,10 +25,10 @@ index a04a75bd1fb673fe6182694d730daae41f184763..9b8bed645a78c213d5c15c53094d0d23
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 690c08d633446ac7dfccae860f1c23f39cb4f939..e69b0f4d54103fde67f9ae4c9bec686d2c949563 100644
index bc88e8f1553d321c6c93c0f0753fa0b473f638c4..321167bc250b7168a2bc379a96fc9a7a7175314e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -425,6 +425,7 @@ public class PurpurWorldConfig {
@@ -421,6 +421,7 @@ public class PurpurWorldConfig {
public String playerDeathExpDropEquation = "expLevel * 7";
public int playerDeathExpDropMax = 100;
public boolean teleportIfOutsideBorder = false;
@@ -36,7 +36,7 @@ index 690c08d633446ac7dfccae860f1c23f39cb4f939..e69b0f4d54103fde67f9ae4c9bec686d
public boolean totemOfUndyingWorksInInventory = false;
public boolean playerFixStuckPortal = false;
public boolean creativeOnePunch = false;
@@ -456,6 +457,7 @@ public class PurpurWorldConfig {
@@ -452,6 +453,7 @@ public class PurpurWorldConfig {
playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);

6
patches/server/0298-End-Crystal-Cramming.patch
View File

@@ -17,10 +17,10 @@ index ee5ba341d481d5a0fa874c3c707398c9c1eb1ed4..47b6c362f41ea86eb99c49de4814062a
// Purpur start
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e69b0f4d54103fde67f9ae4c9bec686d2c949563..bdf174fafd9827e16ef4f12ce51991f2392411ea 100644
index 321167bc250b7168a2bc379a96fc9a7a7175314e..2b651e83f37ac1a4a86e689ecc49f4d132f2599e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -873,6 +873,7 @@ public class PurpurWorldConfig {
@@ -864,6 +864,7 @@ public class PurpurWorldConfig {
public double basedEndCrystalExplosionPower = 6.0D;
public boolean basedEndCrystalExplosionFire = false;
public net.minecraft.world.level.Level.ExplosionInteraction basedEndCrystalExplosionEffect = net.minecraft.world.level.Level.ExplosionInteraction.BLOCK;
@@ -28,7 +28,7 @@ index e69b0f4d54103fde67f9ae4c9bec686d2c949563..bdf174fafd9827e16ef4f12ce51991f2
private void endCrystalSettings() {
if (PurpurConfig.version < 31) {
if ("DESTROY".equals(getString("blocks.end-crystal.baseless.explosion-effect", baselessEndCrystalExplosionEffect.name()))) {
@@ -900,6 +901,7 @@ public class PurpurWorldConfig {
@@ -891,6 +892,7 @@ public class PurpurWorldConfig {
log(Level.SEVERE, "Unknown value for `blocks.end-crystal.base.explosion-effect`! Using default of `BLOCK`");
basedEndCrystalExplosionEffect = net.minecraft.world.level.Level.ExplosionInteraction.BLOCK;
}

4
patches/server/0299-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
View File

@@ -36,10 +36,10 @@ index cc03c02f290ee8d58a2fea54b1f977f49a2cec6e..49a2308832b24dc1eb839af786dbec9f
BeaconBlockEntity.playSound(world, pos, SoundEvents.BEACON_AMBIENT);
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index bdf174fafd9827e16ef4f12ce51991f2392411ea..c26e06d7dccce653e597117db9a4496d32a5e8d9 100644
index 2b651e83f37ac1a4a86e689ecc49f4d132f2599e..cb044fcf75485cc47f200dcaf2e585da187e3364 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -767,11 +767,13 @@ public class PurpurWorldConfig {
@@ -758,11 +758,13 @@ public class PurpurWorldConfig {
public int beaconLevelTwo = 30;
public int beaconLevelThree = 40;
public int beaconLevelFour = 50;

4
patches/server/0301-Config-to-remove-explosion-radius-clamp.patch
View File

@@ -27,10 +27,10 @@ index e35ebb5b923c2f63e37e5dae006bc4a030e49bb7..dcc3b333f3647631e2fb695d0854036d
}
// CraftBukkit end
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c26e06d7dccce653e597117db9a4496d32a5e8d9..13608504bf7e277b124b11baa69419c067057b5c 100644
index cb044fcf75485cc47f200dcaf2e585da187e3364..14bae922d201ca7fe1d152f84b8bd6d2d4671626 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -219,6 +219,11 @@ public class PurpurWorldConfig {
@@ -215,6 +215,11 @@ public class PurpurWorldConfig {
entitySharedRandom = getBoolean("settings.entity.shared-random", entitySharedRandom);
}

4
patches/server/0302-bonemealable-sugarcane-cactus-and-netherwart.patch
View File

@@ -137,10 +137,10 @@ index c3f500580d257e1397f2eb7c47b063a6fe6bb405..0d5c6bdfd4aeda472804b493315bf21a
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 13608504bf7e277b124b11baa69419c067057b5c..03de8bc1bebf24b804a14ff063c4c49709e9e775 100644
index 14bae922d201ca7fe1d152f84b8bd6d2d4671626..882b362b756c2203a2d3ffc4edb6cdb68e6f3879 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -826,8 +826,20 @@ public class PurpurWorldConfig {
@@ -817,8 +817,20 @@ public class PurpurWorldConfig {
}
public boolean cactusBreaksFromSolidNeighbors = true;

4
patches/server/0306-Add-mending-multiplier.patch
View File

@@ -27,7 +27,7 @@ index 7ccf214d376771814b27aa8e1f34d5a73f1b61f5..3e42b12804f37c4b0ab083273a105939
public int getValue() {
return this.value;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 03de8bc1bebf24b804a14ff063c4c49709e9e775..778894adf1da0ee80f00c4c02b7b9ec3aaeaebdc 100644
index 882b362b756c2203a2d3ffc4edb6cdb68e6f3879..d37fb48ec7c4cef4a30da30471c9d8080babe67b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -121,6 +121,7 @@ public class PurpurWorldConfig {
@@ -38,7 +38,7 @@ index 03de8bc1bebf24b804a14ff063c4c49709e9e775..778894adf1da0ee80f00c4c02b7b9ec3
public boolean alwaysTameInCreative = false;
public boolean boatEjectPlayersOnLand = false;
public boolean boatsDoFallDamage = false;
@@ -150,6 +151,7 @@ public class PurpurWorldConfig {
@@ -148,6 +149,7 @@ public class PurpurWorldConfig {
public int mobLastHurtByPlayerTime = 100;
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);