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

all the patches \o/

Browse Source
This commit is contained in:
granny
2023-06-09 02:58:35 -07:00
parent 1cfcb9f28e
commit 237b71ba21
240 changed files with 1241 additions and 1331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
patches/todo/server/0068-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch → patches/server/0069-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
index 64f17b4a22454b59968787089253eaba0a04c1f2..b373f9e4b5a2604bcbccd36cd3de961f3a41cd32 100644
index 5465711d486e5f265a26042031e895fb09e30608..767cd1dad6bb9857501abe04f5023ca3ffa5fdd2 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
@@ -30,6 +30,12 @@ public class EndCrystal extends Entity {
@@ -73,7 +73,7 @@ index 64f17b4a22454b59968787089253eaba0a04c1f2..b373f9e4b5a2604bcbccd36cd3de961f
@Override
protected void addAdditionalSaveData(CompoundTag nbt) {
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 e271555ac03fcbb565a7fe08efdc9a6036164e74..fd02dfb905c71fa10e0830cf0a02d4b63b81f23f 100644
index 2189058a752986179165fb904513796e7220438e..b0aad0632ed2c6004222a4715c2643eff13f030c 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
@@ -49,6 +49,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -84,9 +84,9 @@ index e271555ac03fcbb565a7fe08efdc9a6036164e74..fd02dfb905c71fa10e0830cf0a02d4b6
public Phantom(EntityType<? extends Phantom> type, Level world) {
super(type, world);
@@ -131,6 +132,24 @@ public class Phantom extends FlyingMob implements Enemy {
}
return value;
@@ -116,6 +117,24 @@ public class Phantom extends FlyingMob implements Enemy {
level().addFreshEntity(flames);
return true;
}
+
+ @Override
@@ -109,7 +109,7 @@ index e271555ac03fcbb565a7fe08efdc9a6036164e74..fd02dfb905c71fa10e0830cf0a02d4b6
// Purpur end
@Override
@@ -145,11 +164,17 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -130,11 +149,17 @@ public class Phantom extends FlyingMob implements Enemy {
@Override
protected void registerGoals() {
@@ -258,26 +258,26 @@ index e271555ac03fcbb565a7fe08efdc9a6036164e74..fd02dfb905c71fa10e0830cf0a02d4b6
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 d98383a21bb7fbc64525e701add25f8d32499e9a..20573f2979277aa53f5377974ad910ec4428c435 100644
index aacee630b1f7a9c2bbcdf772df204e3d3ec4e52f..70576507db0a84b209729cdd2efa595bd0450042 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 {
@@ -1109,6 +1109,9 @@ public class PurpurWorldConfig {
public String phantomAttackDamage = "6 + size";
public Map<Integer, Double> phantomMaxHealthCache = new HashMap<>();
public Map<Integer, Double> phantomAttackDamageCache = new HashMap<>();
+ public double phantomAttackedByCrystalRadius = 0.0D;
+ public float phantomAttackedByCrystalDamage = 1.0F;
+ public double phantomOrbitCrystalRadius = 0.0D;
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1088,6 +1091,9 @@ public class PurpurWorldConfig {
public int phantomSpawnMinSkyDarkness = 5;
public boolean phantomSpawnOnlyAboveSeaLevel = true;
public boolean phantomSpawnOnlyWithVisibleSky = true;
@@ -1136,6 +1139,9 @@ public class PurpurWorldConfig {
phantomAttackDamage = getString("mobs.phantom.attributes.attack_damage", phantomAttackDamage);
phantomMaxHealthCache.clear();
phantomAttackDamageCache.clear();
+ 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);
}
public boolean pigRidable = false;
phantomSpawnMinSkyDarkness = getInt("mobs.phantom.spawn.min-sky-darkness", phantomSpawnMinSkyDarkness);
phantomSpawnOnlyAboveSeaLevel = getBoolean("mobs.phantom.spawn.only-above-sea-level", phantomSpawnOnlyAboveSeaLevel);
phantomSpawnOnlyWithVisibleSky = getBoolean("mobs.phantom.spawn.only-with-visible-sky", phantomSpawnOnlyWithVisibleSky);

2
patches/server/0069-Allow-color-codes-in-books.patch → patches/server/0070-Allow-color-codes-in-books.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 6ad34d0de6c5637f8c11c77ea8baee5ba040ff40..d7fbbc91dd72c0c93b973da773ca9b1bfb326677 100644
index 19186118731d0a57359b09c726aa009495d2113d..0e616bc3a09fcab0d5d3b6243c2e1d39223a2de1 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1344,13 +1344,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

6
patches/server/0070-Entity-lifespan.patch → patches/server/0071-Entity-lifespan.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index d7fbbc91dd72c0c93b973da773ca9b1bfb326677..25f502ef6248df703b73b955a1d1395d313094a3 100644
index 0e616bc3a09fcab0d5d3b6243c2e1d39223a2de1..00a41647b127552c511a16a88e1e8208423b645b 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2856,6 +2856,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -17,7 +17,7 @@ index d7fbbc91dd72c0c93b973da773ca9b1bfb326677..25f502ef6248df703b73b955a1d1395d
private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit
ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand);
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 1b18532360b9508a08ea46b48331acad3e37c049..0101b6e0df2a6651a22c84d0fae4ebfb37f8e682 100644
index ef290c4f243e07a15a489ddd7461b4f182cb2345..9f68247ffc31b67e1eb66d3b6449c44fe8549d0d 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -133,6 +133,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -94,7 +94,7 @@ index 1b18532360b9508a08ea46b48331acad3e37c049..0101b6e0df2a6651a22c84d0fae4ebfb
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index fce1ffd5a1d04a2a90d6a6eecc3736c79ef515fb..f553c681956dc6d93c0bf864d054a25ce6236115 100644
index 70576507db0a84b209729cdd2efa595bd0450042..af6cae292b86b7bfca06f869f22f1b4d40fdd81b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -127,6 +127,11 @@ public class PurpurWorldConfig {

2
patches/server/0071-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch → patches/server/0072-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
View File

@@ -48,7 +48,7 @@ index 851bffca44dce8680a34bd5e862c1c0794806021..20b3b2deae7b72cc16f5e47ad73fab4d
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 0b3b845ba43c8f78424cd843cf3ac69dda5a5bad..082a97f808aba17b03d67e939e282781a4793cf2 100644
index af6cae292b86b7bfca06f869f22f1b4d40fdd81b..7a6c463c91ec2de4dc118299bd3e7b3eabcd62ee 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -246,6 +246,7 @@ public class PurpurWorldConfig {

6
patches/server/0072-Squid-EAR-immunity.patch → 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 e31a46078056a559bfbdecd8d86b974bf372273e..8c2241cd2670ff4d945d3953dcc227cc63d5b7e0 100644
index 7a6c463c91ec2de4dc118299bd3e7b3eabcd62ee..d9696e006ecd97d01996cdd77fd151fc4c907adb 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1449,6 +1449,7 @@ public class PurpurWorldConfig {
@@ -1455,6 +1455,7 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public boolean squidControllable = true;
public double squidMaxHealth = 10.0D;
@@ -16,7 +16,7 @@ index e31a46078056a559bfbdecd8d86b974bf372273e..8c2241cd2670ff4d945d3953dcc227cc
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -1458,6 +1459,7 @@ public class PurpurWorldConfig {
@@ -1464,6 +1465,7 @@ public class PurpurWorldConfig {
set("mobs.squid.attributes.max_health", oldValue);
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);

20
patches/server/0073-Phantoms-burn-in-light.patch → patches/server/0074-Phantoms-burn-in-light.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms burn in light
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 cd6a25bb101555d6c763a7023d1b05691e671b5f..67aa490540d264775d8a8382cb5922f365ca6913 100644
index b0aad0632ed2c6004222a4715c2643eff13f030c..776602b545f5ee3b566787befb0f43075ce02a29 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
@@ -49,6 +49,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -13,29 +13,29 @@ index cd6a25bb101555d6c763a7023d1b05691e671b5f..67aa490540d264775d8a8382cb5922f3
public BlockPos anchorPoint;
Phantom.AttackPhase attackPhase;
+ private static final net.minecraft.world.item.crafting.Ingredient TORCH = net.minecraft.world.item.crafting.Ingredient.of(net.minecraft.world.item.Items.TORCH, net.minecraft.world.item.Items.SOUL_TORCH); // Purpur
Vec3 crystalPosition; // Purpur
public Phantom(EntityType<? extends Phantom> type, Level world) {
super(type, world);
@@ -222,7 +223,12 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -247,7 +248,12 @@ public class Phantom extends FlyingMob implements Enemy {
@Override
public void aiStep() {
- if (this.isAlive() && shouldBurnInDay && this.isSunBurnTick()) { // Paper - Configurable Burning
+ // Purpur start
+ boolean burnFromDaylight = this.shouldBurnInDay && this.level().purpurConfig.phantomBurnInDaylight;
+ boolean burnFromLightSource = this.level().purpurConfig.phantomBurnInLight > 0 && this.level.getMaxLocalRawBrightness(blockPosition()) >= this.level().purpurConfig.phantomBurnInLight;
+ boolean burnFromLightSource = this.level().purpurConfig.phantomBurnInLight > 0 && this.level().getMaxLocalRawBrightness(blockPosition()) >= this.level().purpurConfig.phantomBurnInLight;
+ if (this.isAlive() && (burnFromDaylight || burnFromLightSource)) { // Paper - Configurable Burning
+ if (getRider() == null || !this.isControllable())
+ // Purpur end
if (getRider() == null || !this.isControllable()) // Purpur
this.setSecondsOnFire(8);
}
@@ -514,6 +520,12 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -657,6 +663,12 @@ public class Phantom extends FlyingMob implements Enemy {
return false;
} else if (!entityliving.isAlive()) {
return false;
+ // Purpur start
+ } else if (level().purpurConfig.phantomBurnInLight > 0 && level.getLightEmission(new BlockPos(Phantom.this)) >= level().purpurConfig.phantomBurnInLight) {
+ } else if (level().purpurConfig.phantomBurnInLight > 0 && level().getLightEmission(new BlockPos(Phantom.this)) >= level().purpurConfig.phantomBurnInLight) {
+ return false;
+ } else if (level().purpurConfig.phantomIgnorePlayersWithTorch && (TORCH.test(entityliving.getItemInHand(net.minecraft.world.InteractionHand.MAIN_HAND)) || TORCH.test(entityliving.getItemInHand(net.minecraft.world.InteractionHand.OFF_HAND)))) {
+ return false;
@@ -43,7 +43,7 @@ index cd6a25bb101555d6c763a7023d1b05691e671b5f..67aa490540d264775d8a8382cb5922f3
} else {
if (entityliving instanceof Player) {
Player entityhuman = (Player) entityliving;
@@ -659,6 +671,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -802,6 +814,7 @@ public class Phantom extends FlyingMob implements Enemy {
this.nextScanTick = reducedTickDelay(60);
List<Player> list = Phantom.this.level().getNearbyPlayers(this.attackTargeting, Phantom.this, Phantom.this.getBoundingBox().inflate(16.0D, 64.0D, 16.0D));
@@ -52,10 +52,10 @@ index cd6a25bb101555d6c763a7023d1b05691e671b5f..67aa490540d264775d8a8382cb5922f3
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 8c2241cd2670ff4d945d3953dcc227cc63d5b7e0..93aaa9d4413e10af4cb1fca15bc9627a7ded3955 100644
index d9696e006ecd97d01996cdd77fd151fc4c907adb..243f427b181d4b24810e6357968b2d5996873566 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1122,6 +1122,9 @@ public class PurpurWorldConfig {
@@ -1125,6 +1125,9 @@ public class PurpurWorldConfig {
public double phantomSpawnLocalDifficultyChance = 3.0D;
public int phantomSpawnMinPerAttempt = 1;
public int phantomSpawnMaxPerAttempt = -1;
@@ -65,7 +65,7 @@ index 8c2241cd2670ff4d945d3953dcc227cc63d5b7e0..93aaa9d4413e10af4cb1fca15bc9627a
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1149,6 +1152,9 @@ public class PurpurWorldConfig {
@@ -1155,6 +1158,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/0074-Configurable-villager-breeding.patch → 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 93aaa9d4413e10af4cb1fca15bc9627a7ded3955..a5d7a2e70068b08b49e7ccddbe222ca808f693b7 100644
index 243f427b181d4b24810e6357968b2d5996873566..769cc5910468fddab1fbe8751e9dc4d30d4647f0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1607,6 +1607,7 @@ public class PurpurWorldConfig {
@@ -1613,6 +1613,7 @@ public class PurpurWorldConfig {
public double villagerMaxHealth = 20.0D;
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
@@ -29,7 +29,7 @@ index 93aaa9d4413e10af4cb1fca15bc9627a7ded3955..a5d7a2e70068b08b49e7ccddbe222ca8
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1619,6 +1620,7 @@ public class PurpurWorldConfig {
@@ -1625,6 +1626,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);

2
patches/server/0075-Redstone-deactivates-spawners.patch → patches/server/0076-Redstone-deactivates-spawners.patch
View File

@@ -17,7 +17,7 @@ index 8fdbc603486ff8a902b6327bc2acfb86a806626e..cb9acec46677048bd8ffbb0e3f2f0378
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index da232210c18f9389dd51a30f4bf72b4e913513c2..bb136d077690654a8fa62a2aad73134487d07bd9 100644
index 769cc5910468fddab1fbe8751e9dc4d30d4647f0..12db36e5496fba216863679a49ec1757ea26a349 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -358,6 +358,11 @@ public class PurpurWorldConfig {

2
patches/server/0076-Totems-work-in-inventory.patch → patches/server/0077-Totems-work-in-inventory.patch
View File

@@ -28,7 +28,7 @@ index 20b3b2deae7b72cc16f5e47ad73fab4d9779d047..27df4e881e850a73947651ce7ad98df5
EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot);
event.setCancelled(itemstack == null);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 1a880d0a1235fc223ca3a84e2695cd8c0dccfdee..e59f52a32f6300f5d2048a27bfa590f26432cdd0 100644
index 12db36e5496fba216863679a49ec1757ea26a349..d30c6b98d394576c8eab5c298b9c731e6bd70cfa 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -247,6 +247,7 @@ public class PurpurWorldConfig {

6
patches/server/0077-Add-vindicator-johnny-spawn-chance.patch → 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 e59f52a32f6300f5d2048a27bfa590f26432cdd0..66162ef0ed12cd0bc4c705758dbbca19c3952d19 100644
index d30c6b98d394576c8eab5c298b9c731e6bd70cfa..c1e72cdb13d37f82721033dc619e643bc6d6aece 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1634,6 +1634,7 @@ public class PurpurWorldConfig {
@@ -1640,6 +1640,7 @@ public class PurpurWorldConfig {
public boolean vindicatorRidableInWater = true;
public boolean vindicatorControllable = true;
public double vindicatorMaxHealth = 24.0D;
@@ -33,7 +33,7 @@ index e59f52a32f6300f5d2048a27bfa590f26432cdd0..66162ef0ed12cd0bc4c705758dbbca19
private void vindicatorSettings() {
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
@@ -1644,6 +1645,7 @@ public class PurpurWorldConfig {
@@ -1650,6 +1651,7 @@ public class PurpurWorldConfig {
set("mobs.vindicator.attributes.max_health", oldValue);
}
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);

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

2
patches/server/0079-Dispensers-place-anvils-option.patch → patches/server/0080-Dispensers-place-anvils-option.patch
View File

@@ -41,7 +41,7 @@ index b4f5dbe9022dd20437c15c4f6fbe2ac06dacbadb..b52a9f05ada86f2d3767dd0d5ba8705e
static void setEntityPokingOutOfBlock(BlockSource pointer, Entity entity, Direction direction) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 6fc8425ad4a2053fb7769e7f579d7ae226070511..93b2e578a44132c92cb8152edb49a55f048a03bf 100644
index c1e72cdb13d37f82721033dc619e643bc6d6aece..b52a5b3cee95528be6edfcc488ab043225c81f67 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -321,8 +321,10 @@ public class PurpurWorldConfig {

2
patches/server/0080-Allow-anvil-colors.patch → patches/server/0081-Allow-anvil-colors.patch
View File

@@ -64,7 +64,7 @@ index b500a04b8135604f0159a741b3d228c9e87b2a46..6fc5699ad90127dc48fa9ff5cb6ba536
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e9275427cc3337091054842558ec22c9bc34b419..2c7417affdf20fe15303d5f604530a8a3aba0060 100644
index b52a5b3cee95528be6edfcc488ab043225c81f67..63d27e2ee263fdc8b165526f04781a1cf3e60894 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -299,6 +299,13 @@ public class PurpurWorldConfig {

4
patches/server/0081-Add-option-to-disable-dolphin-treasure-searching.patch → patches/server/0082-Add-option-to-disable-dolphin-treasure-searching.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to disable dolphin treasure searching
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 b206686fe55f56b9c4d94a7b54927bf74842b46c..c9bc4eec14f40a31dbbe928f14277b12044c3089 100644
index 08e9fd3581578195e5df079b086811c5964fd17a..7b2674233d0b8582243448c49d1c47271544d0b8 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
@@ -481,6 +481,7 @@ public class Dolphin extends WaterAnimal {
@@ -17,7 +17,7 @@ index b206686fe55f56b9c4d94a7b54927bf74842b46c..c9bc4eec14f40a31dbbe928f14277b12
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5c76e932a3299ec84543d988d9c931f238ad1f8d..c4b7cf6f1ca34d1ef9d1d9d7c3faa658ff060a06 100644
index 63d27e2ee263fdc8b165526f04781a1cf3e60894..a82912b348921f55962b48d052a4e492c7fbb224 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -609,6 +609,7 @@ public class PurpurWorldConfig {

2
patches/server/0082-Short-enderman-height.patch → patches/server/0083-Short-enderman-height.patch
View File

@@ -19,7 +19,7 @@ index b7e3efcca0b544440f8799a3be27e9288a55ca77..b144543131bb756294e02e05f83002fe
private static <T extends Entity> EntityType<T> register(String id, EntityType.Builder type) { // CraftBukkit - decompile error
diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
index 945abc20319819cca2631876cb0abca07f7a730a..ba7d9d2b6927dd20e82009d57d77f713ab9be8ab 100644
index 54b59b7faf69d54c05bdfee9b1bd2f137a5dd958..15eb4c93ddd4ea06640ff45e11c54b5c761ca89a 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -267,6 +267,7 @@ public class EnderMan extends Monster implements NeutralMob {

6
patches/server/0083-Stop-squids-floating-on-top-of-water.patch → 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 45ee2548ebb5c41eccada81ffd859be2d97f4cd8..6a252d335c5040cad8180b992943dc7041840752 100644
index a82912b348921f55962b48d052a4e492c7fbb224..506a61275a5baf285a061afb92ea8bd5fd22b541 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1474,6 +1474,7 @@ public class PurpurWorldConfig {
@@ -1480,6 +1480,7 @@ public class PurpurWorldConfig {
public boolean squidControllable = true;
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
@@ -65,7 +65,7 @@ index 45ee2548ebb5c41eccada81ffd859be2d97f4cd8..6a252d335c5040cad8180b992943dc70
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -1484,6 +1485,7 @@ public class PurpurWorldConfig {
@@ -1490,6 +1491,7 @@ public class PurpurWorldConfig {
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);

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

2
patches/server/0085-Entities-can-use-portals-configuration.patch → patches/server/0086-Entities-can-use-portals-configuration.patch
View File

@@ -27,7 +27,7 @@ index 0c18b2b3fcb64aa8c606e0823f365435929fe6f8..68233db015138b0a615a65eac8c11afc
public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 6a252d335c5040cad8180b992943dc7041840752..558562f574a31e748710e68a67baa1292d794b30 100644
index 506a61275a5baf285a061afb92ea8bd5fd22b541..aa723588cb7209ae44bb6796c8d78c168efc6b08 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -100,6 +100,7 @@ public class PurpurWorldConfig {

0
patches/server/0086-LivingEntity-broadcastItemBreak.patch → patches/server/0087-LivingEntity-broadcastItemBreak.patch
View File

8
patches/server/0087-Customizable-wither-health-and-healing.patch → patches/server/0088-Customizable-wither-health-and-healing.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Customizable wither health and healing
Adds the ability to customize the health of the wither, as well as the amount that it heals, and how often.
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 45c050f2b9cebfa629c908cb3b91a909489b8ec1..b39a7dfb910e99f04275fa8e246581f5ccc27afa 100644
index a20017a6086421061ee13df9cf37e08eeb515a5b..c2f4ae412684cc2f8d3cc2206003be5c9e3b2769 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
@@ -529,8 +529,10 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -23,10 +23,10 @@ index 45c050f2b9cebfa629c908cb3b91a909489b8ec1..b39a7dfb910e99f04275fa8e246581f5
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 558562f574a31e748710e68a67baa1292d794b30..09b253836220f0e6de3b0c804ffb34bd6480c809 100644
index aa723588cb7209ae44bb6796c8d78c168efc6b08..1e95bf6efe93c22f135fb15c4600c181580daf0a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1713,6 +1713,8 @@ public class PurpurWorldConfig {
@@ -1719,6 +1719,8 @@ public class PurpurWorldConfig {
public boolean witherControllable = true;
public double witherMaxY = 320D;
public double witherMaxHealth = 300.0D;
@@ -35,7 +35,7 @@ index 558562f574a31e748710e68a67baa1292d794b30..09b253836220f0e6de3b0c804ffb34bd
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1728,6 +1730,8 @@ public class PurpurWorldConfig {
@@ -1734,6 +1736,8 @@ public class PurpurWorldConfig {
set("mobs.wither.attributes.max_health", oldValue);
}
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);

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

@@ -59,7 +59,7 @@ index 5d199fe497bd852827d3d18fb7566a09e70331a3..6cd8a50289a6404441e9e5e08d82d2eb
if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) {
blockposition1 = blockposition2;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 0c0c2745a18593ee7da491d0f1b5c0d11aa1a3c4..88f3a76e1b88d70c781eb04c4c3de627d151e3df 100644
index 1e95bf6efe93c22f135fb15c4600c181580daf0a..82b4e05b4f4ad23bc98e81385bf0e715bf8cda50 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -71,6 +71,12 @@ public class PurpurWorldConfig {

2
patches/server/0089-Raid-cooldown-setting.patch → patches/server/0090-Raid-cooldown-setting.patch
View File

@@ -49,7 +49,7 @@ index 41457c9f27b18fa2734a6cca297ec5186470e82f..94356e0541f8f4da68211fa533347cc9
if (!this.raidMap.containsKey(raid.getId())) {
this.raidMap.put(raid.getId(), raid);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c97375f60d10121f738f0f162b15c3f25d7d0eeb..7ae9b221c851139be2e289a5baca644b7d19a8c5 100644
index 82b4e05b4f4ad23bc98e81385bf0e715bf8cda50..eddc7cffe43083edca3aad0696e15299e36b1a65 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -111,6 +111,7 @@ public class PurpurWorldConfig {

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

@@ -7,7 +7,7 @@ This patch's implementation has been removed in favor of Pufferfish's entity-tim
The config remains for migration purposes.
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 44af2919281fe6afc08401d68ba421e4ea963136..f6ee6a36d85531b5c39bb49c6b5a97dd7eb06444 100644
index eddc7cffe43083edca3aad0696e15299e36b1a65..9d3f312eabca30f9012acfe575eb13bf8ec221bd 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -292,6 +292,39 @@ public class PurpurWorldConfig {

6
patches/server/0091-Add-option-to-disable-zombie-aggressiveness-towards-.patch → 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 19ee5b742ea9cab725fd28e86917389f368e3a22..12676dd8b1e9a7de8ed5815a06e3d107ce1244a5 100644
index 9d3f312eabca30f9012acfe575eb13bf8ec221bd..a6fac67bc5defd71d9e5ccd580047b7c5f5d779f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1846,6 +1846,7 @@ public class PurpurWorldConfig {
@@ -1852,6 +1852,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyOnlyBaby = true;
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
@@ -81,7 +81,7 @@ index 19ee5b742ea9cab725fd28e86917389f368e3a22..12676dd8b1e9a7de8ed5815a06e3d107
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1860,6 +1861,7 @@ public class PurpurWorldConfig {
@@ -1866,6 +1867,7 @@ public class PurpurWorldConfig {
zombieJockeyOnlyBaby = getBoolean("mobs.zombie.jockey.only-babies", zombieJockeyOnlyBaby);
zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);

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

6
patches/server/0093-Flying-squids-Oh-my.patch → 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 12676dd8b1e9a7de8ed5815a06e3d107ce1244a5..03034444e0a0bbe680dfee0ab735cfad971e4fb5 100644
index a6fac67bc5defd71d9e5ccd580047b7c5f5d779f..dd1eced37919d62f571b9b4a524fb08cbe0cdf41 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 12676dd8b1e9a7de8ed5815a06e3d107ce1244a5..03034444e0a0bbe680dfee0ab735cfad
}
public boolean goatRidable = false;
@@ -1533,6 +1535,7 @@ public class PurpurWorldConfig {
@@ -1539,6 +1541,7 @@ public class PurpurWorldConfig {
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
public double squidOffsetWaterCheck = 0.0D;
@@ -82,7 +82,7 @@ index 12676dd8b1e9a7de8ed5815a06e3d107ce1244a5..03034444e0a0bbe680dfee0ab735cfad
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -1544,6 +1547,7 @@ public class PurpurWorldConfig {
@@ -1550,6 +1553,7 @@ public class PurpurWorldConfig {
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);

2
patches/server/0094-Infinity-bow-settings.patch → patches/server/0095-Infinity-bow-settings.patch
View File

@@ -27,7 +27,7 @@ index 08d597db1a5345a343777a01427655e6bf2c926b..33df0ca406dc8321b76b393f317bbd1c
} else {
user.startUsingItem(hand);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 37b6eb3ad99ffe2216bc1fe991c44cbe7b70bd40..1e92e006241e6e8d189081232d2430cfd590586d 100644
index dd1eced37919d62f571b9b4a524fb08cbe0cdf41..8c3a81393bb2d0ff251277cf81d5d0b8276b3628 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -142,6 +142,17 @@ public class PurpurWorldConfig {

2
patches/server/0095-Configurable-daylight-cycle.patch → patches/server/0096-Configurable-daylight-cycle.patch
View File

@@ -88,7 +88,7 @@ index 854e6e73a7fa9c2cd4f0b9beadbff6427c8346e5..3b512beac50bc5a2405ca3287b08e7ff
public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) {
Iterator iterator = this.customSpawners.iterator();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 471ccc46f2e33c68e91553d6cee76be323d20aee..af8aa98460e0fe8d9265087ebc3b6627cefde08e 100644
index 8c3a81393bb2d0ff251277cf81d5d0b8276b3628..11938cd9c6196f5cc89a13ad7a81d4e4fa8d0879 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -124,6 +124,13 @@ public class PurpurWorldConfig {

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

2
patches/server/0097-Furnace-uses-lava-from-underneath.patch → patches/server/0098-Furnace-uses-lava-from-underneath.patch
View File

@@ -47,7 +47,7 @@ index 448fa4f4f200430d6ce3051763c7ceb697696146..ca2052804ad829a1528a9c5a0a792275
private static boolean canBurn(RegistryAccess registryManager, @Nullable Recipe<?> recipe, NonNullList<ItemStack> slots, int count) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 88567bc4f504b00bec3841da194a0bd17abf9ce7..4d14c68c3d5a5ee8070a678740283c5b2938b7bf 100644
index 11938cd9c6196f5cc89a13ad7a81d4e4fa8d0879..ef6fe57cce6c6ef6c6820ab2bd676fbe4b30370e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -415,6 +415,17 @@ public class PurpurWorldConfig {

2
patches/server/0098-Arrows-should-not-reset-despawn-counter.patch → patches/server/0099-Arrows-should-not-reset-despawn-counter.patch
View File

@@ -20,7 +20,7 @@ index 7226be19248a1ffb8ff2c89b55882529d33a6c0c..4f98d7f755ad692dd9589134524a604e
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2589a64e795b69b2c9ace041202567f7959df32b..a0c82e8b354318fc2795432beb8b88f619e96dc4 100644
index ef6fe57cce6c6ef6c6820ab2bd676fbe4b30370e..d1d51f147c91cb99ff3dc03c5e461cf6acf529d4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -103,6 +103,11 @@ public class PurpurWorldConfig {

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

@@ -24,7 +24,7 @@ index d446b440e2bc5b73362fc3d30a10d2e52fde68e1..d4e3a32a0f9b49bff64cb43d77727ce3
return;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 9613301106d4f5ef9121400f8a32205428b6f4bf..90c9d40009d2e93732110915447190b81c902393 100644
index d1d51f147c91cb99ff3dc03c5e461cf6acf529d4..78e2afcbe361e32a023a9a3b0708b9c1705138a4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -416,8 +416,10 @@ public class PurpurWorldConfig {

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

@@ -104,7 +104,7 @@ index 8673d325bd866704ae90ac31eb54f78097eac952..10cff85dd4a59558dd487a3c5c7871a0
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 538055ccc9db86b41f204da91061807a637e6175..25976e5d003d61595db1292b294364c0a2f188b2 100644
index 78e2afcbe361e32a023a9a3b0708b9c1705138a4..39c8e6f7bf012e94c653c12383d2a7cf856e1123 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -117,6 +117,7 @@ public class PurpurWorldConfig {

44
patches/server/0101-Make-entity-breeding-times-configurable.patch → patches/server/0102-Make-entity-breeding-times-configurable.patch
View File

@@ -95,7 +95,7 @@ index 0f49705e3c7adf033cee9d0746319885c830224f..86b910cbb8d0e19dc9ae53078e730495
protected void registerGoals() {
this.goalSelector.addGoal(0, new FloatGoal(this));
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
index e5e84c85d2b1c84c7612392bb060f713bd03ddcf..1d17a9fcf80278779703e5cdd390ef0e52f9e437 100644
index b94ec05ffa0a6f9e7368731d360319ffe1b10e3f..371cab208ee0a31a90248272f88249eceaf9eb59 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
@@ -65,6 +65,11 @@ public class Cow extends Animal {
@@ -236,7 +236,7 @@ index b2cf680e377f849a7cc17136ebca3cf33e34048c..0df9900ecf211f3a0bcfab6daa931fdd
@Override
public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
index 48864c6f720be9132840e05ff4e7eb394ce3ad1d..c21d48eb213dac6c932edfe7c4161e76510450a4 100644
index 2f373666e982a8c4e769168b565ca26e75fe59e9..5443affd9dd8d27e32768c2df5a624b5cd7b1bec 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
@@ -142,6 +142,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
@@ -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 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dabb5ac09c9 100644
index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2b5a1681b 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 {
@@ -790,7 +790,7 @@ index 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dab
}
public boolean parrotRidable = false;
@@ -1278,6 +1312,7 @@ public class PurpurWorldConfig {
@@ -1284,6 +1318,7 @@ public class PurpurWorldConfig {
public boolean pigControllable = true;
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
@@ -798,7 +798,7 @@ index 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dab
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1289,6 +1324,7 @@ public class PurpurWorldConfig {
@@ -1295,6 +1330,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 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dab
}
public boolean piglinRidable = false;
@@ -1345,6 +1381,7 @@ public class PurpurWorldConfig {
@@ -1351,6 +1387,7 @@ public class PurpurWorldConfig {
public double polarBearMaxHealth = 30.0D;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -814,7 +814,7 @@ index 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dab
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1358,6 +1395,7 @@ public class PurpurWorldConfig {
@@ -1364,6 +1401,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 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dab
}
public boolean pufferfishRidable = false;
@@ -1380,6 +1418,7 @@ public class PurpurWorldConfig {
@@ -1386,6 +1424,7 @@ public class PurpurWorldConfig {
public double rabbitMaxHealth = 3.0D;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -830,7 +830,7 @@ index 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dab
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1392,6 +1431,7 @@ public class PurpurWorldConfig {
@@ -1398,6 +1437,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 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dab
}
public boolean ravagerRidable = false;
@@ -1428,6 +1468,7 @@ public class PurpurWorldConfig {
@@ -1434,6 +1474,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = true;
public boolean sheepControllable = true;
public double sheepMaxHealth = 8.0D;
@@ -846,7 +846,7 @@ index 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dab
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1438,6 +1479,7 @@ public class PurpurWorldConfig {
@@ -1444,6 +1485,7 @@ public class PurpurWorldConfig {
set("mobs.sheep.attributes.max_health", oldValue);
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -854,7 +854,7 @@ index 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dab
}
public boolean shulkerRidable = false;
@@ -1561,11 +1603,13 @@ public class PurpurWorldConfig {
@@ -1567,11 +1609,13 @@ public class PurpurWorldConfig {
public boolean snifferRidableInWater = true;
public boolean snifferControllable = true;
public double snifferMaxHealth = 14.0D;
@@ -868,7 +868,7 @@ index 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dab
}
public boolean squidRidable = false;
@@ -1624,6 +1668,7 @@ public class PurpurWorldConfig {
@@ -1630,6 +1674,7 @@ public class PurpurWorldConfig {
public boolean striderRidableInWater = false;
public boolean striderControllable = true;
public double striderMaxHealth = 20.0D;
@@ -876,7 +876,7 @@ index 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dab
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1634,6 +1679,7 @@ public class PurpurWorldConfig {
@@ -1640,6 +1685,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -884,7 +884,7 @@ index 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dab
}
public boolean tadpoleRidable = false;
@@ -1654,6 +1700,7 @@ public class PurpurWorldConfig {
@@ -1660,6 +1706,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -892,7 +892,7 @@ index 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dab
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1671,6 +1718,7 @@ public class PurpurWorldConfig {
@@ -1677,6 +1724,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 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dab
}
public boolean tropicalFishRidable = false;
@@ -1691,6 +1739,7 @@ public class PurpurWorldConfig {
@@ -1697,6 +1745,7 @@ public class PurpurWorldConfig {
public boolean turtleRidableInWater = true;
public boolean turtleControllable = true;
public double turtleMaxHealth = 30.0D;
@@ -908,7 +908,7 @@ index 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dab
private void turtleSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1701,6 +1750,7 @@ public class PurpurWorldConfig {
@@ -1707,6 +1756,7 @@ public class PurpurWorldConfig {
set("mobs.turtle.attributes.max_health", oldValue);
}
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
@@ -916,7 +916,7 @@ index 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dab
}
public boolean vexRidable = false;
@@ -1728,6 +1778,7 @@ public class PurpurWorldConfig {
@@ -1734,6 +1784,7 @@ public class PurpurWorldConfig {
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
public boolean villagerCanBreed = true;
@@ -924,7 +924,7 @@ index 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dab
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1741,6 +1792,7 @@ public class PurpurWorldConfig {
@@ -1747,6 +1798,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 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dab
}
public boolean vindicatorRidable = false;
@@ -1852,6 +1904,7 @@ public class PurpurWorldConfig {
@@ -1858,6 +1910,7 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = true;
public boolean wolfControllable = true;
public double wolfMaxHealth = 8.0D;
@@ -940,7 +940,7 @@ index 420cf8bfa9b83c30ed0691bf2203f566c53b07c3..b047f91925dd38bc514e0a7a0d265dab
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1862,6 +1915,7 @@ public class PurpurWorldConfig {
@@ -1868,6 +1921,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

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

@@ -136,7 +136,7 @@ index b2ad6d230de2c29f371178bccde1111c7532ee70..6667926519a0f1c151e53f59cce36e74
if (((HangingEntity) object).survives()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 8223c4c0c24dc222fd4dad216c1b2b7daa98305f..88bc6cdabe0c3c0fb72bc4c88feb3cb376579784 100644
index e0074e78a66eb425d45d1d17da6663b2b5a1681b..1fea447181f3bf032962d9cc7ff402fff1d76d2a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -99,8 +99,10 @@ public class PurpurWorldConfig {

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

@@ -17,7 +17,7 @@ index 2941c16ef486345b57ab2dfcd26f0272285d3b5a..7cc6812bf6f2ba015f65fd1fc1eaac02
((Mob) newEntityLiving).setPersistenceRequired();
// Paper end
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 88bc6cdabe0c3c0fb72bc4c88feb3cb376579784..edf78456ecd22923503732242e2fb04c15a7a5d6 100644
index 1fea447181f3bf032962d9cc7ff402fff1d76d2a..db4c2f00e8e1121426166ec0bf45d01e93fc3fa2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -100,9 +100,11 @@ public class PurpurWorldConfig {

2
patches/server/0104-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch → patches/server/0105-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
View File

@@ -21,7 +21,7 @@ index 15eb4c93ddd4ea06640ff45e11c54b5c761ca89a..47b82549b401acca5e9a5702d4167465
private static class EndermanFreezeWhenLookedAt extends Goal {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index edf78456ecd22923503732242e2fb04c15a7a5d6..5f7069b47deed8835aa91303e2c037e09e78fbc5 100644
index db4c2f00e8e1121426166ec0bf45d01e93fc3fa2..448eaab8347dd66cf060d45783e5d4b0442a6774 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -832,6 +832,7 @@ public class PurpurWorldConfig {

2
patches/server/0105-Add-configurable-snowball-damage.patch → patches/server/0106-Add-configurable-snowball-damage.patch
View File

@@ -18,7 +18,7 @@ index 718e120c9768cf716b32d3d652f53f1dda925168..b90cedad282e95a067aca176fafa9f72
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5f7069b47deed8835aa91303e2c037e09e78fbc5..168da72bdbb443f8c5bebc7d2a1ed8820020cf49 100644
index 448eaab8347dd66cf060d45783e5d4b0442a6774..f8df67b41acde045321dbfb9e2cefb008544a6dd 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -356,6 +356,11 @@ public class PurpurWorldConfig {

4
patches/server/0106-Changeable-Mob-Left-Handed-Chance.patch → patches/server/0107-Changeable-Mob-Left-Handed-Chance.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Changeable Mob Left Handed Chance
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 0101b6e0df2a6651a22c84d0fae4ebfb37f8e682..4fbc1fa9d3d37129b2ef243b65844dce9fe44884 100644
index 9f68247ffc31b67e1eb66d3b6449c44fe8549d0d..c8e394ebd6d2393ef77b95d6f20fcbf6040a1dc5 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1289,7 +1289,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -18,7 +18,7 @@ index 0101b6e0df2a6651a22c84d0fae4ebfb37f8e682..4fbc1fa9d3d37129b2ef243b65844dce
} else {
this.setLeftHanded(false);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index abb4fb180bc16441e294f77a3b8a1b9d5543061f..cdbf53d7c249d418d5958372b81ab9e7b3236925 100644
index f8df67b41acde045321dbfb9e2cefb008544a6dd..136b818e867be9c327bc1e0be590716445623953 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -158,8 +158,10 @@ public class PurpurWorldConfig {

4
patches/server/0107-Add-boat-fall-damage-config.patch → patches/server/0108-Add-boat-fall-damage-config.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add boat fall damage config
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 8dc74f36bcccc4b5023fafce22115778ec08bff6..344ea725ab5f4fb373542dac63761263dfe95035 100644
index 14d5af88fb39af6bc6a8461972de3a96ad4f0de8..f71101057b89cd0393d8a64760d1ae9e7a50beb6 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1112,7 +1112,16 @@ public class ServerPlayer extends Player {
@@ -27,7 +27,7 @@ index 8dc74f36bcccc4b5023fafce22115778ec08bff6..344ea725ab5f4fb373542dac63761263
if (!flag && isSpawnInvulnerable() && !source.is(DamageTypeTags.BYPASSES_INVULNERABILITY)) { // Purpur
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 4af6702e967bec733bbd5ba21dc8599f7b25a7cc..9fa8f9fb1c36157f849b81ae712bed28e4a68b8f 100644
index 136b818e867be9c327bc1e0be590716445623953..b991de8c4761f6fd82d0c8f325d90fa9e2425d9f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -114,6 +114,7 @@ public class PurpurWorldConfig {

6
patches/server/0108-Snow-Golem-rate-of-fire-config.patch → 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 9fa8f9fb1c36157f849b81ae712bed28e4a68b8f..5aeb547458ab4a632e64189c749586bba86d20d9 100644
index b991de8c4761f6fd82d0c8f325d90fa9e2425d9f..45654f3d541a8e66d283f044d20d2d48ee4f40a7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1601,6 +1601,10 @@ public class PurpurWorldConfig {
@@ -1607,6 +1607,10 @@ public class PurpurWorldConfig {
public double snowGolemMaxHealth = 4.0D;
public boolean snowGolemDropsPumpkin = true;
public boolean snowGolemPutPumpkinBack = false;
@@ -37,7 +37,7 @@ index 9fa8f9fb1c36157f849b81ae712bed28e4a68b8f..5aeb547458ab4a632e64189c749586bb
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1614,6 +1618,10 @@ public class PurpurWorldConfig {
@@ -1620,6 +1624,10 @@ public class PurpurWorldConfig {
snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);
snowGolemDropsPumpkin = getBoolean("mobs.snow_golem.drop-pumpkin-when-sheared", snowGolemDropsPumpkin);
snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);

0
patches/server/0109-EMC-Configurable-disable-give-dropping.patch → patches/server/0110-EMC-Configurable-disable-give-dropping.patch
View File

6
patches/server/0110-Toggle-for-Zombified-Piglin-death-always-counting-as.patch → patches/server/0111-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 5aeb547458ab4a632e64189c749586bba86d20d9..b29c4380dc2bc7c0aab0e47b5714f14883e7a919 100644
index 45654f3d541a8e66d283f044d20d2d48ee4f40a7..cc3cc85b7119865a622dd61acc1c84708256876b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2039,6 +2039,7 @@ public class PurpurWorldConfig {
@@ -2045,6 +2045,7 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinJockeyOnlyBaby = true;
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
@@ -46,7 +46,7 @@ index 5aeb547458ab4a632e64189c749586bba86d20d9..b29c4380dc2bc7c0aab0e47b5714f148
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -2053,5 +2054,6 @@ public class PurpurWorldConfig {
@@ -2059,5 +2060,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/0111-Configurable-chance-for-wolves-to-spawn-rabid.patch → patches/server/0112-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 436e09a655f5fa7eb69d00cb4c68b6b9d9b9106d..37b6e2de8be125d2e2dc9649af6114a5fab5f66c 100644
index cc3cc85b7119865a622dd61acc1c84708256876b..6e656c74019f44b804ea6734139b3859d2a2b1df 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1929,6 +1929,8 @@ public class PurpurWorldConfig {
@@ -1935,6 +1935,8 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = true;
public boolean wolfControllable = true;
public double wolfMaxHealth = 8.0D;
@@ -233,7 +233,7 @@ index 436e09a655f5fa7eb69d00cb4c68b6b9d9b9106d..37b6e2de8be125d2e2dc9649af6114a5
public int wolfBreedingTicks = 6000;
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
@@ -1940,6 +1942,8 @@ public class PurpurWorldConfig {
@@ -1946,6 +1948,8 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

8
patches/server/0112-Configurable-default-collar-color.patch → patches/server/0113-Configurable-default-collar-color.patch
View File

@@ -26,7 +26,7 @@ index ffa2128b63e5e45c2a41e31a6b8b6e8df0bf9be4..956f125c9ae62537570bb9870be66872
@Override
public Cat getBreedOffspring(ServerLevel world, AgeableMob entity) {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
index 563347f7b683d796f7d3575206d40656247a897c..6b270c1aa37096443701d7f4fbdab006afe2556c 100644
index aa484d03ed31f6c60c0b4456a4047bc38a40ea4a..89627025c0b5464900a5ea818c7aaf5d676f7a5f 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
@@ -203,6 +203,12 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -43,7 +43,7 @@ index 563347f7b683d796f7d3575206d40656247a897c..6b270c1aa37096443701d7f4fbdab006
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 37b6e2de8be125d2e2dc9649af6114a5fab5f66c..bdf02c6e7893646f91a6be926b341a4079ecc743 100644
index 6e656c74019f44b804ea6734139b3859d2a2b1df..dfb3e53954e7247199427ba8e35a97160af25d55 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 37b6e2de8be125d2e2dc9649af6114a5fab5f66c..bdf02c6e7893646f91a6be926b341a40
}
public boolean caveSpiderRidable = false;
@@ -1929,6 +1935,7 @@ public class PurpurWorldConfig {
@@ -1935,6 +1941,7 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = true;
public boolean wolfControllable = true;
public double wolfMaxHealth = 8.0D;
@@ -74,7 +74,7 @@ index 37b6e2de8be125d2e2dc9649af6114a5fab5f66c..bdf02c6e7893646f91a6be926b341a40
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -1942,6 +1949,11 @@ public class PurpurWorldConfig {
@@ -1948,6 +1955,11 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

59
patches/todo/server/0114-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch → patches/server/0114-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
View File

@@ -8,10 +8,10 @@ farm Nether Wart. Reimplemented based on a feature of the carpet-extra
mod.
diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java b/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
index 7ad71f2c139c2288b49d6b0fde3f8b8013f5e095..ed67d2adf06f7ae9c451648e30945ad289ceae38 100644
index 5bb3db5e1f47ef56ef40c84f06a1c5ae59f84c89..f9665eaade08b6ac4f728a65acba025e783dbd08 100644
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
@@ -34,6 +34,7 @@ public class HarvestFarmland extends Behavior<Villager> {
@@ -39,6 +39,7 @@ public class HarvestFarmland extends Behavior<Villager> {
private long nextOkStartTime;
private int timeWorkedSoFar;
private final List<BlockPos> validFarmlandAroundVillager = Lists.newArrayList();
@@ -19,7 +19,7 @@ index 7ad71f2c139c2288b49d6b0fde3f8b8013f5e095..ed67d2adf06f7ae9c451648e30945ad2
public HarvestFarmland() {
super(ImmutableMap.of(MemoryModuleType.LOOK_TARGET, MemoryStatus.VALUE_ABSENT, MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT, MemoryModuleType.SECONDARY_JOB_SITE, MemoryStatus.VALUE_PRESENT));
@@ -42,9 +43,10 @@ public class HarvestFarmland extends Behavior<Villager> {
@@ -47,9 +48,10 @@ public class HarvestFarmland extends Behavior<Villager> {
protected boolean checkExtraStartConditions(ServerLevel world, Villager entity) {
if (!world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
return false;
@@ -31,7 +31,7 @@ index 7ad71f2c139c2288b49d6b0fde3f8b8013f5e095..ed67d2adf06f7ae9c451648e30945ad2
BlockPos.MutableBlockPos blockposition_mutableblockposition = entity.blockPosition().mutable();
this.validFarmlandAroundVillager.clear();
@@ -75,6 +77,7 @@ public class HarvestFarmland extends Behavior<Villager> {
@@ -80,6 +82,7 @@ public class HarvestFarmland extends Behavior<Villager> {
Block block = iblockdata.getBlock();
Block block1 = world.getBlockState(pos.below()).getBlock();
@@ -39,7 +39,7 @@ index 7ad71f2c139c2288b49d6b0fde3f8b8013f5e095..ed67d2adf06f7ae9c451648e30945ad2
return block instanceof CropBlock && ((CropBlock) block).isMaxAge(iblockdata) || iblockdata.isAir() && block1 instanceof FarmBlock;
}
@@ -100,7 +103,7 @@ public class HarvestFarmland extends Behavior<Villager> {
@@ -105,7 +108,7 @@ public class HarvestFarmland extends Behavior<Villager> {
Block block = iblockdata.getBlock();
Block block1 = world.getBlockState(this.aboveFarmlandPos.below()).getBlock();
@@ -48,7 +48,7 @@ index 7ad71f2c139c2288b49d6b0fde3f8b8013f5e095..ed67d2adf06f7ae9c451648e30945ad2
// CraftBukkit start
if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entity, this.aboveFarmlandPos, Blocks.AIR.defaultBlockState()).isCancelled()) {
world.destroyBlock(this.aboveFarmlandPos, true, entity);
@@ -108,7 +111,7 @@ public class HarvestFarmland extends Behavior<Villager> {
@@ -113,14 +116,14 @@ public class HarvestFarmland extends Behavior<Villager> {
// CraftBukkit end
}
@@ -57,20 +57,15 @@ index 7ad71f2c139c2288b49d6b0fde3f8b8013f5e095..ed67d2adf06f7ae9c451648e30945ad2
SimpleContainer inventorysubcontainer = entity.getInventory();
for (int j = 0; j < inventorysubcontainer.getContainerSize(); ++j) {
@@ -119,6 +122,12 @@ public class HarvestFarmland extends Behavior<Villager> {
BlockState iblockdata1;
ItemStack itemstack = inventorysubcontainer.getItem(j);
boolean flag = false;
// CraftBukkit start
+ // Purpur start
+ if (this.clericWartFarmer && itemstack.getItem() == Items.NETHER_WART) {
+ iblockdata1 = Blocks.NETHER_WART.defaultBlockState();
+ flag = true;
+ } else
+ // Purpur end
if (itemstack.is(Items.WHEAT_SEEDS)) {
iblockdata1 = Blocks.WHEAT.defaultBlockState();
flag = true;
@@ -145,7 +154,7 @@ public class HarvestFarmland extends Behavior<Villager> {
- if (!itemstack.isEmpty() && itemstack.is(ItemTags.VILLAGER_PLANTABLE_SEEDS)) {
+ if (!itemstack.isEmpty() && (itemstack.is(ItemTags.VILLAGER_PLANTABLE_SEEDS) || this.clericWartFarmer && itemstack.getItem() == net.minecraft.world.item.Items.NETHER_WART)) {
Item item = itemstack.getItem();
if (item instanceof BlockItem) {
@@ -138,7 +141,7 @@ public class HarvestFarmland extends Behavior<Villager> {
}
if (flag) {
@@ -143,10 +138,10 @@ index cb1d91f9fe98f21c2afbe3894dfd9bca3bdd3ba6..d2703432af207c74ea8d298a784329c3
brain.setMemory(MemoryModuleType.SECONDARY_JOB_SITE, list);
} else {
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index aa95cd7e04e25dec63c172d219f1f16cd6c9c4b5..8e2015fc122a93015482a81b2bbfa1127d6a0db6 100644
index 52a84f354cc51b3ca875756514588b2e6309fc25..0378faa19053dbcb74315e3fd6f96a37a226de4e 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -222,7 +222,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -221,7 +221,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
brain.addActivity(Activity.PLAY, VillagerGoalPackages.getPlayPackage(0.5F));
} else {
brain.setSchedule(Schedule.VILLAGER_DEFAULT);
@@ -156,17 +151,17 @@ index aa95cd7e04e25dec63c172d219f1f16cd6c9c4b5..8e2015fc122a93015482a81b2bbfa112
brain.addActivity(Activity.CORE, VillagerGoalPackages.getCorePackage(villagerprofession, 0.5F));
@@ -972,6 +972,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
}
public boolean hasFarmSeeds() {
+ // Purpur start
+ if (this.level().purpurConfig.villagerClericsFarmWarts && this.getVillagerData().getProfession() == VillagerProfession.CLERIC) {
+ return this.getInventory().hasAnyOf(ImmutableSet.of(Items.NETHER_WART));
+ }
+ // Purpur end
return this.getInventory().hasAnyOf(ImmutableSet.of(Items.WHEAT_SEEDS, Items.POTATO, Items.CARROT, Items.BEETROOT_SEEDS));
return this.getInventory().hasAnyMatching((itemstack) -> {
+ // Purpur start
+ if (this.level().purpurConfig.villagerClericsFarmWarts && this.getVillagerData().getProfession() == VillagerProfession.CLERIC) {
+ return itemstack.is(Items.NETHER_WART);
+ }
+ // Purpur end
return itemstack.is(ItemTags.VILLAGER_PLANTABLE_SEEDS);
});
}
diff --git a/src/main/java/net/minecraft/world/entity/npc/VillagerProfession.java b/src/main/java/net/minecraft/world/entity/npc/VillagerProfession.java
index ac70c2c03241e73943bd517a8c69dd05e0873634..0318663a824d2a9515f867a075d148c3fcb1a907 100644
--- a/src/main/java/net/minecraft/world/entity/npc/VillagerProfession.java
@@ -181,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 496b797910b1248662289fab16ed5fa3390d0c4d..1ffdd96306b525f217a630b4f8f05e16c0e8b7cd 100644
index dfb3e53954e7247199427ba8e35a97160af25d55..b4c1ab716d7428d663ddcaca9bb1a12ffcea99c9 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 {
@@ -1816,6 +1816,8 @@ public class PurpurWorldConfig {
public boolean villagerCanBeLeashed = false;
public boolean villagerCanBreed = true;
public int villagerBreedingTicks = 6000;
@@ -193,7 +188,7 @@ index 496b797910b1248662289fab16ed5fa3390d0c4d..1ffdd96306b525f217a630b4f8f05e16
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1824,6 +1826,8 @@ public class PurpurWorldConfig {
@@ -1830,6 +1832,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);

10
patches/server/0113-Phantom-flames-on-swoop.patch → patches/server/0115-Phantom-flames-on-swoop.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Phantom flames on swoop
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 67aa490540d264775d8a8382cb5922f365ca6913..a9a942896dd428cd974970cac16857c27d08a7ec 100644
index 776602b545f5ee3b566787befb0f43075ce02a29..29167ec21bc68e43c6505b6b1ee376d75a43c1ef 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
@@ -219,6 +219,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -244,6 +244,7 @@ public class Phantom extends FlyingMob implements Enemy {
this.level().addParticle(ParticleTypes.MYCELIUM, this.getX() - (double) f2, this.getY() + (double) f4, this.getZ() - (double) f3, 0.0D, 0.0D, 0.0D);
}
@@ -17,10 +17,10 @@ index 67aa490540d264775d8a8382cb5922f365ca6913..a9a942896dd428cd974970cac16857c2
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 0d9a4180f3af0752a44c0829df48fc0bbb52a116..3a1c437eab3783c02e2adac370f49f016b107a27 100644
index b4c1ab716d7428d663ddcaca9bb1a12ffcea99c9..27b506558ad224c46fb47b984129ed392398ea09 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1298,6 +1298,7 @@ public class PurpurWorldConfig {
@@ -1301,6 +1301,7 @@ public class PurpurWorldConfig {
public int phantomBurnInLight = 0;
public boolean phantomIgnorePlayersWithTorch = false;
public boolean phantomBurnInDaylight = true;
@@ -28,7 +28,7 @@ index 0d9a4180f3af0752a44c0829df48fc0bbb52a116..3a1c437eab3783c02e2adac370f49f01
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1328,6 +1329,7 @@ public class PurpurWorldConfig {
@@ -1334,6 +1335,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);

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

@@ -17,7 +17,7 @@ index 5e22d175b1048a58802cdf64ac70a8b56329e915..d81946b400f208c39941128ce823ff77
return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 55ec718b1e03dec575c151336faa1a567946e8d8..481ac57133506633b776db448819e73aebfb39e8 100644
index 27b506558ad224c46fb47b984129ed392398ea09..a2a630df5880a32ae6cc05af7a4c39c0885ccc03 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -425,6 +425,11 @@ public class PurpurWorldConfig {

6
patches/server/0115-Implement-TPSBar.patch → patches/server/0117-Implement-TPSBar.patch
View File

@@ -17,7 +17,7 @@ index e5b1b6ad32c48a4ba13b4930954fad18669677ad..4e721dfca7559620d8ce65a6703f2089
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1b24b67437b1a677bbd6ea30b32c703fd7eda2a2..566f20e6c8306c6f6884b95362f82bdcffbcbbc7 100644
index 12a5a8c06dc636fbd5008b8f71d05cfae00a52c2..7b67bc1e7891a27125db560ad18a133096bb2468 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1023,6 +1023,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -42,7 +42,7 @@ index 2dbb2a21942a4e2cb2d3e1fc77a487dd5bd3d964..c2b243240efacac250cb8440d2158847
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 8c1a2fafd2e53720a524c1b84bb95f3865d029f9..4a133de61090ab78ad9bc7d02e30c917024711ab 100644
index f71101057b89cd0393d8a64760d1ae9e7a50beb6..81947e1dc48b91600f9b6417c13d153a41a9d502 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -279,6 +279,7 @@ public class ServerPlayer extends Player {
@@ -84,7 +84,7 @@ index 8c1a2fafd2e53720a524c1b84bb95f3865d029f9..4a133de61090ab78ad9bc7d02e30c917
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index bacce71fe2616068d45bee9cf12a1a3b3326b98e..15a04d24f511425aee392a2fa4e333071ca5c582 100644
index 39d476994b452a7d04659023ffe58ea23a29b8fe..3e40080c6b1e74c80e762b385a7534bb1b8ee894 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -476,6 +476,7 @@ public abstract class PlayerList {

6
patches/server/0116-Striders-give-saddle-back.patch → 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 2bc29728f2731f56c144185757b7932aa6c038dd..b3697cffbf9e0ef637c547167b5b9091a3b9bf40 100644
index a2a630df5880a32ae6cc05af7a4c39c0885ccc03..0f41f154f74d056e507742bea279c4fb2d2ffae5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1707,6 +1707,7 @@ public class PurpurWorldConfig {
@@ -1713,6 +1713,7 @@ public class PurpurWorldConfig {
public boolean striderControllable = true;
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
@@ -40,7 +40,7 @@ index 2bc29728f2731f56c144185757b7932aa6c038dd..b3697cffbf9e0ef637c547167b5b9091
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1718,6 +1719,7 @@ public class PurpurWorldConfig {
@@ -1724,6 +1725,7 @@ public class PurpurWorldConfig {
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);

2
patches/server/0117-PlayerBookTooLargeEvent.patch → patches/server/0119-PlayerBookTooLargeEvent.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerBookTooLargeEvent
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 25f502ef6248df703b73b955a1d1395d313094a3..bfd743a780ee88971a2283ef829ca790faaffd32 100644
index 00a41647b127552c511a16a88e1e8208423b645b..85c9a892dd15e8bafc65146e1dcb33e508e9fc05 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1264,10 +1264,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

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

@@ -26,7 +26,7 @@ index fa2a0cc24bbe31abd49ce0f3f41bab2aa5d9c81f..04e816f01db7d2de7ffa9bbaaa72daad
protected ItemCooldowns createItemCooldowns() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index bc897dce38ab2baf33e23239fa908e025a7641bb..c471635681dd4a2da85568fb214d997ba1724556 100644
index 0f41f154f74d056e507742bea279c4fb2d2ffae5..2d521598a6c02f8c64bf64e5abb0a23b65efb73a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -297,6 +297,19 @@ public class PurpurWorldConfig {

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

54
patches/server/0120-Add-mobGriefing-bypass-to-everything-affected.patch → patches/server/0122-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -31,17 +31,17 @@ index c8e394ebd6d2393ef77b95d6f20fcbf6040a1dc5..16bb50d154622073d017fa350ec4610c
List<ItemEntity> list = this.level().getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate((double) baseblockposition.getX(), (double) baseblockposition.getY(), (double) baseblockposition.getZ()));
Iterator iterator = list.iterator();
diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java b/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
index 5bb3db5e1f47ef56ef40c84f06a1c5ae59f84c89..841954670c5a9b400552774669e57b68b156c300 100644
index f9665eaade08b6ac4f728a65acba025e783dbd08..5a807bce1db30cfc753caa588cd0ef632881d0dd 100644
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
@@ -45,7 +45,7 @@ public class HarvestFarmland extends Behavior<Villager> {
@@ -46,7 +46,7 @@ public class HarvestFarmland extends Behavior<Villager> {
}
protected boolean checkExtraStartConditions(ServerLevel world, Villager entity) {
- if (!world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
+ if (!world.purpurConfig.villagerBypassMobGriefing && !world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) { // Purpur
return false;
} else if (entity.getVillagerData().getProfession() != VillagerProfession.FARMER) {
} else if (entity.getVillagerData().getProfession() != VillagerProfession.FARMER && !(world.purpurConfig.villagerClericsFarmWarts && entity.getVillagerData().getProfession() == VillagerProfession.CLERIC)) { // Purpur
return false;
diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
index 4253b3b1263a7ae5a2f5f3a34674dfea615a81ea..a987c94fd321f51241c405659d6a0b2327a612ae 100644
@@ -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 c471635681dd4a2da85568fb214d997ba1724556..cb373bdd861387909c6a01b949244a9c62039ae7 100644
index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207abcc5e38 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 c471635681dd4a2da85568fb214d997ba1724556..cb373bdd861387909c6a01b949244a9c
}
public boolean frogRidable = false;
@@ -1374,6 +1399,7 @@ public class PurpurWorldConfig {
@@ -1380,6 +1405,7 @@ public class PurpurWorldConfig {
public boolean piglinRidableInWater = true;
public boolean piglinControllable = true;
public double piglinMaxHealth = 16.0D;
@@ -526,7 +526,7 @@ index c471635681dd4a2da85568fb214d997ba1724556..cb373bdd861387909c6a01b949244a9c
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1384,6 +1410,7 @@ public class PurpurWorldConfig {
@@ -1390,6 +1416,7 @@ public class PurpurWorldConfig {
set("mobs.piglin.attributes.max_health", oldValue);
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -534,7 +534,7 @@ index c471635681dd4a2da85568fb214d997ba1724556..cb373bdd861387909c6a01b949244a9c
}
public boolean piglinBruteRidable = false;
@@ -1406,6 +1433,7 @@ public class PurpurWorldConfig {
@@ -1412,6 +1439,7 @@ public class PurpurWorldConfig {
public boolean pillagerRidableInWater = true;
public boolean pillagerControllable = true;
public double pillagerMaxHealth = 24.0D;
@@ -542,7 +542,7 @@ index c471635681dd4a2da85568fb214d997ba1724556..cb373bdd861387909c6a01b949244a9c
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1416,6 +1444,7 @@ public class PurpurWorldConfig {
@@ -1422,6 +1450,7 @@ public class PurpurWorldConfig {
set("mobs.pillager.attributes.max_health", oldValue);
}
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -550,7 +550,7 @@ index c471635681dd4a2da85568fb214d997ba1724556..cb373bdd861387909c6a01b949244a9c
}
public boolean polarBearRidable = false;
@@ -1462,6 +1491,7 @@ public class PurpurWorldConfig {
@@ -1468,6 +1497,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -558,7 +558,7 @@ index c471635681dd4a2da85568fb214d997ba1724556..cb373bdd861387909c6a01b949244a9c
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1475,12 +1505,14 @@ public class PurpurWorldConfig {
@@ -1481,12 +1511,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 c471635681dd4a2da85568fb214d997ba1724556..cb373bdd861387909c6a01b949244a9c
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1491,6 +1523,7 @@ public class PurpurWorldConfig {
@@ -1497,6 +1529,7 @@ public class PurpurWorldConfig {
set("mobs.ravager.attributes.max_health", oldValue);
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -581,7 +581,7 @@ index c471635681dd4a2da85568fb214d997ba1724556..cb373bdd861387909c6a01b949244a9c
}
public boolean salmonRidable = false;
@@ -1512,6 +1545,7 @@ public class PurpurWorldConfig {
@@ -1518,6 +1551,7 @@ public class PurpurWorldConfig {
public boolean sheepControllable = true;
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
@@ -589,7 +589,7 @@ index c471635681dd4a2da85568fb214d997ba1724556..cb373bdd861387909c6a01b949244a9c
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1523,6 +1557,7 @@ public class PurpurWorldConfig {
@@ -1529,6 +1563,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 c471635681dd4a2da85568fb214d997ba1724556..cb373bdd861387909c6a01b949244a9c
}
public boolean shulkerRidable = false;
@@ -1545,6 +1580,7 @@ public class PurpurWorldConfig {
@@ -1551,6 +1586,7 @@ public class PurpurWorldConfig {
public boolean silverfishRidableInWater = true;
public boolean silverfishControllable = true;
public double silverfishMaxHealth = 8.0D;
@@ -605,7 +605,7 @@ index c471635681dd4a2da85568fb214d997ba1724556..cb373bdd861387909c6a01b949244a9c
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1555,6 +1591,7 @@ public class PurpurWorldConfig {
@@ -1561,6 +1597,7 @@ public class PurpurWorldConfig {
set("mobs.silverfish.attributes.max_health", oldValue);
}
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -613,7 +613,7 @@ index c471635681dd4a2da85568fb214d997ba1724556..cb373bdd861387909c6a01b949244a9c
}
public boolean skeletonRidable = false;
@@ -1631,6 +1668,7 @@ public class PurpurWorldConfig {
@@ -1637,6 +1674,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -621,7 +621,7 @@ index c471635681dd4a2da85568fb214d997ba1724556..cb373bdd861387909c6a01b949244a9c
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1648,6 +1686,7 @@ public class PurpurWorldConfig {
@@ -1654,6 +1692,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,23 +629,23 @@ index c471635681dd4a2da85568fb214d997ba1724556..cb373bdd861387909c6a01b949244a9c
}
public boolean snifferRidable = false;
@@ -1832,6 +1871,7 @@ public class PurpurWorldConfig {
public boolean villagerCanBeLeashed = false;
public boolean villagerCanBreed = true;
@@ -1840,6 +1879,7 @@ public class PurpurWorldConfig {
public int villagerBreedingTicks = 6000;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
+ public boolean villagerBypassMobGriefing = false;
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1846,6 +1886,7 @@ public class PurpurWorldConfig {
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
@@ -1856,6 +1896,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);
+ villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
}
public boolean vindicatorRidable = false;
@@ -1918,6 +1959,7 @@ public class PurpurWorldConfig {
@@ -1928,6 +1969,7 @@ public class PurpurWorldConfig {
public double witherMaxHealth = 300.0D;
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
@@ -653,7 +653,7 @@ index c471635681dd4a2da85568fb214d997ba1724556..cb373bdd861387909c6a01b949244a9c
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1935,6 +1977,7 @@ public class PurpurWorldConfig {
@@ -1945,6 +1987,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 c471635681dd4a2da85568fb214d997ba1724556..cb373bdd861387909c6a01b949244a9c
}
public boolean witherSkeletonRidable = false;
@@ -2006,6 +2049,7 @@ public class PurpurWorldConfig {
@@ -2016,6 +2059,7 @@ public class PurpurWorldConfig {
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -669,7 +669,7 @@ index c471635681dd4a2da85568fb214d997ba1724556..cb373bdd861387909c6a01b949244a9c
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2021,6 +2065,7 @@ public class PurpurWorldConfig {
@@ -2031,6 +2075,7 @@ public class PurpurWorldConfig {
zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);

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

@@ -22,7 +22,7 @@ index 6bc29eeb5771a3dc9aa23c7d184c895717797b36..244857755f269eedd57d1c8d4657b4b4
// org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, pos, state.getValue(NoteBlock.INSTRUMENT), state.getValue(NoteBlock.NOTE));
// if (event.isCancelled()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 86ad2600050ad695942ed3fdd5af910d5d6d8db0..3e09fc10c8fdad548f183e624dc46264ba4236ca 100644
index dfe8c4e6c904e0153e7874392098b207abcc5e38..4cc37f929b9875e52e029be163f4725f289d1aa9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -120,6 +120,7 @@ public class PurpurWorldConfig {

2
patches/server/0122-Add-EntityTeleportHinderedEvent.patch → patches/server/0124-Add-EntityTeleportHinderedEvent.patch
View File

@@ -104,7 +104,7 @@ index cf82afb7949a0031c1b656149e583c4075362211..d65147f864dc75475cbb893fdcc9b391
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3e09fc10c8fdad548f183e624dc46264ba4236ca..a354a971ab9fcbd644e3673e0e6464a53cb02f6e 100644
index 4cc37f929b9875e52e029be163f4725f289d1aa9..f0ac7b1e9157870c396f7abdbc66363e6c609029 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -119,6 +119,7 @@ public class PurpurWorldConfig {

2
patches/server/0123-Farmland-trampling-changes.patch → patches/server/0125-Farmland-trampling-changes.patch
View File

@@ -37,7 +37,7 @@ index 090d232af0183c9c9ffeb4e75125514d827648f2..1064a13f37b991e60213b052e252a183
if (CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) {
return;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a354a971ab9fcbd644e3673e0e6464a53cb02f6e..f09bf510749064c34d4fb1401a68090529bb6d6b 100644
index f0ac7b1e9157870c396f7abdbc66363e6c609029..56049d177f9e483bc68b694cb4c4d1031269eb91 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -463,10 +463,16 @@ public class PurpurWorldConfig {

2
patches/server/0124-Movement-options-for-armor-stands.patch → patches/server/0126-Movement-options-for-armor-stands.patch
View File

@@ -66,7 +66,7 @@ index 9eb196ee4061bb4c5713f33e8b16d91ec52711cd..ffb3ae1d36dda5f521cf3b292d819cb3
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2ce13a7437dd7e879bb237e012c15159703b472a..b7c72e3cf37c99ca991138eef07479ac06a731b3 100644
index 56049d177f9e483bc68b694cb4c4d1031269eb91..8fa017d79fc5f061baec537fe1666636615e15d5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -101,10 +101,16 @@ public class PurpurWorldConfig {

4
patches/server/0125-Fix-stuck-in-portals.patch → patches/server/0127-Fix-stuck-in-portals.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in portals
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index faab60eb03989338f5376c22148c98a0407a36a5..0ecd8b6bf8696b6aac50b91f16450ba5925c0115 100644
index 81947e1dc48b91600f9b6417c13d153a41a9d502..026e3035167d41c18735cf57c63025bdadbb4ca0 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1271,6 +1271,7 @@ public class ServerPlayer extends Player {
@@ -37,7 +37,7 @@ index 8c2327fa0af4c2148cf6bab7f5960f81660c6259..10dca8fdfea6c4c98bd36684598fab42
this.isInsidePortal = true;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 4b8514a938a9029ab9b1af8698beb12e1b33e039..705c6b3ae0db79d0ef0a9eaea504381145b4af21 100644
index 8fa017d79fc5f061baec537fe1666636615e15d5..eb25f0210f8466430ed3bdc377ea6eb42edc78f1 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -337,6 +337,7 @@ public class PurpurWorldConfig {

144
patches/server/0126-Toggle-for-water-sensitive-mob-damage.patch → patches/server/0128-Toggle-for-water-sensitive-mob-damage.patch
View File

@@ -823,10 +823,10 @@ index b472309f97b24f1d7b97d8b6d464c479c2d602d5..e0ebc4c2d8dd718ce78d981a1d099e74
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 f1dfda45fc0e44a4e92b3e2f01718e9ef5c7fc06..c2d708f4f7b0fa340dc159c50fc9883b7c49ff67 100644
index 29167ec21bc68e43c6505b6b1ee376d75a43c1ef..0894335fd9057184bb4f3ba5765ceec9d02828f7 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
@@ -119,6 +119,11 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -138,6 +138,11 @@ public class Phantom extends FlyingMob implements Enemy {
}
// Purpur end
@@ -1165,7 +1165,7 @@ index 04e54c241078e6cd6419a21ba1bf913fd3b413d1..b63d87df0f48dd63c89118f91b31dc4e
return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 50.0D).add(Attributes.MOVEMENT_SPEED, (double)0.35F).add(Attributes.ATTACK_DAMAGE, 7.0D);
}
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 52a84f354cc51b3ca875756514588b2e6309fc25..2936b4856c92dcbe6034f9ace2cb8b94887a4dd8 100644
index 0378faa19053dbcb74315e3fd6f96a37a226de4e..7efc2d1c7fb65b17bdad0d212e660d71d5528cc9 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -187,6 +187,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e7bf35a14 100644
index eb25f0210f8466430ed3bdc377ea6eb42edc78f1..1853fb621d58bb93c0c1f350325c43ca2d863351 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 {
@@ -1762,7 +1762,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean phantomRidable = false;
@@ -1360,6 +1432,7 @@ public class PurpurWorldConfig {
@@ -1363,6 +1435,7 @@ public class PurpurWorldConfig {
public boolean phantomIgnorePlayersWithTorch = false;
public boolean phantomBurnInDaylight = true;
public boolean phantomFlamesOnSwoop = false;
@@ -1770,7 +1770,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1391,6 +1464,7 @@ public class PurpurWorldConfig {
@@ -1397,6 +1470,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean pigRidable = false;
@@ -1399,6 +1473,7 @@ public class PurpurWorldConfig {
@@ -1405,6 +1479,7 @@ public class PurpurWorldConfig {
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
public int pigBreedingTicks = 6000;
@@ -1786,7 +1786,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1411,6 +1486,7 @@ public class PurpurWorldConfig {
@@ -1417,6 +1492,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean piglinRidable = false;
@@ -1418,6 +1494,7 @@ public class PurpurWorldConfig {
@@ -1424,6 +1500,7 @@ public class PurpurWorldConfig {
public boolean piglinControllable = true;
public double piglinMaxHealth = 16.0D;
public boolean piglinBypassMobGriefing = false;
@@ -1802,7 +1802,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1429,12 +1506,14 @@ public class PurpurWorldConfig {
@@ -1435,12 +1512,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void piglinBruteSettings() {
piglinBruteRidable = getBoolean("mobs.piglin_brute.ridable", piglinBruteRidable);
piglinBruteRidableInWater = getBoolean("mobs.piglin_brute.ridable-in-water", piglinBruteRidableInWater);
@@ -1445,6 +1524,7 @@ public class PurpurWorldConfig {
@@ -1451,6 +1530,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean pillagerRidable = false;
@@ -1452,6 +1532,7 @@ public class PurpurWorldConfig {
@@ -1458,6 +1538,7 @@ public class PurpurWorldConfig {
public boolean pillagerControllable = true;
public double pillagerMaxHealth = 24.0D;
public boolean pillagerBypassMobGriefing = false;
@@ -1833,7 +1833,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1463,6 +1544,7 @@ public class PurpurWorldConfig {
@@ -1469,6 +1550,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean polarBearRidable = false;
@@ -1472,6 +1554,7 @@ public class PurpurWorldConfig {
@@ -1478,6 +1560,7 @@ public class PurpurWorldConfig {
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
public int polarBearBreedingTicks = 6000;
@@ -1849,7 +1849,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1486,11 +1569,13 @@ public class PurpurWorldConfig {
@@ -1492,11 +1575,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void pufferfishSettings() {
pufferfishRidable = getBoolean("mobs.pufferfish.ridable", pufferfishRidable);
pufferfishControllable = getBoolean("mobs.pufferfish.controllable", pufferfishControllable);
@@ -1500,6 +1585,7 @@ public class PurpurWorldConfig {
@@ -1506,6 +1591,7 @@ public class PurpurWorldConfig {
set("mobs.pufferfish.attributes.max_health", oldValue);
}
pufferfishMaxHealth = getDouble("mobs.pufferfish.attributes.max_health", pufferfishMaxHealth);
@@ -1871,7 +1871,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean rabbitRidable = false;
@@ -1510,6 +1596,7 @@ public class PurpurWorldConfig {
@@ -1516,6 +1602,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
public boolean rabbitBypassMobGriefing = false;
@@ -1879,7 +1879,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1524,6 +1611,7 @@ public class PurpurWorldConfig {
@@ -1530,6 +1617,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean ravagerRidable = false;
@@ -1531,6 +1619,7 @@ public class PurpurWorldConfig {
@@ -1537,6 +1625,7 @@ public class PurpurWorldConfig {
public boolean ravagerControllable = true;
public double ravagerMaxHealth = 100.0D;
public boolean ravagerBypassMobGriefing = false;
@@ -1895,7 +1895,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1542,11 +1631,13 @@ public class PurpurWorldConfig {
@@ -1548,11 +1637,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void salmonSettings() {
salmonRidable = getBoolean("mobs.salmon.ridable", salmonRidable);
salmonControllable = getBoolean("mobs.salmon.controllable", salmonControllable);
@@ -1556,6 +1647,7 @@ public class PurpurWorldConfig {
@@ -1562,6 +1653,7 @@ public class PurpurWorldConfig {
set("mobs.salmon.attributes.max_health", oldValue);
}
salmonMaxHealth = getDouble("mobs.salmon.attributes.max_health", salmonMaxHealth);
@@ -1917,7 +1917,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean sheepRidable = false;
@@ -1564,6 +1656,7 @@ public class PurpurWorldConfig {
@@ -1570,6 +1662,7 @@ public class PurpurWorldConfig {
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
public boolean sheepBypassMobGriefing = false;
@@ -1925,7 +1925,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1576,12 +1669,14 @@ public class PurpurWorldConfig {
@@ -1582,12 +1675,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -1592,6 +1687,7 @@ public class PurpurWorldConfig {
@@ -1598,6 +1693,7 @@ public class PurpurWorldConfig {
set("mobs.shulker.attributes.max_health", oldValue);
}
shulkerMaxHealth = getDouble("mobs.shulker.attributes.max_health", shulkerMaxHealth);
@@ -1948,7 +1948,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean silverfishRidable = false;
@@ -1599,6 +1695,7 @@ public class PurpurWorldConfig {
@@ -1605,6 +1701,7 @@ public class PurpurWorldConfig {
public boolean silverfishControllable = true;
public double silverfishMaxHealth = 8.0D;
public boolean silverfishBypassMobGriefing = false;
@@ -1956,7 +1956,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1610,12 +1707,14 @@ public class PurpurWorldConfig {
@@ -1616,12 +1713,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -1626,6 +1725,7 @@ public class PurpurWorldConfig {
@@ -1632,6 +1731,7 @@ public class PurpurWorldConfig {
set("mobs.skeleton.attributes.max_health", oldValue);
}
skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
@@ -1979,7 +1979,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean skeletonHorseRidableInWater = true;
@@ -1636,6 +1736,7 @@ public class PurpurWorldConfig {
@@ -1642,6 +1742,7 @@ public class PurpurWorldConfig {
public double skeletonHorseJumpStrengthMax = 1.0D;
public double skeletonHorseMovementSpeedMin = 0.2D;
public double skeletonHorseMovementSpeedMax = 0.2D;
@@ -1987,7 +1987,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void skeletonHorseSettings() {
skeletonHorseRidableInWater = getBoolean("mobs.skeleton_horse.ridable-in-water", skeletonHorseRidableInWater);
skeletonHorseCanSwim = getBoolean("mobs.skeleton_horse.can-swim", skeletonHorseCanSwim);
@@ -1651,6 +1752,7 @@ public class PurpurWorldConfig {
@@ -1657,6 +1758,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean slimeRidable = false;
@@ -1660,6 +1762,7 @@ public class PurpurWorldConfig {
@@ -1666,6 +1768,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void slimeSettings() {
slimeRidable = getBoolean("mobs.slime.ridable", slimeRidable);
slimeRidableInWater = getBoolean("mobs.slime.ridable-in-water", slimeRidableInWater);
@@ -1673,6 +1776,7 @@ public class PurpurWorldConfig {
@@ -1679,6 +1782,7 @@ public class PurpurWorldConfig {
slimeAttackDamage = getString("mobs.slime.attributes.attack_damage", slimeAttackDamage);
slimeMaxHealthCache.clear();
slimeAttackDamageCache.clear();
@@ -2011,7 +2011,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean snowGolemRidable = false;
@@ -1687,6 +1791,7 @@ public class PurpurWorldConfig {
@@ -1693,6 +1797,7 @@ public class PurpurWorldConfig {
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
public boolean snowGolemBypassMobGriefing = false;
@@ -2019,7 +2019,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1705,6 +1810,7 @@ public class PurpurWorldConfig {
@@ -1711,6 +1816,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean snifferRidable = false;
@@ -1726,6 +1832,7 @@ public class PurpurWorldConfig {
@@ -1732,6 +1838,7 @@ public class PurpurWorldConfig {
public boolean squidImmuneToEAR = true;
public double squidOffsetWaterCheck = 0.0D;
public boolean squidsCanFly = false;
@@ -2035,7 +2035,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -1738,12 +1845,14 @@ public class PurpurWorldConfig {
@@ -1744,12 +1851,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void spiderSettings() {
spiderRidable = getBoolean("mobs.spider.ridable", spiderRidable);
spiderRidableInWater = getBoolean("mobs.spider.ridable-in-water", spiderRidableInWater);
@@ -1754,12 +1863,14 @@ public class PurpurWorldConfig {
@@ -1760,12 +1869,14 @@ public class PurpurWorldConfig {
set("mobs.spider.attributes.max_health", oldValue);
}
spiderMaxHealth = getDouble("mobs.spider.attributes.max_health", spiderMaxHealth);
@@ -2065,7 +2065,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void straySettings() {
strayRidable = getBoolean("mobs.stray.ridable", strayRidable);
strayRidableInWater = getBoolean("mobs.stray.ridable-in-water", strayRidableInWater);
@@ -1770,6 +1881,7 @@ public class PurpurWorldConfig {
@@ -1776,6 +1887,7 @@ public class PurpurWorldConfig {
set("mobs.stray.attributes.max_health", oldValue);
}
strayMaxHealth = getDouble("mobs.stray.attributes.max_health", strayMaxHealth);
@@ -2073,7 +2073,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean striderRidable = false;
@@ -1778,6 +1890,7 @@ public class PurpurWorldConfig {
@@ -1784,6 +1896,7 @@ public class PurpurWorldConfig {
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
@@ -2081,7 +2081,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1790,6 +1903,7 @@ public class PurpurWorldConfig {
@@ -1796,6 +1909,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean tadpoleRidable = false;
@@ -1811,6 +1925,7 @@ public class PurpurWorldConfig {
@@ -1817,6 +1931,7 @@ public class PurpurWorldConfig {
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
public int traderLlamaBreedingTicks = 6000;
@@ -2097,7 +2097,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1829,11 +1944,13 @@ public class PurpurWorldConfig {
@@ -1835,11 +1950,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void tropicalFishSettings() {
tropicalFishRidable = getBoolean("mobs.tropical_fish.ridable", tropicalFishRidable);
tropicalFishControllable = getBoolean("mobs.tropical_fish.controllable", tropicalFishControllable);
@@ -1843,6 +1960,7 @@ public class PurpurWorldConfig {
@@ -1849,6 +1966,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean turtleRidable = false;
@@ -1850,6 +1968,7 @@ public class PurpurWorldConfig {
@@ -1856,6 +1974,7 @@ public class PurpurWorldConfig {
public boolean turtleControllable = true;
public double turtleMaxHealth = 30.0D;
public int turtleBreedingTicks = 6000;
@@ -2127,7 +2127,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void turtleSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1861,6 +1980,7 @@ public class PurpurWorldConfig {
@@ -1867,6 +1986,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean vexRidable = false;
@@ -1868,6 +1988,7 @@ public class PurpurWorldConfig {
@@ -1874,6 +1994,7 @@ public class PurpurWorldConfig {
public boolean vexControllable = true;
public double vexMaxY = 320D;
public double vexMaxHealth = 14.0D;
@@ -2143,7 +2143,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void vexSettings() {
vexRidable = getBoolean("mobs.vex.ridable", vexRidable);
vexRidableInWater = getBoolean("mobs.vex.ridable-in-water", vexRidableInWater);
@@ -1879,6 +2000,7 @@ public class PurpurWorldConfig {
@@ -1885,6 +2006,7 @@ public class PurpurWorldConfig {
set("mobs.vex.attributes.max_health", oldValue);
}
vexMaxHealth = getDouble("mobs.vex.attributes.max_health", vexMaxHealth);
@@ -2151,23 +2151,23 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean villagerRidable = false;
@@ -1890,6 +2012,7 @@ public class PurpurWorldConfig {
public boolean villagerCanBreed = true;
public int villagerBreedingTicks = 6000;
@@ -1898,6 +2020,7 @@ public class PurpurWorldConfig {
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
+ public boolean villagerTakeDamageFromWater = false;
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1905,6 +2028,7 @@ public class PurpurWorldConfig {
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks);
@@ -1915,6 +2038,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);
+ villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater);
}
public boolean vindicatorRidable = false;
@@ -1912,6 +2036,7 @@ public class PurpurWorldConfig {
@@ -1922,6 +2046,7 @@ public class PurpurWorldConfig {
public boolean vindicatorControllable = true;
public double vindicatorMaxHealth = 24.0D;
public double vindicatorJohnnySpawnChance = 0D;
@@ -2175,7 +2175,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void vindicatorSettings() {
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
@@ -1923,6 +2048,7 @@ public class PurpurWorldConfig {
@@ -1933,6 +2058,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean wanderingTraderRidable = false;
@@ -1931,6 +2057,7 @@ public class PurpurWorldConfig {
@@ -1941,6 +2067,7 @@ public class PurpurWorldConfig {
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
@@ -2191,7 +2191,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1943,6 +2070,7 @@ public class PurpurWorldConfig {
@@ -1953,6 +2080,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean wardenRidable = false;
@@ -1958,6 +2086,7 @@ public class PurpurWorldConfig {
@@ -1968,6 +2096,7 @@ public class PurpurWorldConfig {
public boolean witchRidableInWater = true;
public boolean witchControllable = true;
public double witchMaxHealth = 26.0D;
@@ -2207,7 +2207,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void witchSettings() {
witchRidable = getBoolean("mobs.witch.ridable", witchRidable);
witchRidableInWater = getBoolean("mobs.witch.ridable-in-water", witchRidableInWater);
@@ -1968,6 +2097,7 @@ public class PurpurWorldConfig {
@@ -1978,6 +2107,7 @@ public class PurpurWorldConfig {
set("mobs.witch.attributes.max_health", oldValue);
}
witchMaxHealth = getDouble("mobs.witch.attributes.max_health", witchMaxHealth);
@@ -2215,7 +2215,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean witherRidable = false;
@@ -1978,6 +2108,7 @@ public class PurpurWorldConfig {
@@ -1988,6 +2118,7 @@ public class PurpurWorldConfig {
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
public boolean witherBypassMobGriefing = false;
@@ -2223,7 +2223,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1996,12 +2127,14 @@ public class PurpurWorldConfig {
@@ -2006,12 +2137,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void witherSkeletonSettings() {
witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable);
witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater);
@@ -2012,6 +2145,7 @@ public class PurpurWorldConfig {
@@ -2022,6 +2155,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean wolfRidable = false;
@@ -2022,6 +2156,7 @@ public class PurpurWorldConfig {
@@ -2032,6 +2166,7 @@ public class PurpurWorldConfig {
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -2254,7 +2254,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -2040,12 +2175,14 @@ public class PurpurWorldConfig {
@@ -2050,12 +2185,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void zoglinSettings() {
zoglinRidable = getBoolean("mobs.zoglin.ridable", zoglinRidable);
zoglinRidableInWater = getBoolean("mobs.zoglin.ridable-in-water", zoglinRidableInWater);
@@ -2056,6 +2193,7 @@ public class PurpurWorldConfig {
@@ -2066,6 +2203,7 @@ public class PurpurWorldConfig {
set("mobs.zoglin.attributes.max_health", oldValue);
}
zoglinMaxHealth = getDouble("mobs.zoglin.attributes.max_health", zoglinMaxHealth);
@@ -2277,7 +2277,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean zombieRidable = false;
@@ -2068,6 +2206,7 @@ public class PurpurWorldConfig {
@@ -2078,6 +2216,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public boolean zombieBypassMobGriefing = false;
@@ -2285,7 +2285,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2084,6 +2223,7 @@ public class PurpurWorldConfig {
@@ -2094,6 +2233,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean zombieHorseRidableInWater = false;
@@ -2095,6 +2235,7 @@ public class PurpurWorldConfig {
@@ -2105,6 +2245,7 @@ public class PurpurWorldConfig {
public double zombieHorseMovementSpeedMin = 0.2D;
public double zombieHorseMovementSpeedMax = 0.2D;
public double zombieHorseSpawnChance = 0.0D;
@@ -2301,7 +2301,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void zombieHorseSettings() {
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
@@ -2111,6 +2252,7 @@ public class PurpurWorldConfig {
@@ -2121,6 +2262,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean zombieVillagerRidable = false;
@@ -2121,6 +2263,7 @@ public class PurpurWorldConfig {
@@ -2131,6 +2273,7 @@ public class PurpurWorldConfig {
public boolean zombieVillagerJockeyOnlyBaby = true;
public double zombieVillagerJockeyChance = 0.05D;
public boolean zombieVillagerJockeyTryExistingChickens = true;
@@ -2317,7 +2317,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2130,6 +2273,7 @@ public class PurpurWorldConfig {
@@ -2140,6 +2283,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 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
}
public boolean zombifiedPiglinRidable = false;
@@ -2141,6 +2285,7 @@ public class PurpurWorldConfig {
@@ -2151,6 +2295,7 @@ public class PurpurWorldConfig {
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
@@ -2333,7 +2333,7 @@ index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -2156,5 +2301,6 @@ public class PurpurWorldConfig {
@@ -2166,5 +2311,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);

4
patches/server/0127-Config-to-always-tame-in-Creative.patch → patches/server/0129-Config-to-always-tame-in-Creative.patch
View File

@@ -46,7 +46,7 @@ index a2dafa064697219fcfe7824ba3ca81396063ecb2..08935a1f2c4a3f43483719686e5baab5
this.level().broadcastEntityEvent(this, (byte) 7);
} else {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
index 4cd58a67c0af8019e802812c1e2ff893591d4c5f..79e67987f8077133f447ba5c7e1d5edb676e18e8 100644
index 0ab3e4a854fd1c5369fc734981d16fa6b844807f..b2902e01ff2e9add8258bfd0b32d000209208f52 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
@@ -543,7 +543,7 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -59,7 +59,7 @@ index 4cd58a67c0af8019e802812c1e2ff893591d4c5f..79e67987f8077133f447ba5c7e1d5edb
this.navigation.stop();
this.setTarget((LivingEntity) null);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a902a1fff34382032fd56a6672b2c7225378527c..908f7d4193e987550fb6ecf9b132fc35deb389b1 100644
index 1853fb621d58bb93c0c1f350325c43ca2d863351..8ba4b14265597e5433825dddae108a9bfc9e408a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -119,6 +119,7 @@ public class PurpurWorldConfig {

8
patches/server/0128-End-crystal-explosion-options.patch → patches/server/0130-End-crystal-explosion-options.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] End crystal explosion options
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
index 5465711d486e5f265a26042031e895fb09e30608..ada7eba2beca5b0897fa2eb3567a639573f4e18d 100644
index 767cd1dad6bb9857501abe04f5023ca3ffa5fdd2..ee5ba341d481d5a0fa874c3c707398c9c1eb1ed4 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
@@ -42,6 +42,22 @@ public class EndCrystal extends Entity {
@@ -48,6 +48,22 @@ public class EndCrystal extends Entity {
this.setPos(x, y, z);
}
@@ -31,7 +31,7 @@ index 5465711d486e5f265a26042031e895fb09e30608..ada7eba2beca5b0897fa2eb3567a6395
@Override
protected Entity.MovementEmission getMovementEmission() {
return Entity.MovementEmission.NONE;
@@ -124,17 +140,19 @@ public class EndCrystal extends Entity {
@@ -173,17 +189,19 @@ public class EndCrystal extends Entity {
// CraftBukkit end
this.remove(Entity.RemovalReason.KILLED);
if (!source.is(DamageTypeTags.IS_EXPLOSION)) {
@@ -54,7 +54,7 @@ index 5465711d486e5f265a26042031e895fb09e30608..ada7eba2beca5b0897fa2eb3567a6395
this.onDestroyedBy(source);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 9d25a55c797d3ed36a0fd6f1d1fd62c7c6647fa9..1aee23f75e0ab74909c853a288c481376b8a8e2a 100644
index 8ba4b14265597e5433825dddae108a9bfc9e408a..81d720ae34e0daa6b55c46dd2f65464abe9e87a5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -470,6 +470,43 @@ public class PurpurWorldConfig {

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

@@ -17,7 +17,7 @@ index f90b0ae4678da2ffa7d0a693003e05191d07f4bf..8a8895abe609b3be02aa896c40e4a2a2
}
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 17e44da8b4419ae19f0205e7208b450e68607c79..faa77256f116d2b9c9ad931238d10a994c63c484 100644
index 94027ef3f833c7170a99a8437740b7f99f30ab81..1f9a57c4fd251e2969b49a883ee12d3cf8ac5914 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
@@ -742,6 +742,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -29,7 +29,7 @@ index 17e44da8b4419ae19f0205e7208b450e68607c79..faa77256f116d2b9c9ad931238d10a99
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2a8338e4ddb765349e373f9de0f6c82ba44a1c89..b40c2439ec48255d6d46db4af4d0df2b2e5a3a7b 100644
index 81d720ae34e0daa6b55c46dd2f65464abe9e87a5..d0f08bd9028bdc1720a3bc47e82a1fd8103f2ffe 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 2a8338e4ddb765349e373f9de0f6c82ba44a1c89..b40c2439ec48255d6d46db4af4d0df2b
}
public boolean endermanRidable = false;
@@ -2148,6 +2150,7 @@ public class PurpurWorldConfig {
@@ -2158,6 +2160,7 @@ public class PurpurWorldConfig {
public int witherHealthRegenDelay = 20;
public boolean witherBypassMobGriefing = false;
public boolean witherTakeDamageFromWater = false;
@@ -56,7 +56,7 @@ index 2a8338e4ddb765349e373f9de0f6c82ba44a1c89..b40c2439ec48255d6d46db4af4d0df2b
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2167,6 +2170,7 @@ public class PurpurWorldConfig {
@@ -2177,6 +2180,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/0130-Dont-run-with-scissors.patch → patches/server/0132-Dont-run-with-scissors.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Dont run with scissors!
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index bfd743a780ee88971a2283ef829ca790faaffd32..4e093e54c3feec6a46a97c24e68c1ee49dac29ca 100644
index 85c9a892dd15e8bafc65146e1dcb33e508e9fc05..4ac0941974e6e8aeaea88ce0fc589381f3c0eaad 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1693,6 +1693,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -62,7 +62,7 @@ index 70db296b80b98b378917f68037420ae150e14adb..3fc967279daaf6eb2b2d80fcad57b5b6
public static String serverModName = "Purpur";
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7c0279f34f380e42c8f0f1dbb8806266655aa6f7..7d0feb23c572580eaeb31bc6e150181f06581d45 100644
index d0f08bd9028bdc1720a3bc47e82a1fd8103f2ffe..b2bbf47108df2d1cefa888674ae62d59dd1df6c1 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -199,6 +199,10 @@ public class PurpurWorldConfig {

2
patches/server/0131-One-Punch-Man.patch → patches/server/0133-One-Punch-Man.patch
View File

@@ -30,7 +30,7 @@ index 182436020d2376101f5863f80b4b6d3d9ebd6a2e..234b92b189e921768ea83ef4f0c12826
if (human) {
// PAIL: Be sure to drag all this code from the EntityHuman subclass each update.
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 56843046b160360e14847322a9d2f5186577eaf8..502333b443d5c8b5a2f21b8c60f651a640eb83c7 100644
index b2bbf47108df2d1cefa888674ae62d59dd1df6c1..99df4cbc3317bc6223e70e7f53439557bf4447b7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -348,6 +348,7 @@ public class PurpurWorldConfig {

2
patches/server/0132-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch → patches/server/0134-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
View File

@@ -43,7 +43,7 @@ index 749ab72edc0d2e9c6f1161415ab8d59d3d6ca976..897c202c0905040072a06fdfa2032a7f
// Paper end
if (user instanceof net.minecraft.server.level.ServerPlayer) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 502333b443d5c8b5a2f21b8c60f651a640eb83c7..4ca7563d46d96b2591e9f90338070c031c087b1d 100644
index 99df4cbc3317bc6223e70e7f53439557bf4447b7..c957ff745cf466b0bb9e3a00bf811349b56a4188 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -203,6 +203,10 @@ public class PurpurWorldConfig {

4
patches/server/0133-Config-to-ignore-nearby-mobs-when-sleeping.patch → patches/server/0135-Config-to-ignore-nearby-mobs-when-sleeping.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 0ecd8b6bf8696b6aac50b91f16450ba5925c0115..af916fb00a9112231327abc641fa2bf5897dbde8 100644
index 026e3035167d41c18735cf57c63025bdadbb4ca0..0c22824240c260c86237a47680c1c2492a2201e2 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1429,7 +1429,7 @@ public class ServerPlayer extends Player {
@@ -18,7 +18,7 @@ index 0ecd8b6bf8696b6aac50b91f16450ba5925c0115..af916fb00a9112231327abc641fa2bf5
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 4ca7563d46d96b2591e9f90338070c031c087b1d..9e5e3d2b14569d15fc3994494889aea416f252a9 100644
index c957ff745cf466b0bb9e3a00bf811349b56a4188..5829cd48c964ead93500a31b145ddf0370287ee4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -357,6 +357,7 @@ public class PurpurWorldConfig {

0
patches/server/0134-Add-back-player-spawned-endermite-API.patch → patches/server/0136-Add-back-player-spawned-endermite-API.patch
View File

2
patches/server/0135-Config-Enderman-aggressiveness-towards-Endermites.patch → patches/server/0137-Config-Enderman-aggressiveness-towards-Endermites.patch
View File

@@ -18,7 +18,7 @@ index 002ea677568e4d4a13509bb5c880341a742dac83..1e544c8fa21d028f7c3ac66d66c2362c
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 9e5e3d2b14569d15fc3994494889aea416f252a9..217e5cf9ea0fde511170cd6522ec9605dff9ac78 100644
index 5829cd48c964ead93500a31b145ddf0370287ee4..387ffc7265eb312a938f9ea5a8bd34048da9985b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -996,6 +996,8 @@ public class PurpurWorldConfig {

2
patches/server/0136-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch → patches/server/0138-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
View File

@@ -20,7 +20,7 @@ index 1e544c8fa21d028f7c3ac66d66c2362c01326a54..6f7dc1f55d52a0957dc0f3b19644e3dc
} else if (org.purpurmc.purpur.PurpurConfig.endermanShortHeight && source.is(net.minecraft.world.damagesource.DamageTypes.IN_WALL)) { return false; // Purpur - no suffocation damage if short height
} else {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 217e5cf9ea0fde511170cd6522ec9605dff9ac78..45cb176b9ab23b9451d68fbb9165cdbcf84ad5b3 100644
index 387ffc7265eb312a938f9ea5a8bd34048da9985b..ef805260ea5ea8e4ada93be50abc43b8f6ab277c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -998,6 +998,8 @@ public class PurpurWorldConfig {

2
patches/server/0137-Tick-fluids-config.patch → patches/server/0139-Tick-fluids-config.patch
View File

@@ -36,7 +36,7 @@ index bbabe4ad8afcc3a2069f6e9d4a9adcb643266894..55419bd653f7f5391fa13cd15a0b00fb
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7786ff6e4adb8180090eb17298fa7147d4b1848f..0b6c9ed87baf5f81c9a4b43355ad81825f40c5f8 100644
index ef805260ea5ea8e4ada93be50abc43b8f6ab277c..998947e5f110e00af1dfcc5043be936ef460ef71 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -131,6 +131,7 @@ public class PurpurWorldConfig {

2
patches/server/0138-Config-to-disable-Llama-caravans.patch → 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 62df1c335f8c6923938768db59f56fec3e1bf939..eb698e1443f0abc3827b08840674d0e92cbb6dd3 100644
index 998947e5f110e00af1dfcc5043be936ef460ef71..40f19ca373028a84e46d4ad9bc2b836968d677d5 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 {

2
patches/server/0139-Config-to-make-Creepers-explode-on-death.patch → patches/server/0141-Config-to-make-Creepers-explode-on-death.patch
View File

@@ -50,7 +50,7 @@ index 6e80ea775596c5804b674234b7d59f4c941a49dc..56aaf99a94944de42f437e18806381e3
private void spawnLingeringCloud() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 513b98b48e23f1773818f03a0c12d1c997c001b4..432f6e6a4e25086eaa7be0865ac1de54a0994cf0 100644
index 40f19ca373028a84e46d4ad9bc2b836968d677d5..f6f374858a16135347da30d86ba051569062c7d4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -850,6 +850,7 @@ public class PurpurWorldConfig {

6
patches/server/0140-Configurable-ravager-griefable-blocks-list.patch → 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 336fdbe44d9d0dfbfd88dcbcd51d4c82ad66df03..339038dcf393653de973b55c090672b2f2f8fa26 100644
index f6f374858a16135347da30d86ba051569062c7d4..29d0653160a3035e0a7dfea906cf2ab7fc67205e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1699,6 +1699,7 @@ public class PurpurWorldConfig {
@@ -1705,6 +1705,7 @@ public class PurpurWorldConfig {
public double ravagerMaxHealth = 100.0D;
public boolean ravagerBypassMobGriefing = false;
public boolean ravagerTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index 336fdbe44d9d0dfbfd88dcbcd51d4c82ad66df03..339038dcf393653de973b55c090672b2
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1711,6 +1712,23 @@ public class PurpurWorldConfig {
@@ -1717,6 +1718,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);

2
patches/server/0141-Sneak-to-bulk-process-composter.patch → patches/server/0143-Sneak-to-bulk-process-composter.patch
View File

@@ -90,7 +90,7 @@ index 87153b5576fed05103183a9860d804c2c8cfbe1c..e8ee608aa5e352d741694f50cdf77f06
int i = (Integer) state.getValue(ComposterBlock.LEVEL);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 339038dcf393653de973b55c090672b2f2f8fa26..167258202d385cce9567c0cc6c0d2ff9d5b226f5 100644
index 29d0653160a3035e0a7dfea906cf2ab7fc67205e..d221ad77f0dee2a8cd7f08f368679183038a88ec 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -485,6 +485,11 @@ public class PurpurWorldConfig {

2
patches/server/0142-Config-for-skipping-night.patch → patches/server/0144-Config-for-skipping-night.patch
View File

@@ -18,7 +18,7 @@ index 3b512beac50bc5a2405ca3287b08e7ffcb620313..a7faa7e1cc78e900ec09889e2a683a3e
j = this.levelData.getDayTime() + 24000L;
TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (j - j % 24000L) - this.getDayTime());
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 4531d6d54eab78c87961641a0b023117e685aa5b..9c35e7cadb723553bd21851d391b0297e5382b61 100644
index d221ad77f0dee2a8cd7f08f368679183038a88ec..80b76a20848321e982e8b542aa9f5295cfd7e3dd 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -360,6 +360,7 @@ public class PurpurWorldConfig {

16
patches/server/0143-Add-config-for-villager-trading.patch → patches/server/0145-Add-config-for-villager-trading.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for villager trading
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 2936b4856c92dcbe6034f9ace2cb8b94887a4dd8..b71013a6dd5a713543c042199273ddae1feda4b9 100644
index 7efc2d1c7fb65b17bdad0d212e660d71d5528cc9..d78240487b934921509a26b7fca0bce0aaaa40b8 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -365,7 +365,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -31,26 +31,26 @@ 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 1625368c842497a0acd650dfaa0d284edc661548..6632e1e48483b512a7af0f1308116d852ac2a900 100644
index 80b76a20848321e982e8b542aa9f5295cfd7e3dd..f2efffa40204c658375f3ebba8ab710bf3cacb80 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2117,6 +2117,7 @@ public class PurpurWorldConfig {
public int villagerBreedingTicks = 6000;
@@ -2125,6 +2125,7 @@ public class PurpurWorldConfig {
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
public boolean villagerTakeDamageFromWater = false;
+ public boolean villagerAllowTrading = true;
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2133,6 +2134,7 @@ public class PurpurWorldConfig {
villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks);
@@ -2143,6 +2144,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);
+ villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading);
}
public boolean vindicatorRidable = false;
@@ -2162,6 +2164,7 @@ public class PurpurWorldConfig {
@@ -2172,6 +2174,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
public boolean wanderingTraderTakeDamageFromWater = false;
@@ -58,7 +58,7 @@ index 1625368c842497a0acd650dfaa0d284edc661548..6632e1e48483b512a7af0f1308116d85
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -2175,6 +2178,7 @@ public class PurpurWorldConfig {
@@ -2185,6 +2188,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);

0
patches/server/0144-Allow-infinity-on-crossbows.patch → patches/server/0146-Allow-infinity-on-crossbows.patch
View File

2
patches/server/0145-Drowning-Settings.patch → patches/server/0147-Drowning-Settings.patch
View File

@@ -40,7 +40,7 @@ index 234b92b189e921768ea83ef4f0c128266735cc6e..2f48ddb7d2731bd05d149d6286ae8292
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 6632e1e48483b512a7af0f1308116d852ac2a900..60841d2da5b3ad0912fb7931d238afa4a574dfc3 100644
index f2efffa40204c658375f3ebba8ab710bf3cacb80..40cc8ba677500053e3e2e95b83ba88527ebd21e5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -166,6 +166,15 @@ public class PurpurWorldConfig {

2
patches/server/0146-Break-individual-slabs-when-sneaking.patch → patches/server/0148-Break-individual-slabs-when-sneaking.patch
View File

@@ -47,7 +47,7 @@ index 18b603d646081926343dea108b55d641df1c2c34..370772b1297b78bcc7419684015830a8
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 0b3c5a3bf1b9d784b20a5a0fa2cefda22b92dab5..99e1b77a0160507022af41168853fd993fcd2ba4 100644
index 40cc8ba677500053e3e2e95b83ba88527ebd21e5..cd2de2f0a6aeda4b87f18e97e2c5999e1fd3246e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -606,6 +606,11 @@ public class PurpurWorldConfig {

2
patches/server/0147-Config-to-disable-hostile-mob-spawn-on-ice.patch → patches/server/0149-Config-to-disable-hostile-mob-spawn-on-ice.patch
View File

@@ -24,7 +24,7 @@ index 55c245d0dfa369dc6de2197ae37335fba4fae4ae..c9b40515f4c2ff1eedfc9510930c3bae
return false;
} else {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 25d224c38469e82957e924125153d8dc4fef1db3..d3e8c6c7e7088685cadf693e49d797234245c50f 100644
index cd2de2f0a6aeda4b87f18e97e2c5999e1fd3246e..d3f930cc1892e6d2853e8d2e938534c69d10e3a2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -571,6 +571,13 @@ public class PurpurWorldConfig {

4
patches/server/0148-Config-to-show-Armor-Stand-arms-on-spawn.patch → patches/server/0150-Config-to-show-Armor-Stand-arms-on-spawn.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Config to show Armor Stand arms on spawn
diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
index cfe4c6f3316a9bcb3fb77bbb839525bed5527b17..d3bb4bb75e00a3f9507ce3699e55edbd6027d89b 100644
index ffb3ae1d36dda5f521cf3b292d819cb354844806..8ba5701ebec928ba52d88a6671332c80e07f384c 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
@@ -114,6 +114,7 @@ public class ArmorStand extends LivingEntity {
@@ -17,7 +17,7 @@ index cfe4c6f3316a9bcb3fb77bbb839525bed5527b17..d3bb4bb75e00a3f9507ce3699e55edbd
public ArmorStand(Level world, double x, double y, double z) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d3e8c6c7e7088685cadf693e49d797234245c50f..7fd0f37cfb1abf85adf84f5b7f1ed0769eb49208 100644
index d3f930cc1892e6d2853e8d2e938534c69d10e3a2..f675a120cb0e41880b277db60974f2d016fcc4fb 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -104,6 +104,7 @@ public class PurpurWorldConfig {

2
patches/server/0149-Option-to-make-doors-require-redstone.patch → patches/server/0151-Option-to-make-doors-require-redstone.patch
View File

@@ -67,7 +67,7 @@ index c028a7158e41a0754abb8e24dcd647633fbf3fe8..cd65d32f4af016d4937e598c71386a30
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 76a7627d45da058437aa397161a3a6d2276bb631..e6a80597801bd0633c880b4470cda6bbec788646 100644
index f675a120cb0e41880b277db60974f2d016fcc4fb..5c53c323296fc264f6a436b78c7def11deb742d2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -510,6 +510,16 @@ public class PurpurWorldConfig {

2
patches/server/0150-Config-to-allow-for-unsafe-enchants.patch → patches/server/0152-Config-to-allow-for-unsafe-enchants.patch
View File

@@ -70,7 +70,7 @@ index 6fc5699ad90127dc48fa9ff5cb6ba5367031ce83..c179fd1ee55116e1bbdd8f8fadd18825
((ServerPlayer) player).connection.send(new ClientboundContainerSetDataPacket(containerId, 0, cost.get()));
}
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index b70e57a78bbe9084746ba9a4bc896ad2b1636e8f..20aed640cf6afd6d6a24f42adbedc99a044f236f 100644
index 961aca57888de6fe7ea249c2a7596c9863c1effe..4f8fa99211257930adb2ae13505ba5d32c1999ba 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -1198,6 +1198,12 @@ public final class ItemStack {

2
patches/server/0151-Projectile-offset-config.patch → patches/server/0153-Projectile-offset-config.patch
View File

@@ -96,7 +96,7 @@ index 06c2f30b77a2c8aecc65e0c305f643d53798f364..6d1573161f0d8c7999f84925ba7bbf53
entitythrowntrident.pickup = AbstractArrow.Pickup.CREATIVE_ONLY;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 65f6616737e8936e71160b71d410b1a177be1405..e119419b4ac261a439afc605ef26d450101a3fd3 100644
index 5c53c323296fc264f6a436b78c7def11deb742d2..bf2dc4fe37df03728d711952eeabf3882b61c22e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -428,6 +428,23 @@ public class PurpurWorldConfig {

2
patches/server/0152-Config-for-powered-rail-activation-distance.patch → patches/server/0154-Config-for-powered-rail-activation-distance.patch
View File

@@ -18,7 +18,7 @@ index 7fddb6fa8fd30ef88346a59f7867aae792f13772..40893e71fe8447b695350273bef9623b
} else {
int j = pos.getX();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e119419b4ac261a439afc605ef26d450101a3fd3..7206fa9f4fff69068015f2b4801f33836a48e035 100644
index bf2dc4fe37df03728d711952eeabf3882b61c22e..d2305b276252c76ed90aeef0a0e245261b6be348 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -621,6 +621,11 @@ public class PurpurWorldConfig {

6
patches/server/0153-Piglin-portal-spawn-modifier.patch → patches/server/0155-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 75cea7300dee21af13cf448f75361b69ae9d5517..7833464a3c8e4ec96abf5da8728024b3677a2d38 100644
index d2305b276252c76ed90aeef0a0e245261b6be348..a0fd04f892e39805a655216e029bb077847f809c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1636,6 +1636,7 @@ public class PurpurWorldConfig {
@@ -1642,6 +1642,7 @@ public class PurpurWorldConfig {
public double piglinMaxHealth = 16.0D;
public boolean piglinBypassMobGriefing = false;
public boolean piglinTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index 75cea7300dee21af13cf448f75361b69ae9d5517..7833464a3c8e4ec96abf5da8728024b3
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1648,6 +1649,7 @@ public class PurpurWorldConfig {
@@ -1654,6 +1655,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);

0
patches/server/0154-Config-to-change-max-number-of-bees.patch → patches/server/0156-Config-to-change-max-number-of-bees.patch
View File

40
patches/server/0157-Configurable-sponge-absorption.patch Normal file
View File

@@ -0,0 +1,40 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Encode42 <me@encode42.dev>
Date: Wed, 24 Mar 2021 20:30:37 -0400
Subject: [PATCH] Configurable sponge absorption
Allows the total area and radius of water blocks the sponge can absorb to be changed.
Co-authored by: granny <granny@purpurmc.org>
diff --git a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
index 4bce895268542531598a01a1bccd8ac1ed703b7d..e4e926dc89f843886d0df5da31e00053284f5dae 100644
--- a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
@@ -48,7 +48,7 @@ public class SpongeBlock extends Block {
private boolean removeWaterBreadthFirstSearch(Level world, BlockPos pos) {
BlockStateListPopulator blockList = new BlockStateListPopulator(world); // CraftBukkit - Use BlockStateListPopulator
- BlockPos.breadthFirstTraversal(pos, 6, 65, (blockposition1, consumer) -> {
+ BlockPos.breadthFirstTraversal(pos, world.purpurConfig.spongeAbsorptionRadius, 65, (blockposition1, consumer) -> { // Purpur
Direction[] aenumdirection = SpongeBlock.ALL_DIRECTIONS;
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 a0fd04f892e39805a655216e029bb077847f809c..644652189ca1b173776537fa9d17aa31b38cdfe1 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -657,6 +657,13 @@ public class PurpurWorldConfig {
spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
}
+ public int spongeAbsorptionArea = 64;
+ public int spongeAbsorptionRadius = 6;
+ private void spongeSettings() {
+ spongeAbsorptionArea = getInt("blocks.sponge.absorption.area", spongeAbsorptionArea);
+ spongeAbsorptionRadius = getInt("blocks.sponge.absorption.radius", spongeAbsorptionRadius);
+ }
+
public boolean turtleEggsBreakFromExpOrbs = true;
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;

6
patches/server/0155-Config-for-wither-explosion-radius.patch → 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 7833464a3c8e4ec96abf5da8728024b3677a2d38..dbfe6549a0fcc6acd7b1ffb6385dc228b834ab8b 100644
index 644652189ca1b173776537fa9d17aa31b38cdfe1..3ff04b2071b6a8d52fd122a39f215ff816eed393 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2275,6 +2275,7 @@ public class PurpurWorldConfig {
@@ -2292,6 +2292,7 @@ public class PurpurWorldConfig {
public boolean witherBypassMobGriefing = false;
public boolean witherTakeDamageFromWater = false;
public boolean witherCanRideVehicles = false;
@@ -29,7 +29,7 @@ index 7833464a3c8e4ec96abf5da8728024b3677a2d38..dbfe6549a0fcc6acd7b1ffb6385dc228
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2295,6 +2296,7 @@ public class PurpurWorldConfig {
@@ -2312,6 +2313,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);

0
patches/server/0156-Gamemode-extra-permissions.patch → patches/server/0159-Gamemode-extra-permissions.patch
View File

2
patches/server/0157-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch → patches/server/0160-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
View File

@@ -18,7 +18,7 @@ index c7195f2e12bbd6545f7bffcc2b4ba5cc3d48df20..5e730bc9c8ff94b16ac2bf8567dda8ae
Runnable afterAction = null; // Paper
if (blockState2 != null && level.getBlockState(blockPos.above()).isAir()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3243cf715d7f8a7d871d61a1308d09e8c543f8a3..6cb6d57c374cc11c9624d721e7309004852e1a6a 100644
index 3ff04b2071b6a8d52fd122a39f215ff816eed393..40b7de2a34f835fab827f884384029a14b76e632 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -450,6 +450,21 @@ public class PurpurWorldConfig {

2
patches/server/0158-Configurable-piston-push-limit.patch → patches/server/0161-Configurable-piston-push-limit.patch
View File

@@ -36,7 +36,7 @@ index 744d91546d1a810f60a43c15ed74b4158f341a4a..354538daefa603f6df5a139b6bff87db
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 6cb6d57c374cc11c9624d721e7309004852e1a6a..9c2c7ea17baa08165c9683853ebc7877d02c7464 100644
index 40b7de2a34f835fab827f884384029a14b76e632..d6d023d6742abcbe4cfacf0ea2b12c8780015261 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -631,6 +631,11 @@ public class PurpurWorldConfig {

2
patches/server/0159-Configurable-broadcast-settings.patch → patches/server/0162-Configurable-broadcast-settings.patch
View File

@@ -17,7 +17,7 @@ index 52891c4a4260d1938f2f4565b5219ad303555638..69d349613f01ab0ac1890734657da529
// Paper end
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 7583d43ad95586ca584e44eaca52d9b1ee33e2be..6da83551f77354bd40a4fe8ace331eb24208f057 100644
index 0c22824240c260c86237a47680c1c2492a2201e2..2f7edbf425ebf2985fdcd3f347cdf211b64d15ec 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1003,6 +1003,7 @@ public class ServerPlayer extends Player {

2
patches/server/0160-Configurable-mob-blindness.patch → patches/server/0163-Configurable-mob-blindness.patch
View File

@@ -28,7 +28,7 @@ index 2f48ddb7d2731bd05d149d6286ae8292dfbec94b..9cf87d4009e8d71d844cf1583a1457b4
return d0;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a8f5a3c7a756cb74cf065f1797b4a1e47b595236..1d30ead160227a6b6b0459c92aaf2134317f5538 100644
index d6d023d6742abcbe4cfacf0ea2b12c8780015261..5fcbfa39b9a22e9ceae21bab71c7686ca7722c1d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -134,6 +134,7 @@ public class PurpurWorldConfig {

0
patches/server/0161-Hide-hidden-players-from-entity-selector.patch → patches/server/0164-Hide-hidden-players-from-entity-selector.patch
View File

6
patches/server/0162-Config-for-health-to-impact-Creeper-explosion-radius.patch → patches/server/0165-Config-for-health-to-impact-Creeper-explosion-radius.patch
View File

@@ -21,10 +21,10 @@ index 56aaf99a94944de42f437e18806381e3978c305a..e2fba88438835f63605b81eeeff5345b
if (!event.isCancelled()) {
this.dead = true;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d521ca080cde008ae9da4737bfe94ea116154480..8bcba18465ca8257cf76a4bcd1110beb1c621243 100644
index 5fcbfa39b9a22e9ceae21bab71c7686ca7722c1d..55b1a959eafccbdfcb812ab28dfb5e38d173e660 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -935,6 +935,7 @@ public class PurpurWorldConfig {
@@ -942,6 +942,7 @@ public class PurpurWorldConfig {
public boolean creeperBypassMobGriefing = false;
public boolean creeperTakeDamageFromWater = false;
public boolean creeperExplodeWhenKilled = false;
@@ -32,7 +32,7 @@ index d521ca080cde008ae9da4737bfe94ea116154480..8bcba18465ca8257cf76a4bcd1110beb
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -950,6 +951,7 @@ public class PurpurWorldConfig {
@@ -957,6 +958,7 @@ public class PurpurWorldConfig {
creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing);
creeperTakeDamageFromWater = getBoolean("mobs.creeper.takes-damage-from-water", creeperTakeDamageFromWater);
creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);

6
patches/server/0163-Iron-golem-calm-anger-options.patch → patches/server/0166-Iron-golem-calm-anger-options.patch
View File

@@ -25,10 +25,10 @@ index 58539d29b8e2a8c0676cc574f64e7d61613e1451..1ffb8e1c386fc85796432281ac407a93
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a2cceab5518a48d87a6bbeb5bc9b87c96611c336..14a1150bb860af3e99ab67f5bbb44c791c80f0df 100644
index 55b1a959eafccbdfcb812ab28dfb5e38d173e660..8116edb1eab9da68d86c33633f4558a474b25388 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1393,6 +1393,8 @@ public class PurpurWorldConfig {
@@ -1400,6 +1400,8 @@ public class PurpurWorldConfig {
public boolean ironGolemCanSwim = false;
public double ironGolemMaxHealth = 100.0D;
public boolean ironGolemTakeDamageFromWater = false;
@@ -37,7 +37,7 @@ index a2cceab5518a48d87a6bbeb5bc9b87c96611c336..14a1150bb860af3e99ab67f5bbb44c79
private void ironGolemSettings() {
ironGolemRidable = getBoolean("mobs.iron_golem.ridable", ironGolemRidable);
ironGolemRidableInWater = getBoolean("mobs.iron_golem.ridable-in-water", ironGolemRidableInWater);
@@ -1405,6 +1407,8 @@ public class PurpurWorldConfig {
@@ -1412,6 +1414,8 @@ public class PurpurWorldConfig {
}
ironGolemMaxHealth = getDouble("mobs.iron_golem.attributes.max_health", ironGolemMaxHealth);
ironGolemTakeDamageFromWater = getBoolean("mobs.iron_golem.takes-damage-from-water", ironGolemTakeDamageFromWater);

6
patches/server/0164-Breedable-parrots.patch → 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 14a1150bb860af3e99ab67f5bbb44c791c80f0df..eafba18eb4b52a571af814e82aee09710146ba88 100644
index 8116edb1eab9da68d86c33633f4558a474b25388..460a9d7191caa63a896b39e6e4b72239bfd3d967 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1566,6 +1566,7 @@ public class PurpurWorldConfig {
@@ -1573,6 +1573,7 @@ public class PurpurWorldConfig {
public double parrotMaxY = 320D;
public double parrotMaxHealth = 6.0D;
public boolean parrotTakeDamageFromWater = false;
@@ -61,7 +61,7 @@ index 14a1150bb860af3e99ab67f5bbb44c791c80f0df..eafba18eb4b52a571af814e82aee0971
private void parrotSettings() {
parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable);
parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater);
@@ -1578,6 +1579,7 @@ public class PurpurWorldConfig {
@@ -1585,6 +1586,7 @@ public class PurpurWorldConfig {
}
parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth);
parrotTakeDamageFromWater = getBoolean("mobs.parrot.takes-damage-from-water", parrotTakeDamageFromWater);

2
patches/server/0165-Configurable-powered-rail-boost-modifier.patch → patches/server/0168-Configurable-powered-rail-boost-modifier.patch
View File

@@ -18,7 +18,7 @@ index 5cdcc5792f19766d2d55d16859f8e0f68bd6479b..b99b94c6ec4767aba16d82eaca8b2761
Vec3 vec3d5 = this.getDeltaMovement();
double d21 = vec3d5.x;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index eafba18eb4b52a571af814e82aee09710146ba88..f59b3a99e460859f1744e9360a4a7dd31e1aeec5 100644
index 460a9d7191caa63a896b39e6e4b72239bfd3d967..afc59c56d8d60a51ddd6ce1a9f9f937d2398b381 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -277,6 +277,7 @@ public class PurpurWorldConfig {

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