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

elytra.ignore-unbreaking option can probably be done through datapacks now

Browse Source
This commit is contained in:
granny
2024-06-16 23:03:22 -07:00
parent ea406a0e2b
commit 4dca11b02c
147 changed files with 763 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0057-Implement-elytra-settings.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement elytra settings
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 6f7188ccba2675264ba8fbfd05cacc1c60211157..b183a9e42178ff02c5d70abacee3cfaa7b7b93c3 100644
index e7853a16674ee748ebbf378044cb484cfdf6b73e..0c607578b493496e79ea08cdf752828252a66c47 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3558,7 +3558,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -46,18 +46,10 @@ index 218f2f085309f04438f8b07bc41cf242583db2dc..ea8e49b42b9dde74784189430be66ed6
itemStack.shrink(1);
} else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index 00665c3e81264b440cd27431f7632f3bc2b1ceef..d36b5ddc360e4f4cca3ef5c1b5b3d0cbad02614b 100644
index 00665c3e81264b440cd27431f7632f3bc2b1ceef..88db87941bfc84bec7a2dcd3c750a854cac72006 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -685,6 +685,7 @@ public final class ItemStack implements DataComponentHolder {
if (player == null || !player.hasInfiniteMaterials() || force) { // Paper
if (amount > 0) {
int originalDamage = amount; // Paper - Expand PlayerItemDamageEvent
+ // (getItem() == Items.ELYTRA && player != null && player.level().purpurConfig.elytraIgnoreUnbreaking) ? 0 : // Purpur
amount = EnchantmentHelper.processDurabilityChange(world, this, amount);
// CraftBukkit start
if (player instanceof ServerPlayer serverPlayer) { // Paper - Add EntityDamageItemEvent
@@ -750,6 +751,12 @@ public final class ItemStack implements DataComponentHolder {
@@ -750,6 +750,12 @@ public final class ItemStack implements DataComponentHolder {
}
this.hurtAndBreak(amount, worldserver, entity, (item) -> { // Paper - Add EntityDamageItemEvent
@@ -90,22 +82,20 @@ index f1b2d388a1a40a1d909a2e726f32d6c15e1eb0eb..4934bae61114b49a9f8d0ed044fbb881
entityhuman.startAutoSpinAttack(20, 8.0F, stack);
if (entityhuman.onGround()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f980e39b09f38e1c8265a8fe65de91178579326f..4d7a85f1ece3a60404474ad492edb2d8f097a6a0 100644
index f980e39b09f38e1c8265a8fe65de91178579326f..f5eb2e02099ca46b44512163fd378a49c9b4b0ba 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -112,6 +112,19 @@ public class PurpurWorldConfig {
@@ -112,6 +112,17 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}
+ public int elytraDamagePerSecond = 1;
+ public double elytraDamageMultiplyBySpeed = 0;
+ public boolean elytraIgnoreUnbreaking = false;
+ public int elytraDamagePerFireworkBoost = 0;
+ public int elytraDamagePerTridentBoost = 0;
+ private void elytraSettings() {
+ elytraDamagePerSecond = getInt("gameplay-mechanics.elytra.damage-per-second", elytraDamagePerSecond);
+ elytraDamageMultiplyBySpeed = getDouble("gameplay-mechanics.elytra.damage-multiplied-by-speed", elytraDamageMultiplyBySpeed);
+ elytraIgnoreUnbreaking = getBoolean("gameplay-mechanics.elytra.ignore-unbreaking", elytraIgnoreUnbreaking);
+ elytraDamagePerFireworkBoost = getInt("gameplay-mechanics.elytra.damage-per-boost.firework", elytraDamagePerFireworkBoost);
+ elytraDamagePerTridentBoost = getInt("gameplay-mechanics.elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
+ }

4
patches/server/0058-Item-entity-immunities.patch
View File

@@ -117,10 +117,10 @@ index 30d62ee4d5cd2ddacb8783b5bbbf475d592b3e02..01e4395f1669d21c30465aa1366bd2f1
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 4d7a85f1ece3a60404474ad492edb2d8f097a6a0..d020ee719367487302d57a2806524f15f5401289 100644
index f5eb2e02099ca46b44512163fd378a49c9b4b0ba..80b2c27eb66749fa74620f12899cf728043d252f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -125,6 +125,49 @@ public class PurpurWorldConfig {
@@ -123,6 +123,49 @@ public class PurpurWorldConfig {
elytraDamagePerTridentBoost = getInt("gameplay-mechanics.elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
}

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

@@ -167,10 +167,10 @@ index 883cd9a96a1d4276ca10c5558b553c36a1bb0d79..0dcf5638e12c7670e6a5e577210e2542
public void setPersistentAngerTarget(@Nullable UUID angryAt) {
this.persistentAngerTarget = angryAt;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d020ee719367487302d57a2806524f15f5401289..5fa2939889d7a294d4e0afe444bf0529a1efa849 100644
index 80b2c27eb66749fa74620f12899cf728043d252f..af58101a8c364740b5f0fb1d859d0c57f7e91eac 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -610,6 +610,9 @@ public class PurpurWorldConfig {
@@ -608,6 +608,9 @@ public class PurpurWorldConfig {
public boolean drownedControllable = true;
public double drownedMaxHealth = 20.0D;
public double drownedSpawnReinforcements = 0.1D;
@@ -180,7 +180,7 @@ index d020ee719367487302d57a2806524f15f5401289..5fa2939889d7a294d4e0afe444bf0529
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -621,6 +624,9 @@ public class PurpurWorldConfig {
@@ -619,6 +622,9 @@ public class PurpurWorldConfig {
}
drownedMaxHealth = getDouble("mobs.drowned.attributes.max_health", drownedMaxHealth);
drownedSpawnReinforcements = getDouble("mobs.drowned.attributes.spawn_reinforcements", drownedSpawnReinforcements);
@@ -190,7 +190,7 @@ index d020ee719367487302d57a2806524f15f5401289..5fa2939889d7a294d4e0afe444bf0529
}
public boolean elderGuardianRidable = false;
@@ -869,6 +875,9 @@ public class PurpurWorldConfig {
@@ -867,6 +873,9 @@ public class PurpurWorldConfig {
public boolean huskControllable = true;
public double huskMaxHealth = 20.0D;
public double huskSpawnReinforcements = 0.1D;
@@ -200,7 +200,7 @@ index d020ee719367487302d57a2806524f15f5401289..5fa2939889d7a294d4e0afe444bf0529
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -880,6 +889,9 @@ public class PurpurWorldConfig {
@@ -878,6 +887,9 @@ public class PurpurWorldConfig {
}
huskMaxHealth = getDouble("mobs.husk.attributes.max_health", huskMaxHealth);
huskSpawnReinforcements = getDouble("mobs.husk.attributes.spawn_reinforcements", huskSpawnReinforcements);
@@ -210,7 +210,7 @@ index d020ee719367487302d57a2806524f15f5401289..5fa2939889d7a294d4e0afe444bf0529
}
public boolean illusionerRidable = false;
@@ -1696,6 +1708,9 @@ public class PurpurWorldConfig {
@@ -1694,6 +1706,9 @@ public class PurpurWorldConfig {
public boolean zombieControllable = true;
public double zombieMaxHealth = 20.0D;
public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index d020ee719367487302d57a2806524f15f5401289..5fa2939889d7a294d4e0afe444bf0529
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1707,6 +1722,9 @@ public class PurpurWorldConfig {
@@ -1705,6 +1720,9 @@ public class PurpurWorldConfig {
}
zombieMaxHealth = getDouble("mobs.zombie.attributes.max_health", zombieMaxHealth);
zombieSpawnReinforcements = getDouble("mobs.zombie.attributes.spawn_reinforcements", zombieSpawnReinforcements);
@@ -230,7 +230,7 @@ index d020ee719367487302d57a2806524f15f5401289..5fa2939889d7a294d4e0afe444bf0529
}
public boolean zombieHorseRidable = false;
@@ -1743,6 +1761,9 @@ public class PurpurWorldConfig {
@@ -1741,6 +1759,9 @@ public class PurpurWorldConfig {
public boolean zombieVillagerControllable = true;
public double zombieVillagerMaxHealth = 20.0D;
public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index d020ee719367487302d57a2806524f15f5401289..5fa2939889d7a294d4e0afe444bf0529
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -1754,6 +1775,9 @@ public class PurpurWorldConfig {
@@ -1752,6 +1773,9 @@ public class PurpurWorldConfig {
}
zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
@@ -250,7 +250,7 @@ index d020ee719367487302d57a2806524f15f5401289..5fa2939889d7a294d4e0afe444bf0529
}
public boolean zombifiedPiglinRidable = false;
@@ -1761,6 +1785,9 @@ public class PurpurWorldConfig {
@@ -1759,6 +1783,9 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinControllable = true;
public double zombifiedPiglinMaxHealth = 20.0D;
public double zombifiedPiglinSpawnReinforcements = 0.0D;
@@ -260,7 +260,7 @@ index d020ee719367487302d57a2806524f15f5401289..5fa2939889d7a294d4e0afe444bf0529
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1772,5 +1799,8 @@ public class PurpurWorldConfig {
@@ -1770,5 +1797,8 @@ public class PurpurWorldConfig {
}
zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);

6
patches/server/0063-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -256,10 +256,10 @@ index 4dea7aed072caf383986e09ead8ee790b35d9706..7a80cb45ff5d96380755d37ff43ddeac
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 5fa2939889d7a294d4e0afe444bf0529a1efa849..49ac8f8b8c33560dfae7871eb325ef47127d3654 100644
index af58101a8c364740b5f0fb1d859d0c57f7e91eac..313b22d3cba602f35a799af0656cf514f1ff1c83 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1087,6 +1087,9 @@ public class PurpurWorldConfig {
@@ -1085,6 +1085,9 @@ public class PurpurWorldConfig {
public String phantomAttackDamage = "6 + size";
public Map<Integer, Double> phantomMaxHealthCache = new HashMap<>();
public Map<Integer, Double> phantomAttackDamageCache = new HashMap<>();
@@ -269,7 +269,7 @@ index 5fa2939889d7a294d4e0afe444bf0529a1efa849..49ac8f8b8c33560dfae7871eb325ef47
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1108,6 +1111,9 @@ public class PurpurWorldConfig {
@@ -1106,6 +1109,9 @@ public class PurpurWorldConfig {
phantomAttackDamage = getString("mobs.phantom.attributes.attack_damage", phantomAttackDamage);
phantomMaxHealthCache.clear();
phantomAttackDamageCache.clear();

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

@@ -40,10 +40,10 @@ index 1b1b475ca27e799e251d6f8a8c9fe1a4fd8bae83..04f67f7b43d2f461c776c76614dc3e5f
for (int l = 0; l < k; ++l) {
// Paper start - PhantomPreSpawnEvent
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 49ac8f8b8c33560dfae7871eb325ef47127d3654..812a95f388302a0c860cd9addec24697be50b781 100644
index 313b22d3cba602f35a799af0656cf514f1ff1c83..56c7d54c076182e1f43fcafc533b04b74aabe62f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1090,6 +1090,12 @@ public class PurpurWorldConfig {
@@ -1088,6 +1088,12 @@ public class PurpurWorldConfig {
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
public double phantomOrbitCrystalRadius = 0.0D;
@@ -56,7 +56,7 @@ index 49ac8f8b8c33560dfae7871eb325ef47127d3654..812a95f388302a0c860cd9addec24697
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1114,6 +1120,12 @@ public class PurpurWorldConfig {
@@ -1112,6 +1118,12 @@ public class PurpurWorldConfig {
phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
phantomOrbitCrystalRadius = getDouble("mobs.phantom.orbit-crystal-radius", phantomOrbitCrystalRadius);

4
patches/server/0065-Implement-bed-explosion-options.patch
View File

@@ -27,10 +27,10 @@ index 85d598c3354ee62f0fd1b26e485e0084967c0380..b59dd6b512021c335f3c21999958e2ea
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 812a95f388302a0c860cd9addec24697be50b781..35d387e70b2bb75b68b01199be617888036957fa 100644
index 56c7d54c076182e1f43fcafc533b04b74aabe62f..91ec52442ef175781ebd661521ed8b1ec889c582 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -284,6 +284,27 @@ public class PurpurWorldConfig {
@@ -282,6 +282,27 @@ public class PurpurWorldConfig {
});
}

4
patches/server/0066-Implement-respawn-anchor-explosion-options.patch
View File

@@ -18,10 +18,10 @@ index 94d067e9eeee73183de25165d8c97043fe256103..00b6941951e1af9993f8f6da5425d31b
public static boolean canSetSpawn(Level world) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 35d387e70b2bb75b68b01199be617888036957fa..f91548d91fbe690bdddcc63da8459f0a30a72899 100644
index 91ec52442ef175781ebd661521ed8b1ec889c582..2894be6907fdb07b23598b1c5ba2becf08e5edf3 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -324,6 +324,27 @@ public class PurpurWorldConfig {
@@ -322,6 +322,27 @@ public class PurpurWorldConfig {
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
}

6
patches/server/0069-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 086cb752a2d1e667a73840bb1599e73a08293b71..94f8e4c9f44b2cd82108eb1c213cc33497cc200d 100644
index 68c4e3d9a3f928a52357e25820ac73adbfb3332c..ce1901c683c44893780342f7a3914613abc44b0b 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2752,6 +2752,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -94,10 +94,10 @@ index 091d2b1646068657120ee4244d79cbf7867a9cf7..149d272775783aab243f0707ee11f702
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f91548d91fbe690bdddcc63da8459f0a30a72899..7c7d8e3d3e2a9dca29d489fa2ce3cf101a07e124 100644
index 2894be6907fdb07b23598b1c5ba2becf08e5edf3..beb1f965ac90b29f6eb8ed19da1d38163e8c15dd 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -125,6 +125,11 @@ public class PurpurWorldConfig {
@@ -123,6 +123,11 @@ public class PurpurWorldConfig {
elytraDamagePerTridentBoost = getInt("gameplay-mechanics.elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
}

8
patches/server/0070-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
View File

@@ -38,7 +38,7 @@ index 71d96fad8cceb9f5699620510b9b8cc4a6fa94f2..3833be24c44c0da3ffcfc1929e2c4a4b
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index b183a9e42178ff02c5d70abacee3cfaa7b7b93c3..d9215a42c8dd761fa04269c936ed0cca3d96ff84 100644
index 0c607578b493496e79ea08cdf752828252a66c47..d207f9107b2d78bbe5f4eb400f825829ea4f4688 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -462,6 +462,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -50,10 +50,10 @@ index b183a9e42178ff02c5d70abacee3cfaa7b7b93c3..d9215a42c8dd761fa04269c936ed0cca
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7c7d8e3d3e2a9dca29d489fa2ce3cf101a07e124..9ffa9b0f96787f80d755afa793e4548fb80a0cd5 100644
index beb1f965ac90b29f6eb8ed19da1d38163e8c15dd..f2f965d6ffb56418f7ed1d511e94170d4eb2313f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -242,6 +242,7 @@ public class PurpurWorldConfig {
@@ -240,6 +240,7 @@ public class PurpurWorldConfig {
public boolean idleTimeoutTargetPlayer = true;
public String playerDeathExpDropEquation = "expLevel * 7";
public int playerDeathExpDropMax = 100;
@@ -61,7 +61,7 @@ index 7c7d8e3d3e2a9dca29d489fa2ce3cf101a07e124..9ffa9b0f96787f80d755afa793e4548f
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -255,6 +256,7 @@ public class PurpurWorldConfig {
@@ -253,6 +254,7 @@ public class PurpurWorldConfig {
idleTimeoutTargetPlayer = getBoolean("gameplay-mechanics.player.idle-timeout.mobs-target", idleTimeoutTargetPlayer);
playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);

6
patches/server/0071-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 9ffa9b0f96787f80d755afa793e4548fb80a0cd5..bc41aa68be7298b7b1f89490e53d38f3bc34e56b 100644
index f2f965d6ffb56418f7ed1d511e94170d4eb2313f..41a164c0009e6c7112541b49f26ba9849a16f6b1 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1475,6 +1475,7 @@ public class PurpurWorldConfig {
@@ -1473,6 +1473,7 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public boolean squidControllable = true;
public double squidMaxHealth = 10.0D;
@@ -16,7 +16,7 @@ index 9ffa9b0f96787f80d755afa793e4548fb80a0cd5..bc41aa68be7298b7b1f89490e53d38f3
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -1484,6 +1485,7 @@ public class PurpurWorldConfig {
@@ -1482,6 +1483,7 @@ public class PurpurWorldConfig {
set("mobs.squid.attributes.max_health", oldValue);
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);

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

@@ -51,10 +51,10 @@ index 7a80cb45ff5d96380755d37ff43ddeac2cd451e1..8f221fe016ea7221eb3a2116a2213139
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 bc41aa68be7298b7b1f89490e53d38f3bc34e56b..a63b86feb48621698794029ec42404ba5bad9aca 100644
index 41a164c0009e6c7112541b49f26ba9849a16f6b1..33ea997e6517fb39a3f676c131824cffccdaf5af 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1145,6 +1145,9 @@ public class PurpurWorldConfig {
@@ -1143,6 +1143,9 @@ public class PurpurWorldConfig {
public double phantomSpawnLocalDifficultyChance = 3.0D;
public int phantomSpawnMinPerAttempt = 1;
public int phantomSpawnMaxPerAttempt = -1;
@@ -64,7 +64,7 @@ index bc41aa68be7298b7b1f89490e53d38f3bc34e56b..a63b86feb48621698794029ec42404ba
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1175,6 +1178,9 @@ public class PurpurWorldConfig {
@@ -1173,6 +1176,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/0073-Configurable-villager-breeding.patch
View File

@@ -18,10 +18,10 @@ index 33c0ac18fa4c5b47d60cc774fe72d2d68c14e025..ad3e340c2487aa1dc2ed3ab08fa8747b
private boolean hungry() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a63b86feb48621698794029ec42404ba5bad9aca..6ed32f868a3bb6e7674a4a901dfbda20768d5d55 100644
index 33ea997e6517fb39a3f676c131824cffccdaf5af..73c4d1f29199af355cc467c7322637044805ea52 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1633,6 +1633,7 @@ public class PurpurWorldConfig {
@@ -1631,6 +1631,7 @@ public class PurpurWorldConfig {
public double villagerMaxHealth = 20.0D;
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
@@ -29,7 +29,7 @@ index a63b86feb48621698794029ec42404ba5bad9aca..6ed32f868a3bb6e7674a4a901dfbda20
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1645,6 +1646,7 @@ public class PurpurWorldConfig {
@@ -1643,6 +1644,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);

4
patches/server/0074-Redstone-deactivates-spawners.patch
View File

@@ -17,10 +17,10 @@ index f57e1b78204dff661ad5d3ee93a88a00330af2dc..967af8771ff8564c715d89f4b4b69b16
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 6ed32f868a3bb6e7674a4a901dfbda20768d5d55..f904a4142262e27ebc6e3cc44a277a07f3a45e00 100644
index 73c4d1f29199af355cc467c7322637044805ea52..1b4b248d79d0e80750c957e1d76d1572c2528d6e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -352,6 +352,11 @@ public class PurpurWorldConfig {
@@ -350,6 +350,11 @@ public class PurpurWorldConfig {
}
}

8
patches/server/0075-Totems-work-in-inventory.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Totems work in inventory
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index d9215a42c8dd761fa04269c936ed0cca3d96ff84..7fa56c1bb7ba6a535a486cd452358b6d2dc59d9b 100644
index d207f9107b2d78bbe5f4eb400f825829ea4f4688..62bf75a8adbe267663b88c2709d042c4b473907c 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1630,6 +1630,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -28,10 +28,10 @@ index d9215a42c8dd761fa04269c936ed0cca3d96ff84..7fa56c1bb7ba6a535a486cd452358b6d
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 f904a4142262e27ebc6e3cc44a277a07f3a45e00..1b3e2b9dc1f4a005c43a3ec52d182d4a4c08b84a 100644
index 1b4b248d79d0e80750c957e1d76d1572c2528d6e..8dc68f00b488da2881c35061bc729edfe295a1c0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -243,6 +243,7 @@ public class PurpurWorldConfig {
@@ -241,6 +241,7 @@ public class PurpurWorldConfig {
public String playerDeathExpDropEquation = "expLevel * 7";
public int playerDeathExpDropMax = 100;
public boolean teleportIfOutsideBorder = false;
@@ -39,7 +39,7 @@ index f904a4142262e27ebc6e3cc44a277a07f3a45e00..1b3e2b9dc1f4a005c43a3ec52d182d4a
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -257,6 +258,7 @@ public class PurpurWorldConfig {
@@ -255,6 +256,7 @@ public class PurpurWorldConfig {
playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);

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

@@ -21,10 +21,10 @@ index eb6dce8b2dcc7f4e63c69cfa6acbd9b36a923706..feb7eb93bd20e141ff86ed2e91b9cd0f
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 1b3e2b9dc1f4a005c43a3ec52d182d4a4c08b84a..d734ee6416b2549740dc60bb3bd2d7f894a5328a 100644
index 8dc68f00b488da2881c35061bc729edfe295a1c0..afe3b998b4ef5b086969e58a656adedf8b9600ea 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1660,6 +1660,7 @@ public class PurpurWorldConfig {
@@ -1658,6 +1658,7 @@ public class PurpurWorldConfig {
public boolean vindicatorRidableInWater = true;
public boolean vindicatorControllable = true;
public double vindicatorMaxHealth = 24.0D;
@@ -32,7 +32,7 @@ index 1b3e2b9dc1f4a005c43a3ec52d182d4a4c08b84a..d734ee6416b2549740dc60bb3bd2d7f8
private void vindicatorSettings() {
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
@@ -1670,6 +1671,7 @@ public class PurpurWorldConfig {
@@ -1668,6 +1669,7 @@ public class PurpurWorldConfig {
set("mobs.vindicator.attributes.max_health", oldValue);
}
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);

4
patches/server/0077-Dispensers-place-anvils-option.patch
View File

@@ -32,10 +32,10 @@ index 7bf250bba4179a506c0a39b7866a9389552d2905..6548e595ab5c06044be438bc7eac181f
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d734ee6416b2549740dc60bb3bd2d7f894a5328a..7a5432738f06500735647e30077ca58bcba2aeb9 100644
index afe3b998b4ef5b086969e58a656adedf8b9600ea..3dc99b3cbba5482d52052ded3217059ec6da3324 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -315,8 +315,10 @@ public class PurpurWorldConfig {
@@ -313,8 +313,10 @@ public class PurpurWorldConfig {
}
public boolean dispenserApplyCursedArmor = true;

4
patches/server/0078-Allow-anvil-colors.patch
View File

@@ -64,10 +64,10 @@ index 99bfa7cdc58c690d6f0c742dafedd40cace3223f..2d300905c05c7c23a4da30b3651b3313
}
} else if (itemstack.has(DataComponents.CUSTOM_NAME)) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7a5432738f06500735647e30077ca58bcba2aeb9..a17f35a72227ad4c149434a294c6d63d8e3c8f9b 100644
index 3dc99b3cbba5482d52052ded3217059ec6da3324..2c31025c2554858936118438d45c873290484f4b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -293,6 +293,13 @@ public class PurpurWorldConfig {
@@ -291,6 +291,13 @@ public class PurpurWorldConfig {
});
}

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

@@ -17,10 +17,10 @@ index e60464efd9986e1cf857d8595b13535df7ffc7b1..30da8d977d5b591d6bce619eba71181c
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a17f35a72227ad4c149434a294c6d63d8e3c8f9b..dab4fb7e985e6b087c0f617685ac30a28f535e51 100644
index 2c31025c2554858936118438d45c873290484f4b..28ab98c61bf9e1371b6fdf254f2fcc2cd65acdd8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -632,6 +632,7 @@ public class PurpurWorldConfig {
@@ -630,6 +630,7 @@ public class PurpurWorldConfig {
public float dolphinSpitSpeed = 1.0F;
public float dolphinSpitDamage = 2.0F;
public double dolphinMaxHealth = 10.0D;
@@ -28,7 +28,7 @@ index a17f35a72227ad4c149434a294c6d63d8e3c8f9b..dab4fb7e985e6b087c0f617685ac30a2
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinControllable = getBoolean("mobs.dolphin.controllable", dolphinControllable);
@@ -644,6 +645,7 @@ public class PurpurWorldConfig {
@@ -642,6 +643,7 @@ public class PurpurWorldConfig {
set("mobs.dolphin.attributes.max_health", oldValue);
}
dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);

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

@@ -54,10 +54,10 @@ index c8f7c43134e7c51ce8af5b3c1a28c11db67715a2..5b98889715bf62eb4f15c0b45ada2c70
+ // Purpur
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index dab4fb7e985e6b087c0f617685ac30a28f535e51..5c94f235d1979833e77692646f67b39db7347938 100644
index 28ab98c61bf9e1371b6fdf254f2fcc2cd65acdd8..3c87babcb6c9a0bbbf433cce45739e218cca3824 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1500,6 +1500,7 @@ public class PurpurWorldConfig {
@@ -1498,6 +1498,7 @@ public class PurpurWorldConfig {
public boolean squidControllable = true;
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
@@ -65,7 +65,7 @@ index dab4fb7e985e6b087c0f617685ac30a28f535e51..5c94f235d1979833e77692646f67b39d
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -1510,6 +1511,7 @@ public class PurpurWorldConfig {
@@ -1508,6 +1509,7 @@ public class PurpurWorldConfig {
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);

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

@@ -23,10 +23,10 @@ index 4b1821ad50103cb996bb3ff9b9668f22ffff518f..402f67ca333e09c684ae083071715734
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 5c94f235d1979833e77692646f67b39db7347938..bb3b087b752d8de36c6e7aed01c83cba4607c74d 100644
index 3c87babcb6c9a0bbbf433cce45739e218cca3824..8c7f9a391935e1527856163dd6860abc3514c738 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1737,6 +1737,8 @@ public class PurpurWorldConfig {
@@ -1735,6 +1735,8 @@ public class PurpurWorldConfig {
public boolean witherControllable = true;
public double witherMaxY = 320D;
public double witherMaxHealth = 300.0D;
@@ -35,7 +35,7 @@ index 5c94f235d1979833e77692646f67b39db7347938..bb3b087b752d8de36c6e7aed01c83cba
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1752,6 +1754,8 @@ public class PurpurWorldConfig {
@@ -1750,6 +1752,8 @@ public class PurpurWorldConfig {
set("mobs.wither.attributes.max_health", oldValue);
}
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);

4
patches/server/0084-Allow-toggling-special-MobSpawners-per-world.patch
View File

@@ -59,7 +59,7 @@ index c72b6ea5530e54fc373c701028e1c147cea34b59..96e9fce5f9084737d2fcf4deb8330573
if (spawnplacementtype.isSpawnPositionOk(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 bb3b087b752d8de36c6e7aed01c83cba4607c74d..5cb22affc431441619af3d4e48ea546e694e9d30 100644
index 8c7f9a391935e1527856163dd6860abc3514c738..5c880a028a9c62c109500a46e2cf369886f094b2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -69,6 +69,12 @@ public class PurpurWorldConfig {
@@ -75,7 +75,7 @@ index bb3b087b752d8de36c6e7aed01c83cba4607c74d..5cb22affc431441619af3d4e48ea546e
private double getDouble(String path, double def) {
PurpurConfig.config.addDefault("world-settings.default." + path, def);
return PurpurConfig.config.getDouble("world-settings." + worldName + "." + path, PurpurConfig.config.getDouble("world-settings.default." + path));
@@ -235,6 +241,21 @@ public class PurpurWorldConfig {
@@ -233,6 +239,21 @@ public class PurpurWorldConfig {
}
}

4
patches/server/0086-Despawn-rate-config-options-per-projectile-type.patch
View File

@@ -7,10 +7,10 @@ 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 6572269ca6907c384d5798b91ca1851ece5e8070..578ae5e0fb1810085f13e83cad320fa5325abfff 100644
index a321648355e0a85739329b6f82461c812c823d37..f9a5248da33fe7f224411cc3b9b35fb65b5d4572 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -316,6 +316,40 @@ public class PurpurWorldConfig {
@@ -314,6 +314,40 @@ public class PurpurWorldConfig {
});
}

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

@@ -70,10 +70,10 @@ index 43c48bb14957b93ee3b0191360c09f710bc008e0..b39d8ee4c6e9483a15991be3b1440384
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 578ae5e0fb1810085f13e83cad320fa5325abfff..bd390f5201dd8129213048e7e2fc6b3e9763934a 100644
index f9a5248da33fe7f224411cc3b9b35fb65b5d4572..60444ab2a15f2e1f2ea0bf291cc3f932c3f1dcdc 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1871,6 +1871,7 @@ public class PurpurWorldConfig {
@@ -1869,6 +1869,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyOnlyBaby = true;
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
@@ -81,7 +81,7 @@ index 578ae5e0fb1810085f13e83cad320fa5325abfff..bd390f5201dd8129213048e7e2fc6b3e
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1885,6 +1886,7 @@ public class PurpurWorldConfig {
@@ -1883,6 +1884,7 @@ public class PurpurWorldConfig {
zombieJockeyOnlyBaby = getBoolean("mobs.zombie.jockey.only-babies", zombieJockeyOnlyBaby);
zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);

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

@@ -58,10 +58,10 @@ index 2b84322a622454c58c6481abbb13031a2e5c488f..8ed02b9737c47a19aa6a38789c19947e
float g = Mth.cos(f) * 0.2F;
float h = -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 bd390f5201dd8129213048e7e2fc6b3e9763934a..4160c8c73a0fe7714a5e4aaff787fd642365aec9 100644
index 60444ab2a15f2e1f2ea0bf291cc3f932c3f1dcdc..658978a0087c15a54259143704ee608d88807250 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -923,10 +923,12 @@ public class PurpurWorldConfig {
@@ -921,10 +921,12 @@ public class PurpurWorldConfig {
public boolean glowSquidRidable = false;
public boolean glowSquidControllable = true;
public double glowSquidMaxHealth = 10.0D;
@@ -74,7 +74,7 @@ index bd390f5201dd8129213048e7e2fc6b3e9763934a..4160c8c73a0fe7714a5e4aaff787fd64
}
public boolean goatRidable = false;
@@ -1558,6 +1560,7 @@ public class PurpurWorldConfig {
@@ -1556,6 +1558,7 @@ public class PurpurWorldConfig {
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
public double squidOffsetWaterCheck = 0.0D;
@@ -82,7 +82,7 @@ index bd390f5201dd8129213048e7e2fc6b3e9763934a..4160c8c73a0fe7714a5e4aaff787fd64
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -1569,6 +1572,7 @@ public class PurpurWorldConfig {
@@ -1567,6 +1570,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);

4
patches/server/0090-Configurable-daylight-cycle.patch
View File

@@ -88,7 +88,7 @@ index 6a010ebf844a37d3dc767e4a828e0a525d66aa9f..613cf0562d2a82e2a7b9bf1d3143e9c4
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 4160c8c73a0fe7714a5e4aaff787fd642365aec9..98c20224bae71c46878a93d7d05de0c650d45dae 100644
index 658978a0087c15a54259143704ee608d88807250..dcb002d0f292c36133293776c4783707028a0a0c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -120,6 +120,13 @@ public class PurpurWorldConfig {
@@ -104,4 +104,4 @@ index 4160c8c73a0fe7714a5e4aaff787fd642365aec9..98c20224bae71c46878a93d7d05de0c6
+
public int elytraDamagePerSecond = 1;
public double elytraDamageMultiplyBySpeed = 0;
public boolean elytraIgnoreUnbreaking = false;
public int elytraDamagePerFireworkBoost = 0;

4
patches/server/0091-Furnace-uses-lava-from-underneath.patch
View File

@@ -39,10 +39,10 @@ index 730aca233f6e7564d4cb85b5b628d23c4f01d2f4..699bdc1f01a95ecdfe899493c8d81ec3
private static boolean canBurn(RegistryAccess registryManager, @Nullable RecipeHolder<?> 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 98c20224bae71c46878a93d7d05de0c650d45dae..47c3cd2dcf3b2afbf30a9a4e89a83a6ad728a614 100644
index dcb002d0f292c36133293776c4783707028a0a0c..cf21fb4a964f3b42061fc5c5ed47af0cb115cd06 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -397,6 +397,17 @@ public class PurpurWorldConfig {
@@ -395,6 +395,17 @@ public class PurpurWorldConfig {
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
}

4
patches/server/0093-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
View File

@@ -24,10 +24,10 @@ index da85fabd75e9bd5ebece7127ef5b512df16fe3ac..dc356bd0931af9bdab9ec71e3de66e88
return;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5f4801b9e8fa7a6e34a818eadac6d59473b7696e..3f4a2f169e8e0437fccc7c6c8d577a84ce50d7b4 100644
index 96080c6cc54495e7f85cbc2a410be0a946adc0f3..c5e81842eb5cd47c7cf33cec54335a31d6d891e9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -398,8 +398,10 @@ public class PurpurWorldConfig {
@@ -396,8 +396,10 @@ public class PurpurWorldConfig {
}
public boolean farmlandGetsMoistFromBelow = false;

96
patches/server/0095-Make-entity-breeding-times-configurable.patch
View File

@@ -538,10 +538,10 @@ index 373bf138f8b77413e6c29724e01572f64e0bc005..d43e26af79be5078124d8013167f452b
public boolean canBeLeashed() {
return true;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae927960f3893d3 100644
index cef828b38e7f312bc55475fad5d2338e2ee04b6e..7891e4e05ca911741e6cc5021c7a757f5917a6d8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -490,20 +490,24 @@ public class PurpurWorldConfig {
@@ -488,20 +488,24 @@ public class PurpurWorldConfig {
public boolean armadilloRidableInWater = true;
public boolean armadilloControllable = true;
public double armadilloMaxHealth = 12.0D;
@@ -566,7 +566,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean batRidable = false;
@@ -543,6 +547,7 @@ public class PurpurWorldConfig {
@@ -541,6 +545,7 @@ public class PurpurWorldConfig {
public boolean beeControllable = true;
public double beeMaxY = 320D;
public double beeMaxHealth = 10.0D;
@@ -574,7 +574,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -554,6 +559,7 @@ public class PurpurWorldConfig {
@@ -552,6 +557,7 @@ public class PurpurWorldConfig {
set("mobs.bee.attributes.max_health", oldValue);
}
beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
@@ -582,7 +582,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean blazeRidable = false;
@@ -592,6 +598,7 @@ public class PurpurWorldConfig {
@@ -590,6 +596,7 @@ public class PurpurWorldConfig {
public double camelJumpStrengthMax = 0.42D;
public double camelMovementSpeedMin = 0.09D;
public double camelMovementSpeedMax = 0.09D;
@@ -590,7 +590,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void camelSettings() {
camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater);
camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin);
@@ -600,6 +607,7 @@ public class PurpurWorldConfig {
@@ -598,6 +605,7 @@ public class PurpurWorldConfig {
camelJumpStrengthMax = getDouble("mobs.camel.attributes.jump_strength.max", camelJumpStrengthMax);
camelMovementSpeedMin = getDouble("mobs.camel.attributes.movement_speed.min", camelMovementSpeedMin);
camelMovementSpeedMax = getDouble("mobs.camel.attributes.movement_speed.max", camelMovementSpeedMax);
@@ -598,7 +598,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean catRidable = false;
@@ -609,6 +617,7 @@ public class PurpurWorldConfig {
@@ -607,6 +615,7 @@ public class PurpurWorldConfig {
public int catSpawnDelay = 1200;
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
@@ -606,7 +606,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -622,6 +631,7 @@ public class PurpurWorldConfig {
@@ -620,6 +629,7 @@ public class PurpurWorldConfig {
catSpawnDelay = getInt("mobs.cat.spawn-delay", catSpawnDelay);
catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange);
catSpawnVillageScanRange = getInt("mobs.cat.scan-range-for-other-cats.village", catSpawnVillageScanRange);
@@ -614,7 +614,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean caveSpiderRidable = false;
@@ -645,6 +655,7 @@ public class PurpurWorldConfig {
@@ -643,6 +653,7 @@ public class PurpurWorldConfig {
public boolean chickenControllable = true;
public double chickenMaxHealth = 4.0D;
public boolean chickenRetaliate = false;
@@ -622,7 +622,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -656,6 +667,7 @@ public class PurpurWorldConfig {
@@ -654,6 +665,7 @@ public class PurpurWorldConfig {
}
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
@@ -630,7 +630,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean codRidable = false;
@@ -677,6 +689,7 @@ public class PurpurWorldConfig {
@@ -675,6 +687,7 @@ public class PurpurWorldConfig {
public boolean cowControllable = true;
public double cowMaxHealth = 10.0D;
public int cowFeedMushrooms = 0;
@@ -638,7 +638,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -688,6 +701,7 @@ public class PurpurWorldConfig {
@@ -686,6 +699,7 @@ public class PurpurWorldConfig {
}
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
@@ -646,7 +646,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean creeperRidable = false;
@@ -739,6 +753,7 @@ public class PurpurWorldConfig {
@@ -737,6 +751,7 @@ public class PurpurWorldConfig {
public double donkeyJumpStrengthMax = 0.5D;
public double donkeyMovementSpeedMin = 0.175D;
public double donkeyMovementSpeedMax = 0.175D;
@@ -654,7 +654,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
if (PurpurConfig.version < 10) {
@@ -754,6 +769,7 @@ public class PurpurWorldConfig {
@@ -752,6 +767,7 @@ public class PurpurWorldConfig {
donkeyJumpStrengthMax = getDouble("mobs.donkey.attributes.jump_strength.max", donkeyJumpStrengthMax);
donkeyMovementSpeedMin = getDouble("mobs.donkey.attributes.movement_speed.min", donkeyMovementSpeedMin);
donkeyMovementSpeedMax = getDouble("mobs.donkey.attributes.movement_speed.max", donkeyMovementSpeedMax);
@@ -662,7 +662,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean drownedRidable = false;
@@ -873,6 +889,7 @@ public class PurpurWorldConfig {
@@ -871,6 +887,7 @@ public class PurpurWorldConfig {
public boolean foxControllable = true;
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
@@ -670,7 +670,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -884,17 +901,20 @@ public class PurpurWorldConfig {
@@ -882,17 +899,20 @@ public class PurpurWorldConfig {
}
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
@@ -691,7 +691,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean ghastRidable = false;
@@ -962,11 +982,13 @@ public class PurpurWorldConfig {
@@ -960,11 +980,13 @@ public class PurpurWorldConfig {
public boolean goatRidableInWater = true;
public boolean goatControllable = true;
public double goatMaxHealth = 10.0D;
@@ -705,7 +705,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean guardianRidable = false;
@@ -987,6 +1009,7 @@ public class PurpurWorldConfig {
@@ -985,6 +1007,7 @@ public class PurpurWorldConfig {
public boolean hoglinRidableInWater = true;
public boolean hoglinControllable = true;
public double hoglinMaxHealth = 40.0D;
@@ -713,7 +713,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void hoglinSettings() {
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
@@ -997,6 +1020,7 @@ public class PurpurWorldConfig {
@@ -995,6 +1018,7 @@ public class PurpurWorldConfig {
set("mobs.hoglin.attributes.max_health", oldValue);
}
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
@@ -721,7 +721,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean horseRidableInWater = false;
@@ -1006,6 +1030,7 @@ public class PurpurWorldConfig {
@@ -1004,6 +1028,7 @@ public class PurpurWorldConfig {
public double horseJumpStrengthMax = 1.0D;
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
@@ -729,7 +729,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1021,6 +1046,7 @@ public class PurpurWorldConfig {
@@ -1019,6 +1044,7 @@ public class PurpurWorldConfig {
horseJumpStrengthMax = getDouble("mobs.horse.attributes.jump_strength.max", horseJumpStrengthMax);
horseMovementSpeedMin = getDouble("mobs.horse.attributes.movement_speed.min", horseMovementSpeedMin);
horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax);
@@ -737,7 +737,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean huskRidable = false;
@@ -1098,6 +1124,7 @@ public class PurpurWorldConfig {
@@ -1096,6 +1122,7 @@ public class PurpurWorldConfig {
public double llamaJumpStrengthMax = 0.5D;
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
@@ -745,7 +745,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1115,6 +1142,7 @@ public class PurpurWorldConfig {
@@ -1113,6 +1140,7 @@ public class PurpurWorldConfig {
llamaJumpStrengthMax = getDouble("mobs.llama.attributes.jump_strength.max", llamaJumpStrengthMax);
llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
@@ -753,7 +753,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean magmaCubeRidable = false;
@@ -1143,6 +1171,7 @@ public class PurpurWorldConfig {
@@ -1141,6 +1169,7 @@ public class PurpurWorldConfig {
public boolean mooshroomRidableInWater = true;
public boolean mooshroomControllable = true;
public double mooshroomMaxHealth = 10.0D;
@@ -761,7 +761,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1153,6 +1182,7 @@ public class PurpurWorldConfig {
@@ -1151,6 +1180,7 @@ public class PurpurWorldConfig {
set("mobs.mooshroom.attributes.max_health", oldValue);
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -769,7 +769,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean muleRidableInWater = false;
@@ -1162,6 +1192,7 @@ public class PurpurWorldConfig {
@@ -1160,6 +1190,7 @@ public class PurpurWorldConfig {
public double muleJumpStrengthMax = 0.5D;
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
@@ -777,7 +777,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1177,12 +1208,14 @@ public class PurpurWorldConfig {
@@ -1175,12 +1206,14 @@ public class PurpurWorldConfig {
muleJumpStrengthMax = getDouble("mobs.mule.attributes.jump_strength.max", muleJumpStrengthMax);
muleMovementSpeedMin = getDouble("mobs.mule.attributes.movement_speed.min", muleMovementSpeedMin);
muleMovementSpeedMax = getDouble("mobs.mule.attributes.movement_speed.max", muleMovementSpeedMax);
@@ -792,7 +792,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1193,12 +1226,14 @@ public class PurpurWorldConfig {
@@ -1191,12 +1224,14 @@ public class PurpurWorldConfig {
set("mobs.ocelot.attributes.max_health", oldValue);
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -807,7 +807,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1209,6 +1244,7 @@ public class PurpurWorldConfig {
@@ -1207,6 +1242,7 @@ public class PurpurWorldConfig {
set("mobs.panda.attributes.max_health", oldValue);
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -815,7 +815,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean parrotRidable = false;
@@ -1292,6 +1328,7 @@ public class PurpurWorldConfig {
@@ -1290,6 +1326,7 @@ public class PurpurWorldConfig {
public boolean pigControllable = true;
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
@@ -823,7 +823,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1303,6 +1340,7 @@ public class PurpurWorldConfig {
@@ -1301,6 +1338,7 @@ public class PurpurWorldConfig {
}
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
@@ -831,7 +831,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean piglinRidable = false;
@@ -1359,6 +1397,7 @@ public class PurpurWorldConfig {
@@ -1357,6 +1395,7 @@ public class PurpurWorldConfig {
public double polarBearMaxHealth = 30.0D;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -839,7 +839,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1372,6 +1411,7 @@ public class PurpurWorldConfig {
@@ -1370,6 +1409,7 @@ public class PurpurWorldConfig {
polarBearBreedableItemString = getString("mobs.polar_bear.breedable-item", polarBearBreedableItemString);
Item item = BuiltInRegistries.ITEM.get(ResourceLocation.parse(polarBearBreedableItemString));
if (item != Items.AIR) polarBearBreedableItem = item;
@@ -847,7 +847,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean pufferfishRidable = false;
@@ -1394,6 +1434,7 @@ public class PurpurWorldConfig {
@@ -1392,6 +1432,7 @@ public class PurpurWorldConfig {
public double rabbitMaxHealth = 3.0D;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -855,7 +855,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1406,6 +1447,7 @@ public class PurpurWorldConfig {
@@ -1404,6 +1445,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);
@@ -863,7 +863,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean ravagerRidable = false;
@@ -1442,6 +1484,7 @@ public class PurpurWorldConfig {
@@ -1440,6 +1482,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = true;
public boolean sheepControllable = true;
public double sheepMaxHealth = 8.0D;
@@ -871,7 +871,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1452,6 +1495,7 @@ public class PurpurWorldConfig {
@@ -1450,6 +1493,7 @@ public class PurpurWorldConfig {
set("mobs.sheep.attributes.max_health", oldValue);
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -879,7 +879,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean shulkerRidable = false;
@@ -1575,11 +1619,13 @@ public class PurpurWorldConfig {
@@ -1573,11 +1617,13 @@ public class PurpurWorldConfig {
public boolean snifferRidableInWater = true;
public boolean snifferControllable = true;
public double snifferMaxHealth = 14.0D;
@@ -893,7 +893,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean squidRidable = false;
@@ -1638,6 +1684,7 @@ public class PurpurWorldConfig {
@@ -1636,6 +1682,7 @@ public class PurpurWorldConfig {
public boolean striderRidableInWater = false;
public boolean striderControllable = true;
public double striderMaxHealth = 20.0D;
@@ -901,7 +901,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1648,6 +1695,7 @@ public class PurpurWorldConfig {
@@ -1646,6 +1693,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -909,7 +909,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean tadpoleRidable = false;
@@ -1668,6 +1716,7 @@ public class PurpurWorldConfig {
@@ -1666,6 +1714,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -917,7 +917,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1685,6 +1734,7 @@ public class PurpurWorldConfig {
@@ -1683,6 +1732,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);
@@ -925,7 +925,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean tropicalFishRidable = false;
@@ -1705,6 +1755,7 @@ public class PurpurWorldConfig {
@@ -1703,6 +1753,7 @@ public class PurpurWorldConfig {
public boolean turtleRidableInWater = true;
public boolean turtleControllable = true;
public double turtleMaxHealth = 30.0D;
@@ -933,7 +933,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void turtleSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1715,6 +1766,7 @@ public class PurpurWorldConfig {
@@ -1713,6 +1764,7 @@ public class PurpurWorldConfig {
set("mobs.turtle.attributes.max_health", oldValue);
}
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
@@ -941,7 +941,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean vexRidable = false;
@@ -1742,6 +1794,7 @@ public class PurpurWorldConfig {
@@ -1740,6 +1792,7 @@ public class PurpurWorldConfig {
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
public boolean villagerCanBreed = true;
@@ -949,7 +949,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1755,6 +1808,7 @@ public class PurpurWorldConfig {
@@ -1753,6 +1806,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);
@@ -957,7 +957,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
}
public boolean vindicatorRidable = false;
@@ -1866,6 +1920,7 @@ public class PurpurWorldConfig {
@@ -1864,6 +1918,7 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = true;
public boolean wolfControllable = true;
public double wolfMaxHealth = 8.0D;
@@ -965,7 +965,7 @@ index 5009e08e818e69b814e67a40bdc129f3ec64c183..3067e5b0704fe2018fbb846fdae92796
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1876,6 +1931,7 @@ public class PurpurWorldConfig {
@@ -1874,6 +1929,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

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

@@ -21,10 +21,10 @@ index 8604db61d2c8042d0399262cb60b98457e4f894c..ada2403856aeb7cb50c0b00fb1dad18b
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 8e963e38b1e1f070877082fcefc2ebd0ffcda7da..58e1d5c4164cbf57cfc23af354308586d5441a73 100644
index 05107bdd7b8c28d413287166c9b764e1ff3b9f10..9aa3b20d592a20eb4ba6e3b51847464a4b455fcb 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -845,6 +845,7 @@ public class PurpurWorldConfig {
@@ -843,6 +843,7 @@ public class PurpurWorldConfig {
public boolean endermanControllable = true;
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
@@ -32,7 +32,7 @@ index 8e963e38b1e1f070877082fcefc2ebd0ffcda7da..58e1d5c4164cbf57cfc23af354308586
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -856,6 +857,7 @@ public class PurpurWorldConfig {
@@ -854,6 +855,7 @@ public class PurpurWorldConfig {
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);

4
patches/server/0099-Add-configurable-snowball-damage.patch
View File

@@ -18,10 +18,10 @@ index 2b4d206c0d31ba38d7b2af654bd420e85145d441..f59a2903bfb8ae591a638ea5bb387caa
entity.hurt(this.damageSources().thrown(this, this.getOwner()), (float) i);
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 58e1d5c4164cbf57cfc23af354308586d5441a73..3dd9b621ee3d0b090510824de9e9882fe9cfc352 100644
index 9aa3b20d592a20eb4ba6e3b51847464a4b455fcb..a455d0cfbcb26dfa5f664a81b8cff5b01c8555bf 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -370,6 +370,11 @@ public class PurpurWorldConfig {
@@ -368,6 +368,11 @@ public class PurpurWorldConfig {
//}
}

4
patches/server/0100-Changeable-Mob-Left-Handed-Chance.patch
View File

@@ -18,10 +18,10 @@ index 149d272775783aab243f0707ee11f702b35fa075..8103f13155ad66bbd077a38ae4697ad1
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3dd9b621ee3d0b090510824de9e9882fe9cfc352..c17a99a7f700d996dfcd81e47f1981726843f509 100644
index a455d0cfbcb26dfa5f664a81b8cff5b01c8555bf..272fbbc7b11c73ea38b80e9ee35c92c474dc161b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -154,8 +154,10 @@ public class PurpurWorldConfig {
@@ -152,8 +152,10 @@ public class PurpurWorldConfig {
}
public int entityLifeSpan = 0;

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

@@ -23,10 +23,10 @@ index 0060414b1d5afde56372ce121e9d37a1668cd03b..ee4d4a4fe314ee9bce69c96dd65d84ed
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 9796cc9969840e92a3376f0ceef58e297e2b4f8e..3f9ff605b9b7260fa3837624ac2c87d631a96031 100644
index 31aeaac5010b862f69dec712a491a8007e2dfd2d..e6ab055185074eb8829681163079304c6b1681f5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1618,6 +1618,10 @@ public class PurpurWorldConfig {
@@ -1616,6 +1616,10 @@ public class PurpurWorldConfig {
public boolean snowGolemLeaveTrailWhenRidden = false;
public double snowGolemMaxHealth = 4.0D;
public boolean snowGolemPutPumpkinBack = false;
@@ -37,7 +37,7 @@ index 9796cc9969840e92a3376f0ceef58e297e2b4f8e..3f9ff605b9b7260fa3837624ac2c87d6
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1630,6 +1634,10 @@ public class PurpurWorldConfig {
@@ -1628,6 +1632,10 @@ public class PurpurWorldConfig {
}
snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);
snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);

6
patches/server/0104-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
View File

@@ -174,10 +174,10 @@ index 8734ab1bd8299bbf43906d81a349c2a13e0981a7..3ca83269311cbc18c9ef3ce62cff6a2d
"farmer",
PoiTypes.FARMER,
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3f9ff605b9b7260fa3837624ac2c87d631a96031..f73ef11133266e5f5a87a5df469ae4fb3bb6af37 100644
index e6ab055185074eb8829681163079304c6b1681f5..454ccd0a9aebb9b6f20515fa8dda4656ec767035 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1820,6 +1820,8 @@ public class PurpurWorldConfig {
@@ -1818,6 +1818,8 @@ public class PurpurWorldConfig {
public boolean villagerCanBeLeashed = false;
public boolean villagerCanBreed = true;
public int villagerBreedingTicks = 6000;
@@ -186,7 +186,7 @@ index 3f9ff605b9b7260fa3837624ac2c87d631a96031..f73ef11133266e5f5a87a5df469ae4fb
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1834,6 +1836,8 @@ public class PurpurWorldConfig {
@@ -1832,6 +1834,8 @@ public class PurpurWorldConfig {
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks);

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

@@ -35,10 +35,10 @@ index 0dcf5638e12c7670e6a5e577210e2542de1fd38b..47419219d4f435a17344361f4a60d5aa
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f73ef11133266e5f5a87a5df469ae4fb3bb6af37..6c31c3c85ece5e90da951069336bdb9a58d2d39b 100644
index 454ccd0a9aebb9b6f20515fa8dda4656ec767035..d7fe88655b6546d04e8dc08ae72f6108a57e58ac 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2066,6 +2066,7 @@ public class PurpurWorldConfig {
@@ -2064,6 +2064,7 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinJockeyOnlyBaby = true;
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
@@ -46,7 +46,7 @@ index f73ef11133266e5f5a87a5df469ae4fb3bb6af37..6c31c3c85ece5e90da951069336bdb9a
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -2080,5 +2081,6 @@ public class PurpurWorldConfig {
@@ -2078,5 +2079,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/0106-Configurable-chance-for-wolves-to-spawn-rabid.patch
View File

@@ -182,10 +182,10 @@ index 86574da257731de7646a712ed73384955fe35aa3..e223234dd64b0e41441c3b9f649f0b64
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 6c31c3c85ece5e90da951069336bdb9a58d2d39b..ae2f7dcf51d9d6d357fff4de6e6dc63dd262afd8 100644
index d7fe88655b6546d04e8dc08ae72f6108a57e58ac..184521c910d514db613bca0e2f25ba89aae4e4bd 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1949,6 +1949,8 @@ public class PurpurWorldConfig {
@@ -1947,6 +1947,8 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = true;
public boolean wolfControllable = true;
public double wolfMaxHealth = 8.0D;
@@ -194,7 +194,7 @@ index 6c31c3c85ece5e90da951069336bdb9a58d2d39b..ae2f7dcf51d9d6d357fff4de6e6dc63d
public int wolfBreedingTicks = 6000;
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
@@ -1960,6 +1962,8 @@ public class PurpurWorldConfig {
@@ -1958,6 +1960,8 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

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

@@ -43,10 +43,10 @@ index 04d7e4bc6cc1deda5f53f6ae5f46d2402e0d0c10..5dd146d318851ce581a0d7841bd87ae9
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 ae2f7dcf51d9d6d357fff4de6e6dc63dd262afd8..c74c86def59daa2c940c64b19ccc1c3cde5d36f4 100644
index 184521c910d514db613bca0e2f25ba89aae4e4bd..15bc020c51b23afaf1aedc685231f069933f7e1b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -633,6 +633,7 @@ public class PurpurWorldConfig {
@@ -631,6 +631,7 @@ public class PurpurWorldConfig {
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
public int catBreedingTicks = 6000;
@@ -54,7 +54,7 @@ index ae2f7dcf51d9d6d357fff4de6e6dc63dd262afd8..c74c86def59daa2c940c64b19ccc1c3c
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -647,6 +648,11 @@ public class PurpurWorldConfig {
@@ -645,6 +646,11 @@ public class PurpurWorldConfig {
catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange);
catSpawnVillageScanRange = getInt("mobs.cat.scan-range-for-other-cats.village", catSpawnVillageScanRange);
catBreedingTicks = getInt("mobs.cat.breeding-delay-ticks", catBreedingTicks);
@@ -66,7 +66,7 @@ index ae2f7dcf51d9d6d357fff4de6e6dc63dd262afd8..c74c86def59daa2c940c64b19ccc1c3c
}
public boolean caveSpiderRidable = false;
@@ -1949,6 +1955,7 @@ public class PurpurWorldConfig {
@@ -1947,6 +1953,7 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = true;
public boolean wolfControllable = true;
public double wolfMaxHealth = 8.0D;
@@ -74,7 +74,7 @@ index ae2f7dcf51d9d6d357fff4de6e6dc63dd262afd8..c74c86def59daa2c940c64b19ccc1c3c
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -1962,6 +1969,11 @@ public class PurpurWorldConfig {
@@ -1960,6 +1967,11 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

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

@@ -17,10 +17,10 @@ index 8f221fe016ea7221eb3a2116a2213139cf961797..88725e6f8c6490253e110485f5a62e9d
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c74c86def59daa2c940c64b19ccc1c3cde5d36f4..0cdd2837b85fd975d68c8fc035eba82e52ce4ddf 100644
index 15bc020c51b23afaf1aedc685231f069933f7e1b..ab5cb0ccb086d8dddfbfe585e4ecca7360420c89 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1311,6 +1311,7 @@ public class PurpurWorldConfig {
@@ -1309,6 +1309,7 @@ public class PurpurWorldConfig {
public int phantomBurnInLight = 0;
public boolean phantomIgnorePlayersWithTorch = false;
public boolean phantomBurnInDaylight = true;
@@ -28,7 +28,7 @@ index c74c86def59daa2c940c64b19ccc1c3cde5d36f4..0cdd2837b85fd975d68c8fc035eba82e
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1344,6 +1345,7 @@ public class PurpurWorldConfig {
@@ -1342,6 +1343,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);

4
patches/server/0109-Option-for-chests-to-open-even-with-a-solid-block-on.patch
View File

@@ -17,10 +17,10 @@ index 8fbfd18b3caeed769396b3ffb1b1778b2f38edc0..dbfe8f5d4df244cb694b73ea8763628c
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 0cdd2837b85fd975d68c8fc035eba82e52ce4ddf..909fa6725bd387414218f0612ac2da52b0f4e765 100644
index ab5cb0ccb086d8dddfbfe585e4ecca7360420c89..6f0ec1857cc88acc0de63ad8ed07695ad6116182 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -407,6 +407,11 @@ public class PurpurWorldConfig {
@@ -405,6 +405,11 @@ public class PurpurWorldConfig {
}
}

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

@@ -29,10 +29,10 @@ index 0a297368678cafb92eb0374d1d410271c0d10033..13d40773ff8272ca081e852d4ae3dc09
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 909fa6725bd387414218f0612ac2da52b0f4e765..c4302416ca765a5387766ed7f508c750e68af074 100644
index 6f0ec1857cc88acc0de63ad8ed07695ad6116182..77c93c43575e4578b6638823bab71fce8da1c628 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1723,6 +1723,7 @@ public class PurpurWorldConfig {
@@ -1721,6 +1721,7 @@ public class PurpurWorldConfig {
public boolean striderControllable = true;
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
@@ -40,7 +40,7 @@ index 909fa6725bd387414218f0612ac2da52b0f4e765..c4302416ca765a5387766ed7f508c750
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1734,6 +1735,7 @@ public class PurpurWorldConfig {
@@ -1732,6 +1733,7 @@ public class PurpurWorldConfig {
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);

4
patches/server/0113-Full-netherite-armor-grants-fire-resistance.patch
View File

@@ -26,10 +26,10 @@ index 025309a47e9683ec29cd94f997663b7faec1acb4..2dafba96353c208b89da7b65c0d56a51
protected ItemCooldowns createItemCooldowns() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c4302416ca765a5387766ed7f508c750e68af074..cd321796cf555647ebece5bdcf2f1efe1fcde35f 100644
index 77c93c43575e4578b6638823bab71fce8da1c628..15b79e86bc58b7cbc916d9b48887e015eef58928 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -282,6 +282,19 @@ public class PurpurWorldConfig {
@@ -280,6 +280,19 @@ public class PurpurWorldConfig {
villageSiegeSpawning = getBoolean("gameplay-mechanics.mob-spawning.village-sieges", predicate);
}

70
patches/server/0114-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 7fa56c1bb7ba6a535a486cd452358b6d2dc59d9b..897e9da03a4e1cc0cac5da542c9e695f49ae60e4 100644
index 62bf75a8adbe267663b88c2709d042c4b473907c..fc560ddef3542f9bf566917c3af9072857f1bd04 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1808,7 +1808,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -18,7 +18,7 @@ index 7fa56c1bb7ba6a535a486cd452358b6d2dc59d9b..897e9da03a4e1cc0cac5da542c9e695f
BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 694aaaf1c07e63e8e95831d0c8daa0dde0cf9634..1186bdd1f49fd5bef712912e816b151adb1326cf 100644
index 8103f13155ad66bbd077a38ae4697ad14036b6a5..8b2dd71177b011c2a31e4959ca16057ad5288b22 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -707,7 +707,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -375,7 +375,7 @@ index c7377d04ceac3ea624117439783a443c6d6f6d08..0c732cfbd9ce50198a3f85ae8ef2263d
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce96b1d36a1 100644
index 15b79e86bc58b7cbc916d9b48887e015eef58928..a4bc71a9986a2ca6c05d0b50f24661526151958b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -114,8 +114,11 @@ public class PurpurWorldConfig {
@@ -402,7 +402,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
@@ -432,9 +438,11 @@ public class PurpurWorldConfig {
@@ -430,9 +436,11 @@ public class PurpurWorldConfig {
dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
}
@@ -414,7 +414,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
farmlandAlpha = getBoolean("blocks.farmland.use-alpha-farmland", farmlandAlpha);
}
@@ -459,6 +467,11 @@ public class PurpurWorldConfig {
@@ -457,6 +465,11 @@ public class PurpurWorldConfig {
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
}
@@ -426,7 +426,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
public boolean respawnAnchorExplode = true;
public double respawnAnchorExplosionPower = 5.0D;
public boolean respawnAnchorExplosionFire = true;
@@ -488,10 +501,12 @@ public class PurpurWorldConfig {
@@ -486,10 +499,12 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromExpOrbs = false;
public boolean turtleEggsBreakFromItems = false;
public boolean turtleEggsBreakFromMinecarts = false;
@@ -439,7 +439,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
}
public int waterInfiniteRequiredSources = 2;
@@ -749,6 +764,7 @@ public class PurpurWorldConfig {
@@ -747,6 +762,7 @@ public class PurpurWorldConfig {
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
public boolean creeperAllowGriefing = true;
@@ -447,7 +447,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -761,6 +777,7 @@ public class PurpurWorldConfig {
@@ -759,6 +775,7 @@ public class PurpurWorldConfig {
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
@@ -455,7 +455,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
}
public boolean dolphinRidable = false;
@@ -855,6 +872,7 @@ public class PurpurWorldConfig {
@@ -853,6 +870,7 @@ public class PurpurWorldConfig {
public double enderDragonMaxY = 320D;
public double enderDragonMaxHealth = 200.0D;
public boolean enderDragonAlwaysDropsFullExp = false;
@@ -463,7 +463,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -871,6 +889,7 @@ public class PurpurWorldConfig {
@@ -869,6 +887,7 @@ public class PurpurWorldConfig {
}
enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
@@ -471,7 +471,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
}
public boolean endermanRidable = false;
@@ -879,6 +898,7 @@ public class PurpurWorldConfig {
@@ -877,6 +896,7 @@ public class PurpurWorldConfig {
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
@@ -479,7 +479,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -891,6 +911,7 @@ public class PurpurWorldConfig {
@@ -889,6 +909,7 @@ public class PurpurWorldConfig {
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
@@ -487,7 +487,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
}
public boolean endermiteRidable = false;
@@ -913,6 +934,7 @@ public class PurpurWorldConfig {
@@ -911,6 +932,7 @@ public class PurpurWorldConfig {
public boolean evokerRidableInWater = true;
public boolean evokerControllable = true;
public double evokerMaxHealth = 24.0D;
@@ -495,7 +495,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
private void evokerSettings() {
evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
@@ -923,6 +945,7 @@ public class PurpurWorldConfig {
@@ -921,6 +943,7 @@ public class PurpurWorldConfig {
set("mobs.evoker.attributes.max_health", oldValue);
}
evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
@@ -503,7 +503,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
}
public boolean foxRidable = false;
@@ -931,6 +954,7 @@ public class PurpurWorldConfig {
@@ -929,6 +952,7 @@ public class PurpurWorldConfig {
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
public int foxBreedingTicks = 6000;
@@ -511,7 +511,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -943,6 +967,7 @@ public class PurpurWorldConfig {
@@ -941,6 +965,7 @@ public class PurpurWorldConfig {
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks);
@@ -519,7 +519,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
}
public boolean frogRidable = false;
@@ -1390,6 +1415,7 @@ public class PurpurWorldConfig {
@@ -1388,6 +1413,7 @@ public class PurpurWorldConfig {
public boolean piglinRidableInWater = true;
public boolean piglinControllable = true;
public double piglinMaxHealth = 16.0D;
@@ -527,7 +527,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1400,6 +1426,7 @@ public class PurpurWorldConfig {
@@ -1398,6 +1424,7 @@ public class PurpurWorldConfig {
set("mobs.piglin.attributes.max_health", oldValue);
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -535,7 +535,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
}
public boolean piglinBruteRidable = false;
@@ -1422,6 +1449,7 @@ public class PurpurWorldConfig {
@@ -1420,6 +1447,7 @@ public class PurpurWorldConfig {
public boolean pillagerRidableInWater = true;
public boolean pillagerControllable = true;
public double pillagerMaxHealth = 24.0D;
@@ -543,7 +543,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1432,6 +1460,7 @@ public class PurpurWorldConfig {
@@ -1430,6 +1458,7 @@ public class PurpurWorldConfig {
set("mobs.pillager.attributes.max_health", oldValue);
}
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -551,7 +551,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
}
public boolean polarBearRidable = false;
@@ -1478,6 +1507,7 @@ public class PurpurWorldConfig {
@@ -1476,6 +1505,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -559,7 +559,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1491,12 +1521,14 @@ public class PurpurWorldConfig {
@@ -1489,12 +1519,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);
@@ -574,7 +574,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1507,6 +1539,7 @@ public class PurpurWorldConfig {
@@ -1505,6 +1537,7 @@ public class PurpurWorldConfig {
set("mobs.ravager.attributes.max_health", oldValue);
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -582,7 +582,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
}
public boolean salmonRidable = false;
@@ -1528,6 +1561,7 @@ public class PurpurWorldConfig {
@@ -1526,6 +1559,7 @@ public class PurpurWorldConfig {
public boolean sheepControllable = true;
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
@@ -590,7 +590,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1539,6 +1573,7 @@ public class PurpurWorldConfig {
@@ -1537,6 +1571,7 @@ public class PurpurWorldConfig {
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
@@ -598,7 +598,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
}
public boolean shulkerRidable = false;
@@ -1561,6 +1596,7 @@ public class PurpurWorldConfig {
@@ -1559,6 +1594,7 @@ public class PurpurWorldConfig {
public boolean silverfishRidableInWater = true;
public boolean silverfishControllable = true;
public double silverfishMaxHealth = 8.0D;
@@ -606,7 +606,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1571,6 +1607,7 @@ public class PurpurWorldConfig {
@@ -1569,6 +1605,7 @@ public class PurpurWorldConfig {
set("mobs.silverfish.attributes.max_health", oldValue);
}
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -614,7 +614,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
}
public boolean skeletonRidable = false;
@@ -1648,6 +1685,7 @@ public class PurpurWorldConfig {
@@ -1646,6 +1683,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -622,7 +622,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1664,6 +1702,7 @@ public class PurpurWorldConfig {
@@ -1662,6 +1700,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);
@@ -630,7 +630,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
}
public boolean snifferRidable = false;
@@ -1850,6 +1889,7 @@ public class PurpurWorldConfig {
@@ -1848,6 +1887,7 @@ public class PurpurWorldConfig {
public int villagerBreedingTicks = 6000;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -638,7 +638,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1866,6 +1906,7 @@ public class PurpurWorldConfig {
@@ -1864,6 +1904,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);
@@ -646,7 +646,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
}
public boolean vindicatorRidable = false;
@@ -1938,6 +1979,7 @@ public class PurpurWorldConfig {
@@ -1936,6 +1977,7 @@ public class PurpurWorldConfig {
public double witherMaxHealth = 300.0D;
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
@@ -654,7 +654,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1955,6 +1997,7 @@ public class PurpurWorldConfig {
@@ -1953,6 +1995,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);
@@ -662,7 +662,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
}
public boolean witherSkeletonRidable = false;
@@ -2026,6 +2069,7 @@ public class PurpurWorldConfig {
@@ -2024,6 +2067,7 @@ public class PurpurWorldConfig {
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -670,7 +670,7 @@ index cd321796cf555647ebece5bdcf2f1efe1fcde35f..866e2f625472c6dac1305b84b3cb8ce9
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2041,6 +2085,7 @@ public class PurpurWorldConfig {
@@ -2039,6 +2083,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);

4
patches/server/0116-Farmland-trampling-changes.patch
View File

@@ -37,10 +37,10 @@ index 99798220b6e0ad06db2ba5c9b74bfb72af185fee..12a0c69f8fec30fad64cbb00af2ca1bb
if (!CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState())) {
return;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index dbcc1ba3b0fe58cc8b78b57c71bdde23163c0aef..87945b9d75d95ad18ac28f459d4a57dd0c8fbe99 100644
index 9ce8392b1140d7300335d87e106b2643abbc8797..9789835b47df82bc55f429aa3ac481bbc75c198c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -443,10 +443,16 @@ public class PurpurWorldConfig {
@@ -441,10 +441,16 @@ public class PurpurWorldConfig {
public boolean farmlandBypassMobGriefing = false;
public boolean farmlandGetsMoistFromBelow = false;
public boolean farmlandAlpha = false;

8
patches/server/0118-Fix-stuck-in-portals.patch
View File

@@ -17,7 +17,7 @@ index c23fed2780098e87dd74e7d4cb099678d3bd989a..dbfc8585340c8ddb8c706773b02346ca
this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
this.connection.resetPosition();
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 020f42105e2fd04b109932dbd04d4d3d0274e2c9..23ffd93138490ff591deaf3a28416a401e04eee6 100644
index 295acb77be8a2219e1f6cfe6e215695d763cfbd9..3e9bb7916e6440b3831871e2b8bcffbfc9172562 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3103,13 +3103,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -38,10 +38,10 @@ index 020f42105e2fd04b109932dbd04d4d3d0274e2c9..23ffd93138490ff591deaf3a28416a40
this.portalProcess = new PortalProcessor(portal, pos.immutable());
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 8d3b7626e5f60eb3356bc8b9dead1b72b15e441b..a4965866cc687a04cf12dbcf9f6ceff8218c0dee 100644
index 026e34b409c67f30931cf2ec37ad3e4e948e7702..ff95bb88a394821018c3be3638a0da9c5ebaa35f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -318,6 +318,7 @@ public class PurpurWorldConfig {
@@ -316,6 +316,7 @@ public class PurpurWorldConfig {
public int playerDeathExpDropMax = 100;
public boolean teleportIfOutsideBorder = false;
public boolean totemOfUndyingWorksInInventory = false;
@@ -49,7 +49,7 @@ index 8d3b7626e5f60eb3356bc8b9dead1b72b15e441b..a4965866cc687a04cf12dbcf9f6ceff8
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -333,6 +334,7 @@ public class PurpurWorldConfig {
@@ -331,6 +332,7 @@ public class PurpurWorldConfig {
playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);

256
patches/server/0119-Toggle-for-water-sensitive-mob-damage.patch
View File

File diff suppressed because it is too large Load Diff

4
patches/server/0121-End-crystal-explosion-options.patch
View File

@@ -53,10 +53,10 @@ index 72122333cf0247e4a8511ac633487f170b89586c..02f1d0418395b100cabfad7294466aaa
this.remove(Entity.RemovalReason.KILLED, EntityRemoveEvent.Cause.DEATH); // CraftBukkit - add Bukkit remove cause
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 1aeaa84d66221ce560fea71bbc39f7d9a9587711..3fce04a57938c6a3505f4c492e103217e00b54f9 100644
index 904c7d1c4ab545c0dc18d7fbd3902dde4820497f..51a164f0f5075240b3fe266fc378c7c4ff57b2ab 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -450,6 +450,43 @@ public class PurpurWorldConfig {
@@ -448,6 +448,43 @@ public class PurpurWorldConfig {
dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
}

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

@@ -29,10 +29,10 @@ index 73d5027234cca5a9d0dfd60f455fe67ba5174558..ab0ed16663ac72924d2a4f139705e551
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3fce04a57938c6a3505f4c492e103217e00b54f9..63e1f40e9aba0b5e1f1cfeea9566cf9fd64b113b 100644
index 51a164f0f5075240b3fe266fc378c7c4ff57b2ab..e9e59acd426d0fc756b2d9307ea984f0cb4abce0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -957,6 +957,7 @@ public class PurpurWorldConfig {
@@ -955,6 +955,7 @@ public class PurpurWorldConfig {
public boolean enderDragonAlwaysDropsFullExp = false;
public boolean enderDragonBypassMobGriefing = false;
public boolean enderDragonTakeDamageFromWater = false;
@@ -40,7 +40,7 @@ index 3fce04a57938c6a3505f4c492e103217e00b54f9..63e1f40e9aba0b5e1f1cfeea9566cf9f
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -975,6 +976,7 @@ public class PurpurWorldConfig {
@@ -973,6 +974,7 @@ public class PurpurWorldConfig {
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
enderDragonBypassMobGriefing = getBoolean("mobs.ender_dragon.bypass-mob-griefing", enderDragonBypassMobGriefing);
enderDragonTakeDamageFromWater = getBoolean("mobs.ender_dragon.takes-damage-from-water", enderDragonTakeDamageFromWater);
@@ -48,7 +48,7 @@ index 3fce04a57938c6a3505f4c492e103217e00b54f9..63e1f40e9aba0b5e1f1cfeea9566cf9f
}
public boolean endermanRidable = false;
@@ -2166,6 +2168,7 @@ public class PurpurWorldConfig {
@@ -2164,6 +2166,7 @@ public class PurpurWorldConfig {
public int witherHealthRegenDelay = 20;
public boolean witherBypassMobGriefing = false;
public boolean witherTakeDamageFromWater = false;
@@ -56,7 +56,7 @@ index 3fce04a57938c6a3505f4c492e103217e00b54f9..63e1f40e9aba0b5e1f1cfeea9566cf9f
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2185,6 +2188,7 @@ public class PurpurWorldConfig {
@@ -2183,6 +2186,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);

8
patches/server/0123-Dont-run-with-scissors.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Dont run with scissors!
inspired by https://modrinth.com/mod/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 010c03f9ec0b5fca563ce62bbb785af9cc28fad2..22979d8531fd9732b1fd5eaf76aec52b22fdf6bb 100644
index aba962f4e706f2698f3729a304816965d788d7e3..e81820761689801c3ca267c500818ff0f48bb858 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1610,6 +1610,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -149,10 +149,10 @@ index f9d5718193f4b886a118d5a8b9191a3a4469d6d8..3c1b41f0ae58669d6fae640e8763c43e
public static String serverModName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 63e1f40e9aba0b5e1f1cfeea9566cf9fd64b113b..a0e613d5e99eafb1f79d0ca493d8d67f9d086d71 100644
index e9e59acd426d0fc756b2d9307ea984f0cb4abce0..7ace30d634600be4e2a71dce12645db48b22e67d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -182,6 +182,10 @@ public class PurpurWorldConfig {
@@ -180,6 +180,10 @@ public class PurpurWorldConfig {
public List<Item> itemImmuneToExplosion = new ArrayList<>();
public List<Item> itemImmuneToFire = new ArrayList<>();
public List<Item> itemImmuneToLightning = new ArrayList<>();
@@ -163,7 +163,7 @@ index 63e1f40e9aba0b5e1f1cfeea9566cf9fd64b113b..a0e613d5e99eafb1f79d0ca493d8d67f
private void itemSettings() {
itemImmuneToCactus.clear();
getList("gameplay-mechanics.item.immune.cactus", new ArrayList<>()).forEach(key -> {
@@ -219,6 +223,10 @@ public class PurpurWorldConfig {
@@ -217,6 +221,10 @@ public class PurpurWorldConfig {
Item item = BuiltInRegistries.ITEM.get(ResourceLocation.parse(key.toString()));
if (item != Items.AIR) itemImmuneToLightning.add(item);
});

8
patches/server/0124-One-Punch-Man.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] One Punch Man!
inspired by https://modrinth.com/mod/creative-one-punch
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 897e9da03a4e1cc0cac5da542c9e695f49ae60e4..583e0cfc3478df74188526a10494d81ba4303054 100644
index fc560ddef3542f9bf566917c3af9072857f1bd04..d76e8cf2a2d48548b0ad33c78dbf435b61bf91c4 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1428,6 +1428,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -35,10 +35,10 @@ index 897e9da03a4e1cc0cac5da542c9e695f49ae60e4..583e0cfc3478df74188526a10494d81b
float f1 = amount;
boolean flag = amount > 0.0F && this.isDamageSourceBlocked(source); // Copied from below
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a0e613d5e99eafb1f79d0ca493d8d67f9d086d71..0d6e782d65f8b927776231b59dd3f05bf94ab153 100644
index 7ace30d634600be4e2a71dce12645db48b22e67d..74829c202ab6c44da26d025635e6a429777ab69c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -329,6 +329,7 @@ public class PurpurWorldConfig {
@@ -327,6 +327,7 @@ public class PurpurWorldConfig {
public boolean teleportIfOutsideBorder = false;
public boolean totemOfUndyingWorksInInventory = false;
public boolean playerFixStuckPortal = false;
@@ -46,7 +46,7 @@ index a0e613d5e99eafb1f79d0ca493d8d67f9d086d71..0d6e782d65f8b927776231b59dd3f05b
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -345,6 +346,7 @@ public class PurpurWorldConfig {
@@ -343,6 +344,7 @@ public class PurpurWorldConfig {
teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
playerFixStuckPortal = getBoolean("gameplay-mechanics.player.fix-stuck-in-portal", playerFixStuckPortal);

6
patches/server/0125-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
View File

@@ -43,10 +43,10 @@ index 20a91d798d31a71b3c05efa2cc5bda55494e26cc..fc62754f93bd11a10c28b8b7b116e9ff
// Paper end - PlayerLaunchProjectileEvent
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 0d6e782d65f8b927776231b59dd3f05bf94ab153..51dafefe5fa9d89ec61c355beb66e78ead64ca6d 100644
index 74829c202ab6c44da26d025635e6a429777ab69c..11ab08b642af112452d6afc0b2ad7f61e5380420 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -186,6 +186,10 @@ public class PurpurWorldConfig {
@@ -184,6 +184,10 @@ public class PurpurWorldConfig {
public boolean ignoreScissorsInWater = false;
public boolean ignoreScissorsInLava = false;
public double scissorsRunningDamage = 1D;
@@ -57,7 +57,7 @@ index 0d6e782d65f8b927776231b59dd3f05bf94ab153..51dafefe5fa9d89ec61c355beb66e78e
private void itemSettings() {
itemImmuneToCactus.clear();
getList("gameplay-mechanics.item.immune.cactus", new ArrayList<>()).forEach(key -> {
@@ -227,6 +231,10 @@ public class PurpurWorldConfig {
@@ -225,6 +229,10 @@ public class PurpurWorldConfig {
ignoreScissorsInWater = getBoolean("gameplay-mechanics.item.shears.ignore-in-water", ignoreScissorsInWater);
ignoreScissorsInLava = getBoolean("gameplay-mechanics.item.shears.ignore-in-lava", ignoreScissorsInLava);
scissorsRunningDamage = getDouble("gameplay-mechanics.item.shears.sprinting-damage", scissorsRunningDamage);

6
patches/server/0126-Config-to-ignore-nearby-mobs-when-sleeping.patch
View File

@@ -18,10 +18,10 @@ index dbfc8585340c8ddb8c706773b02346ca97663e3b..8bb9692f37f2f0cfa7964963aacbc57b
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 51dafefe5fa9d89ec61c355beb66e78ead64ca6d..12048de4a283835d887a8b5a27aa1d3a99248b2e 100644
index 11ab08b642af112452d6afc0b2ad7f61e5380420..d3af2b98c3aa8daca20f4b39ae90d867f0708de8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -338,6 +338,7 @@ public class PurpurWorldConfig {
@@ -336,6 +336,7 @@ public class PurpurWorldConfig {
public boolean totemOfUndyingWorksInInventory = false;
public boolean playerFixStuckPortal = false;
public boolean creativeOnePunch = false;
@@ -29,7 +29,7 @@ index 51dafefe5fa9d89ec61c355beb66e78ead64ca6d..12048de4a283835d887a8b5a27aa1d3a
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -355,6 +356,7 @@ public class PurpurWorldConfig {
@@ -353,6 +354,7 @@ public class PurpurWorldConfig {
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
playerFixStuckPortal = getBoolean("gameplay-mechanics.player.fix-stuck-in-portal", playerFixStuckPortal);
creativeOnePunch = getBoolean("gameplay-mechanics.player.one-punch-in-creative", creativeOnePunch);

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

@@ -18,10 +18,10 @@ index 75d462d7f55dedfa62844549fa6690a4a652bd1f..cc9da5134ece550e8a1902e90282090f
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 12048de4a283835d887a8b5a27aa1d3a99248b2e..c112dab4f1a56d8108a218106b399b462209cd5a 100644
index d3af2b98c3aa8daca20f4b39ae90d867f0708de8..1d35264437b77bc3d7467743b760f8ee4cb53588 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1007,6 +1007,8 @@ public class PurpurWorldConfig {
@@ -1005,6 +1005,8 @@ public class PurpurWorldConfig {
public boolean endermanDespawnEvenWithBlock = false;
public boolean endermanBypassMobGriefing = false;
public boolean endermanTakeDamageFromWater = true;
@@ -30,7 +30,7 @@ index 12048de4a283835d887a8b5a27aa1d3a99248b2e..c112dab4f1a56d8108a218106b399b46
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -1016,11 +1018,17 @@ public class PurpurWorldConfig {
@@ -1014,11 +1016,17 @@ public class PurpurWorldConfig {
set("mobs.enderman.attributes.max-health", null);
set("mobs.enderman.attributes.max_health", oldValue);
}

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

@@ -20,10 +20,10 @@ index cc9da5134ece550e8a1902e90282090f05818fd8..f2e21c9d3cefb635c4eb583ac9355b46
} else {
Vec3 vec3d = player.getViewVector(1.0F).normalize();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c112dab4f1a56d8108a218106b399b462209cd5a..23762b5df538e8e2b042495e20381a94dd910cc0 100644
index 1d35264437b77bc3d7467743b760f8ee4cb53588..a2db9a7eabbc660368cc50d7c1f216df444f3b93 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1009,6 +1009,8 @@ public class PurpurWorldConfig {
@@ -1007,6 +1007,8 @@ public class PurpurWorldConfig {
public boolean endermanTakeDamageFromWater = true;
public boolean endermanAggroEndermites = true;
public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
@@ -32,7 +32,7 @@ index c112dab4f1a56d8108a218106b399b462209cd5a..23762b5df538e8e2b042495e20381a94
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -1029,6 +1031,8 @@ public class PurpurWorldConfig {
@@ -1027,6 +1029,8 @@ public class PurpurWorldConfig {
endermanTakeDamageFromWater = getBoolean("mobs.enderman.takes-damage-from-water", endermanTakeDamageFromWater);
endermanAggroEndermites = getBoolean("mobs.enderman.aggressive-towards-endermites", endermanAggroEndermites);
endermanAggroEndermitesOnlyIfPlayerSpawned = getBoolean("mobs.enderman.aggressive-towards-endermites-only-spawned-by-player-thrown-ender-pearls", endermanAggroEndermitesOnlyIfPlayerSpawned);

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

@@ -32,10 +32,10 @@ index 96f1eba4a356e131a8f3c689bedc9eb8821e1a72..8edfc34a17d8c05cfa2928738306c1ab
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 a3559e01d93872750af81881295bcb12538dc33e..a1f177f63d2826659d6106621c5c5bccfde5445d 100644
index f18b0c8ef31159d09137506bcf77658b901e5e49..7579875230cd0e6bafd911ff234cb5ad47d2dcb3 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1341,6 +1341,7 @@ public class PurpurWorldConfig {
@@ -1339,6 +1339,7 @@ public class PurpurWorldConfig {
public double llamaMovementSpeedMax = 0.175D;
public int llamaBreedingTicks = 6000;
public boolean llamaTakeDamageFromWater = false;
@@ -43,7 +43,7 @@ index a3559e01d93872750af81881295bcb12538dc33e..a1f177f63d2826659d6106621c5c5bcc
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1360,6 +1361,7 @@ public class PurpurWorldConfig {
@@ -1358,6 +1359,7 @@ public class PurpurWorldConfig {
llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks);
llamaTakeDamageFromWater = getBoolean("mobs.llama.takes-damage-from-water", llamaTakeDamageFromWater);

6
patches/server/0132-Config-to-make-Creepers-explode-on-death.patch
View File

@@ -52,10 +52,10 @@ index d68897b167918ba1e28b083b665ce70aaec437df..2834994506948d02abf228cfb9ffbb3b
private void spawnLingeringCloud() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a1f177f63d2826659d6106621c5c5bccfde5445d..9f339076cb36860e1e38b7fbef2c1f5915cc5fb4 100644
index 7579875230cd0e6bafd911ff234cb5ad47d2dcb3..0ccca4eb96b36eb952f6fd2f25c5ab8da6114c74 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -861,6 +861,7 @@ public class PurpurWorldConfig {
@@ -859,6 +859,7 @@ public class PurpurWorldConfig {
public boolean creeperAllowGriefing = true;
public boolean creeperBypassMobGriefing = false;
public boolean creeperTakeDamageFromWater = false;
@@ -63,7 +63,7 @@ index a1f177f63d2826659d6106621c5c5bccfde5445d..9f339076cb36860e1e38b7fbef2c1f59
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -875,6 +876,7 @@ public class PurpurWorldConfig {
@@ -873,6 +874,7 @@ public class PurpurWorldConfig {
creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing);
creeperTakeDamageFromWater = getBoolean("mobs.creeper.takes-damage-from-water", creeperTakeDamageFromWater);

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

@@ -31,10 +31,10 @@ index 2af4c365743b2956939335512f74e0a1d84298f7..a69e7e8da81bd13578d230cc1e3f0f90
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 9f339076cb36860e1e38b7fbef2c1f5915cc5fb4..f912a2eecf56c50ab445260dbeb20bbcd1874427 100644
index 0ccca4eb96b36eb952f6fd2f25c5ab8da6114c74..e50419fc621848791a1952b2a885b5286eca702b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1713,6 +1713,7 @@ public class PurpurWorldConfig {
@@ -1711,6 +1711,7 @@ public class PurpurWorldConfig {
public double ravagerMaxHealth = 100.0D;
public boolean ravagerBypassMobGriefing = false;
public boolean ravagerTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index 9f339076cb36860e1e38b7fbef2c1f5915cc5fb4..f912a2eecf56c50ab445260dbeb20bbc
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1725,6 +1726,23 @@ public class PurpurWorldConfig {
@@ -1723,6 +1724,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);

4
patches/server/0134-Sneak-to-bulk-process-composter.patch
View File

@@ -87,10 +87,10 @@ index d3d12f9114173f4971f95d7ef895a4374705bd3f..f34159f8d6c51af2341bf49db0d6d6f0
protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
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 f912a2eecf56c50ab445260dbeb20bbcd1874427..e741a679f65158a80f3472b8b231036abe8d38c3 100644
index e50419fc621848791a1952b2a885b5286eca702b..9fc737aafa6cc2dfd6da0b52dff732977a3b36a6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -465,6 +465,11 @@ public class PurpurWorldConfig {
@@ -463,6 +463,11 @@ public class PurpurWorldConfig {
chestOpenWithBlockOnTop = getBoolean("blocks.chest.open-with-solid-block-on-top", chestOpenWithBlockOnTop);
}

6
patches/server/0135-Config-for-skipping-night.patch
View File

@@ -18,10 +18,10 @@ index 613cf0562d2a82e2a7b9bf1d3143e9c4e4a75bea..97e18801ae774d4e7b5154912a1a8281
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 e741a679f65158a80f3472b8b231036abe8d38c3..86fb66b5d0ad557efca1004372528d467c162d1d 100644
index 9fc737aafa6cc2dfd6da0b52dff732977a3b36a6..f27b40a7e1a77fbdb34f10fe95cf6cfa638c56fd 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -341,6 +341,7 @@ public class PurpurWorldConfig {
@@ -339,6 +339,7 @@ public class PurpurWorldConfig {
public boolean playerFixStuckPortal = false;
public boolean creativeOnePunch = false;
public boolean playerSleepNearMonsters = false;
@@ -29,7 +29,7 @@ index e741a679f65158a80f3472b8b231036abe8d38c3..86fb66b5d0ad557efca1004372528d46
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -359,6 +360,7 @@ public class PurpurWorldConfig {
@@ -357,6 +358,7 @@ public class PurpurWorldConfig {
playerFixStuckPortal = getBoolean("gameplay-mechanics.player.fix-stuck-in-portal", playerFixStuckPortal);
creativeOnePunch = getBoolean("gameplay-mechanics.player.one-punch-in-creative", creativeOnePunch);
playerSleepNearMonsters = getBoolean("gameplay-mechanics.player.sleep-ignore-nearby-mobs", playerSleepNearMonsters);

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

@@ -32,10 +32,10 @@ index 05c63eb6cf8a7067105c58d244c7cc27d6bf1125..7c2d5d28f8c2aba2cd8255a4aef22247
return InteractionResult.sidedSuccess(this.level().isClientSide);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 86fb66b5d0ad557efca1004372528d467c162d1d..ffd28d32ef891747160dece1f347f72b12917bdf 100644
index f27b40a7e1a77fbdb34f10fe95cf6cfa638c56fd..80c708ac9fc2e03c2e3ec7aa8f57a8ec0f2ea9ce 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2133,6 +2133,7 @@ public class PurpurWorldConfig {
@@ -2131,6 +2131,7 @@ public class PurpurWorldConfig {
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
public boolean villagerTakeDamageFromWater = false;
@@ -43,7 +43,7 @@ index 86fb66b5d0ad557efca1004372528d467c162d1d..ffd28d32ef891747160dece1f347f72b
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2151,6 +2152,7 @@ public class PurpurWorldConfig {
@@ -2149,6 +2150,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);
@@ -51,7 +51,7 @@ index 86fb66b5d0ad557efca1004372528d467c162d1d..ffd28d32ef891747160dece1f347f72b
}
public boolean vindicatorRidable = false;
@@ -2180,6 +2182,7 @@ public class PurpurWorldConfig {
@@ -2178,6 +2180,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
public boolean wanderingTraderTakeDamageFromWater = false;
@@ -59,7 +59,7 @@ index 86fb66b5d0ad557efca1004372528d467c162d1d..ffd28d32ef891747160dece1f347f72b
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -2193,6 +2196,7 @@ public class PurpurWorldConfig {
@@ -2191,6 +2194,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);

4
patches/server/0137-Drowning-Settings.patch
View File

@@ -40,7 +40,7 @@ index d76e8cf2a2d48548b0ad33c78dbf435b61bf91c4..da28941d9a374be39cf7c1620f48ddaa
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ffd28d32ef891747160dece1f347f72b12917bdf..0eebec70223af219cec5806cd617144fdcaf161c 100644
index 80c708ac9fc2e03c2e3ec7aa8f57a8ec0f2ea9ce..bf34483e7cf04422113c2861750cb670e2f93629 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -160,6 +160,15 @@ public class PurpurWorldConfig {
@@ -58,4 +58,4 @@ index ffd28d32ef891747160dece1f347f72b12917bdf..0eebec70223af219cec5806cd617144f
+
public int elytraDamagePerSecond = 1;
public double elytraDamageMultiplyBySpeed = 0;
public boolean elytraIgnoreUnbreaking = false;
public int elytraDamagePerFireworkBoost = 0;

6
patches/server/0138-Break-individual-slabs-when-sneaking.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Break individual slabs when sneaking
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
index e7c2dac1bb987103bb6404f3f8d7c487ca340fda..5f140eba20078aabfb484223fb9d113db201b07f 100644
index 1ab35b3123c25a80706e6557b4152279bfe8f50f..7e96d06e498ee8a5b3f237e70516552d0cf24388 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -405,6 +405,7 @@ public class ServerPlayerGameMode {
@@ -47,10 +47,10 @@ index fa29eb15934b3dad171d27c21d99b2451cfe553b..ba4aa69425d796d306791ea193f9c6b2
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 0eebec70223af219cec5806cd617144fdcaf161c..de0ea739cd15bd2a99f7f6cde0ff83abb0732c77 100644
index bf34483e7cf04422113c2861750cb670e2f93629..c4e5061002166f1d7cbc1a5ff27ca34e0d7ab34b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -586,6 +586,11 @@ public class PurpurWorldConfig {
@@ -584,6 +584,11 @@ public class PurpurWorldConfig {
}
}

4
patches/server/0139-Config-to-disable-hostile-mob-spawn-on-ice.patch
View File

@@ -24,10 +24,10 @@ index 759839e912c54598b257ad738481364940f88a18..e60e6b3e5ae5a468cfe649ed2222412f
return false;
} else {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index de0ea739cd15bd2a99f7f6cde0ff83abb0732c77..d59dad166be3503f32a03d82850d3da686678dff 100644
index c4e5061002166f1d7cbc1a5ff27ca34e0d7ab34b..aecdcac966ce3773b9dd305255109cd3625e976d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -551,6 +551,13 @@ public class PurpurWorldConfig {
@@ -549,6 +549,13 @@ public class PurpurWorldConfig {
furnaceUseLavaFromUnderneath = getBoolean("blocks.furnace.use-lava-from-underneath", furnaceUseLavaFromUnderneath);
}

4
patches/server/0141-Option-to-make-doors-require-redstone.patch
View File

@@ -82,10 +82,10 @@ index 6dd75bc722f9c20b4869e6353115c3b02dd79f99..dfaf82f5b0180cf08c4125347867d37a
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d5b5cf30aede8615b19f11c3d874c5fb24aa7f29..83af7ddbaaccdcb3cda680e87b984eeb0d1bda4d 100644
index 4a53b1833a861de5c90012c242715a1183057bfa..37b90b32ebbdc5e8a9fa51816093800409795ed4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -490,6 +490,16 @@ public class PurpurWorldConfig {
@@ -488,6 +488,16 @@ public class PurpurWorldConfig {
dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
}

4
patches/server/0142-Config-to-allow-unsafe-enchants.patch
View File

@@ -78,10 +78,10 @@ index 2d300905c05c7c23a4da30b3651b331381a1dc0d..30746b3ae45840206bf23e811a9819f3
((ServerPlayer) this.player).connection.send(new ClientboundContainerSetDataPacket(this.containerId, 0, this.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 d36b5ddc360e4f4cca3ef5c1b5b3d0cbad02614b..a5cdb7f100d161676570a5728e1cfc0e18b7d2cf 100644
index 88db87941bfc84bec7a2dcd3c750a854cac72006..c7785f977e64568bca261a34bce712b677ca97c3 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -1256,6 +1256,12 @@ public final class ItemStack implements DataComponentHolder {
@@ -1255,6 +1255,12 @@ public final class ItemStack implements DataComponentHolder {
return !((ItemEnchantments) this.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY)).isEmpty();
}

4
patches/server/0143-Configurable-sponge-absorption.patch
View File

@@ -21,10 +21,10 @@ index 902825ec9ea05f4418b45f56a008d73f217bd178..a676ccfa6b02e8986df6f6a2e04cbb06
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 83af7ddbaaccdcb3cda680e87b984eeb0d1bda4d..aaa0fa4a738adf8ffe45cd446d49777d1ef8d05b 100644
index 37b90b32ebbdc5e8a9fa51816093800409795ed4..59b94038806ad2da6cd5212035a43b3625792287 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -615,6 +615,13 @@ public class PurpurWorldConfig {
@@ -613,6 +613,13 @@ public class PurpurWorldConfig {
spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
}

4
patches/server/0144-Projectile-offset-config.patch
View File

@@ -96,10 +96,10 @@ index 4934bae61114b49a9f8d0ed044fbb881210df32a..1be074074283f12543ac771ac9201580
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 aaa0fa4a738adf8ffe45cd446d49777d1ef8d05b..fe9da4a79133bf2b3945abb8086f7c59898eb787 100644
index 59b94038806ad2da6cd5212035a43b3625792287..cd3a2509678e9bbb2bc0df02bb3de3188c874825 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -440,6 +440,23 @@ public class PurpurWorldConfig {
@@ -438,6 +438,23 @@ public class PurpurWorldConfig {
//}
}

4
patches/server/0145-Config-for-powered-rail-activation-distance.patch
View File

@@ -18,10 +18,10 @@ index 9603d8c84ff483030dc08e82d3579b89e5c1f6e9..8fc65c32a3c6e6842a76b36f45e1b1c2
} 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 fe9da4a79133bf2b3945abb8086f7c59898eb787..1320729aa1d2653db32fc446942071bf436217a1 100644
index cd3a2509678e9bbb2bc0df02bb3de3188c874825..fac9d008fde9c49ce5c61fbd10682feac5a7680a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -601,6 +601,11 @@ public class PurpurWorldConfig {
@@ -599,6 +599,11 @@ public class PurpurWorldConfig {
powderSnowBypassMobGriefing = getBoolean("blocks.powder_snow.bypass-mob-griefing", powderSnowBypassMobGriefing);
}

8
patches/server/0146-Piglin-portal-spawn-modifier.patch
View File

@@ -18,7 +18,7 @@ Difficulties:
3 - hard
diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
index caa22afb0781671b901c23ebcc89e5bb0d2bd615..259f7e162968714e2959b199c7b1ab847dd624ef 100644
index a530276b0123dee5680d7e09ad3d2f0414909c91..8d5be486adc9b523d3b7067ee4573d83b095d01c 100644
--- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
@@ -77,7 +77,7 @@ public class NetherPortalBlock extends Block implements Portal {
@@ -31,10 +31,10 @@ index caa22afb0781671b901c23ebcc89e5bb0d2bd615..259f7e162968714e2959b199c7b1ab84
pos = pos.below();
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 1320729aa1d2653db32fc446942071bf436217a1..878ac85b96b4c253cb7928b080aa089bfb840f3f 100644
index fac9d008fde9c49ce5c61fbd10682feac5a7680a..3c52d1f90f73a3692e98a5e0c54177aabd0d97fe 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1657,6 +1657,7 @@ public class PurpurWorldConfig {
@@ -1655,6 +1655,7 @@ public class PurpurWorldConfig {
public double piglinMaxHealth = 16.0D;
public boolean piglinBypassMobGriefing = false;
public boolean piglinTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index 1320729aa1d2653db32fc446942071bf436217a1..878ac85b96b4c253cb7928b080aa089b
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1669,6 +1670,7 @@ public class PurpurWorldConfig {
@@ -1667,6 +1668,7 @@ public class PurpurWorldConfig {
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
piglinBypassMobGriefing = getBoolean("mobs.piglin.bypass-mob-griefing", piglinBypassMobGriefing);
piglinTakeDamageFromWater = getBoolean("mobs.piglin.takes-damage-from-water", piglinTakeDamageFromWater);

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

@@ -18,10 +18,10 @@ index e472df057d087fe46bd40b798c050ed6e38a283c..999453409c19abf7f5b5c2dc39969985
if (!event.isCancelled()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 878ac85b96b4c253cb7928b080aa089bfb840f3f..2133dc7583cdc6ff7a9f7e46e461606786186fc1 100644
index 3c52d1f90f73a3692e98a5e0c54177aabd0d97fe..5f7ea922b88c94895b9632589cab503e5d4a5bfa 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2300,6 +2300,7 @@ public class PurpurWorldConfig {
@@ -2298,6 +2298,7 @@ public class PurpurWorldConfig {
public boolean witherBypassMobGriefing = false;
public boolean witherTakeDamageFromWater = false;
public boolean witherCanRideVehicles = false;
@@ -29,7 +29,7 @@ index 878ac85b96b4c253cb7928b080aa089bfb840f3f..2133dc7583cdc6ff7a9f7e46e4616067
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2320,6 +2321,7 @@ public class PurpurWorldConfig {
@@ -2318,6 +2319,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);

4
patches/server/0150-Configurable-piston-push-limit.patch
View File

@@ -36,10 +36,10 @@ index 205e223c356634bd6bc6bd58c6f0b7fda61a6f5f..bea05cb928d540a2f19b51bb7352d032
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2133dc7583cdc6ff7a9f7e46e461606786186fc1..98dea97b699acdcb4a398eefd534142a603c3247 100644
index 5f7ea922b88c94895b9632589cab503e5d4a5bfa..97f0b4cfd8d59d490517f49da686ce0d1a6a8ecc 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -596,6 +596,11 @@ public class PurpurWorldConfig {
@@ -594,6 +594,11 @@ public class PurpurWorldConfig {
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
}

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

@@ -21,10 +21,10 @@ index 2834994506948d02abf228cfb9ffbb3bfd801a40..d2816554dc3a8bec79f5d517562cd04e
// CraftBukkit end
this.dead = true;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 54d3b8ecdb43d847598dc12cb2dc442fde66ee30..f6befc456881e9ea151c1a4297782ef921f08399 100644
index b5c0939ff79dd0379117463e8bb2465ca1c6b70b..a735db8effcef0a9d6d29e68029abe2709f28a57 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -938,6 +938,7 @@ public class PurpurWorldConfig {
@@ -936,6 +936,7 @@ public class PurpurWorldConfig {
public boolean creeperBypassMobGriefing = false;
public boolean creeperTakeDamageFromWater = false;
public boolean creeperExplodeWhenKilled = false;
@@ -32,7 +32,7 @@ index 54d3b8ecdb43d847598dc12cb2dc442fde66ee30..f6befc456881e9ea151c1a4297782ef9
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -953,6 +954,7 @@ public class PurpurWorldConfig {
@@ -951,6 +952,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/0155-Iron-golem-calm-anger-options.patch
View File

@@ -25,10 +25,10 @@ index 65232a2cb23eb4757abdc8741d55e0faccf4c0bb..a820bbbe89dee9e6de2e7d5f72f43d1d
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f6befc456881e9ea151c1a4297782ef921f08399..065cfe73aeff8a57d6c827012164b56f5965afbd 100644
index a735db8effcef0a9d6d29e68029abe2709f28a57..64cda1d10ee87fbcbf25be3379a8928819424939 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1396,6 +1396,8 @@ public class PurpurWorldConfig {
@@ -1394,6 +1394,8 @@ public class PurpurWorldConfig {
public boolean ironGolemCanSwim = false;
public double ironGolemMaxHealth = 100.0D;
public boolean ironGolemTakeDamageFromWater = false;
@@ -37,7 +37,7 @@ index f6befc456881e9ea151c1a4297782ef921f08399..065cfe73aeff8a57d6c827012164b56f
private void ironGolemSettings() {
ironGolemRidable = getBoolean("mobs.iron_golem.ridable", ironGolemRidable);
ironGolemRidableInWater = getBoolean("mobs.iron_golem.ridable-in-water", ironGolemRidableInWater);
@@ -1408,6 +1410,8 @@ public class PurpurWorldConfig {
@@ -1406,6 +1408,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/0156-Breedable-parrots.patch
View File

@@ -50,10 +50,10 @@ index 49a162cc5ccdb160064b6de20a030175d5248070..4050cc4c93cbe33d3e4cc2f7aed5dfc2
@Nullable
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 065cfe73aeff8a57d6c827012164b56f5965afbd..c079260e2426f1e1e770dd5ae421b79693aa3118 100644
index 64cda1d10ee87fbcbf25be3379a8928819424939..dc979b3226badc663b1ff919c069219d51f5eb95 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 {
@@ -1564,6 +1564,7 @@ public class PurpurWorldConfig {
public double parrotMaxY = 320D;
public double parrotMaxHealth = 6.0D;
public boolean parrotTakeDamageFromWater = false;
@@ -61,7 +61,7 @@ index 065cfe73aeff8a57d6c827012164b56f5965afbd..c079260e2426f1e1e770dd5ae421b796
private void parrotSettings() {
parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable);
parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater);
@@ -1578,6 +1579,7 @@ public class PurpurWorldConfig {
@@ -1576,6 +1577,7 @@ public class PurpurWorldConfig {
}
parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth);
parrotTakeDamageFromWater = getBoolean("mobs.parrot.takes-damage-from-water", parrotTakeDamageFromWater);

6
patches/server/0157-Configurable-powered-rail-boost-modifier.patch
View File

@@ -18,10 +18,10 @@ index 9ad276a73cba04edbe48f828031a15727d768a5b..337bd2011c471361653c317004f8380c
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 c079260e2426f1e1e770dd5ae421b79693aa3118..3b670018472fb958e533c9a66bc63051cde24aec 100644
index dc979b3226badc663b1ff919c069219d51f5eb95..953e8035dbd209bfd6c5bfdf548aec4e4ae1aa86 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -260,6 +260,7 @@ public class PurpurWorldConfig {
@@ -258,6 +258,7 @@ public class PurpurWorldConfig {
public boolean minecartControllableFallDamage = true;
public double minecartControllableBaseSpeed = 0.1D;
public Map<Block, Double> minecartControllableBlockSpeeds = new HashMap<>();
@@ -29,7 +29,7 @@ index c079260e2426f1e1e770dd5ae421b79693aa3118..3b670018472fb958e533c9a66bc63051
private void minecartSettings() {
if (PurpurConfig.version < 12) {
boolean oldBool = getBoolean("gameplay-mechanics.controllable-minecarts.place-anywhere", minecartPlaceAnywhere);
@@ -312,6 +313,7 @@ public class PurpurWorldConfig {
@@ -310,6 +311,7 @@ public class PurpurWorldConfig {
set("gameplay-mechanics.minecart.controllable.block-speed.grass_block", 0.3D);
set("gameplay-mechanics.minecart.controllable.block-speed.stone", 0.5D);
}

6
patches/server/0158-Add-config-change-multiplier-critical-damage-value.patch
View File

@@ -18,10 +18,10 @@ index 2dafba96353c208b89da7b65c0d56a51e00547c3..c582b5be87e93a0ea231bb6ce47bd10c
float f3 = f + f1;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3b670018472fb958e533c9a66bc63051cde24aec..ccc00cf598636ef19525c586edf9730ecfe195a9 100644
index 953e8035dbd209bfd6c5bfdf548aec4e4ae1aa86..cd4e433316fe3d70babdea395093a2b071e38219 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 {
@@ -355,6 +355,7 @@ public class PurpurWorldConfig {
public boolean creativeOnePunch = false;
public boolean playerSleepNearMonsters = false;
public boolean playersSkipNight = true;
@@ -29,7 +29,7 @@ index 3b670018472fb958e533c9a66bc63051cde24aec..ccc00cf598636ef19525c586edf9730e
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -376,6 +377,7 @@ public class PurpurWorldConfig {
@@ -374,6 +375,7 @@ public class PurpurWorldConfig {
creativeOnePunch = getBoolean("gameplay-mechanics.player.one-punch-in-creative", creativeOnePunch);
playerSleepNearMonsters = getBoolean("gameplay-mechanics.player.sleep-ignore-nearby-mobs", playerSleepNearMonsters);
playersSkipNight = getBoolean("gameplay-mechanics.player.can-skip-night", playersSkipNight);

4
patches/server/0159-Option-to-disable-dragon-egg-teleporting.patch
View File

@@ -19,10 +19,10 @@ index fbe15cdd5b9bca2ab4b1e871abbbdbff49ade8a4..23d113842bf774bdc74e0dffcc97b642
BlockPos blockposition1 = pos.offset(world.random.nextInt(16) - world.random.nextInt(16), world.random.nextInt(8) - world.random.nextInt(8), world.random.nextInt(16) - world.random.nextInt(16));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ccc00cf598636ef19525c586edf9730ecfe195a9..5dcdc3d17c5b98dd3a5c2a273cf6b3aad46c43f4 100644
index cd4e433316fe3d70babdea395093a2b071e38219..71128e30a7ce6753aeb51c94db631f448349a06c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -523,6 +523,11 @@ public class PurpurWorldConfig {
@@ -521,6 +521,11 @@ public class PurpurWorldConfig {
});
}

6
patches/server/0162-Bee-can-work-when-raining-or-at-night.patch
View File

@@ -31,10 +31,10 @@ index f52823146944d333f2d050e90261b570ba66f5dd..d8efb00c325448d566c59418fe22268c
return false;
} else {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5dcdc3d17c5b98dd3a5c2a273cf6b3aad46c43f4..370540330a9457bbc9b084716fa4461da58a72a6 100644
index 71128e30a7ce6753aeb51c94db631f448349a06c..ee7d79848974e5b8eafb7ac0627ea0da5eb7493b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -763,6 +763,8 @@ public class PurpurWorldConfig {
@@ -761,6 +761,8 @@ public class PurpurWorldConfig {
public double beeMaxHealth = 10.0D;
public int beeBreedingTicks = 6000;
public boolean beeTakeDamageFromWater = false;
@@ -43,7 +43,7 @@ index 5dcdc3d17c5b98dd3a5c2a273cf6b3aad46c43f4..370540330a9457bbc9b084716fa4461d
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -776,6 +778,8 @@ public class PurpurWorldConfig {
@@ -774,6 +776,8 @@ public class PurpurWorldConfig {
beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
beeBreedingTicks = getInt("mobs.bee.breeding-delay-ticks", beeBreedingTicks);
beeTakeDamageFromWater = getBoolean("mobs.bee.takes-damage-from-water", beeTakeDamageFromWater);

4
patches/server/0164-Config-MobEffect-by-world.patch
View File

@@ -72,10 +72,10 @@ index f43bf280999ff3860cc702def50cc62b131eb1bd..66d9e99a351f5fc6cf58be3bee4397d9
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 370540330a9457bbc9b084716fa4461da58a72a6..b273cc14dce9c4f1f98cb3623bfacf5adbfbf4f6 100644
index ee7d79848974e5b8eafb7ac0627ea0da5eb7493b..8c8544fb888eda28171a675371b5002b3f96125e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -316,6 +316,21 @@ public class PurpurWorldConfig {
@@ -314,6 +314,21 @@ public class PurpurWorldConfig {
poweredRailBoostModifier = getDouble("gameplay-mechanics.minecart.powered-rail.boost-modifier", poweredRailBoostModifier);
}

4
patches/server/0165-Beacon-Activation-Range-Configurable.patch
View File

@@ -26,10 +26,10 @@ index 814e70f558d7a6186233da0ff86c94c95d390e09..d1fb77d83d48183a9a37dbeec7bb0fda
} else {
return effectRange;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b273cc14dce9c4f1f98cb3623bfacf5adbfbf4f6..aabffb08cdec317dc5533b6d8ca535806a8318f1 100644
index 8c8544fb888eda28171a675371b5002b3f96125e..2b4efa8b00ea9eedfd94d48e6433c2af4ad0cf85 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -490,6 +490,17 @@ public class PurpurWorldConfig {
@@ -488,6 +488,17 @@ public class PurpurWorldConfig {
anvilColorsUseMiniMessage = getBoolean("blocks.anvil.use-mini-message", anvilColorsUseMiniMessage);
}

6
patches/server/0167-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
View File

@@ -54,10 +54,10 @@ index bd3f78e6453cfe18aa3da38176b04d734d83bb4b..515dd3b769917c4aa60ce180ef24f38c
public void eat(FoodProperties foodComponent) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index aabffb08cdec317dc5533b6d8ca535806a8318f1..7628e4bfa494c9773a44080cada66d1bce2f1d05 100644
index 2b4efa8b00ea9eedfd94d48e6433c2af4ad0cf85..92224cab3535e0bc98ed6000843633b1871303ef 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -373,6 +373,8 @@ public class PurpurWorldConfig {
@@ -371,6 +371,8 @@ public class PurpurWorldConfig {
public boolean playerSleepNearMonsters = false;
public boolean playersSkipNight = true;
public double playerCriticalDamageMultiplier = 1.5D;
@@ -66,7 +66,7 @@ index aabffb08cdec317dc5533b6d8ca535806a8318f1..7628e4bfa494c9773a44080cada66d1b
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -393,6 +395,8 @@ public class PurpurWorldConfig {
@@ -391,6 +393,8 @@ public class PurpurWorldConfig {
playerSleepNearMonsters = getBoolean("gameplay-mechanics.player.sleep-ignore-nearby-mobs", playerSleepNearMonsters);
playersSkipNight = getBoolean("gameplay-mechanics.player.can-skip-night", playersSkipNight);
playerCriticalDamageMultiplier = getDouble("gameplay-mechanics.player.critical-damage-multiplier", playerCriticalDamageMultiplier);

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

@@ -68,10 +68,10 @@ index 0d04a0107bd1a8a2b9aeb4be55025cd554e8fb79..a050d76233e179a1456b83ccc02bb9a5
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7628e4bfa494c9773a44080cada66d1bce2f1d05..905e3d7b8a051f693936c81695c3bda6fd872c60 100644
index 92224cab3535e0bc98ed6000843633b1871303ef..c42d392047de05a108b12aa0a5d511259e707722 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1917,6 +1917,11 @@ public class PurpurWorldConfig {
@@ -1915,6 +1915,11 @@ public class PurpurWorldConfig {
public boolean shulkerControllable = true;
public double shulkerMaxHealth = 30.0D;
public boolean shulkerTakeDamageFromWater = false;
@@ -83,7 +83,7 @@ index 7628e4bfa494c9773a44080cada66d1bce2f1d05..905e3d7b8a051f693936c81695c3bda6
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -1928,6 +1933,11 @@ public class PurpurWorldConfig {
@@ -1926,6 +1931,11 @@ public class PurpurWorldConfig {
}
shulkerMaxHealth = getDouble("mobs.shulker.attributes.max_health", shulkerMaxHealth);
shulkerTakeDamageFromWater = getBoolean("mobs.shulker.takes-damage-from-water", shulkerTakeDamageFromWater);

6
patches/server/0171-Eating-glow-berries-adds-glow-effect.patch
View File

@@ -18,10 +18,10 @@ index 4eef61323ba54f513e6f251ef7c804b2c91ff477..6b2235281dca67a80cb651e9f8e9bf25
public static final Item CAMPFIRE = registerBlock(Blocks.CAMPFIRE, settings -> settings.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY));
public static final Item SOUL_CAMPFIRE = registerBlock(
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 905e3d7b8a051f693936c81695c3bda6fd872c60..ff4a50643c52a199b3c16812223062a9ea2f100f 100644
index c42d392047de05a108b12aa0a5d511259e707722..86846ad7459d96ad27c6d7f55f414022f0d62507 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -205,6 +205,7 @@ public class PurpurWorldConfig {
@@ -203,6 +203,7 @@ public class PurpurWorldConfig {
public int enderPearlCooldown = 20;
public int enderPearlCooldownCreative = 20;
public float enderPearlEndermiteChance = 0.05F;
@@ -29,7 +29,7 @@ index 905e3d7b8a051f693936c81695c3bda6fd872c60..ff4a50643c52a199b3c16812223062a9
private void itemSettings() {
itemImmuneToCactus.clear();
getList("gameplay-mechanics.item.immune.cactus", new ArrayList<>()).forEach(key -> {
@@ -250,6 +251,7 @@ public class PurpurWorldConfig {
@@ -248,6 +249,7 @@ public class PurpurWorldConfig {
enderPearlCooldown = getInt("gameplay-mechanics.item.ender-pearl.cooldown", enderPearlCooldown);
enderPearlCooldownCreative = getInt("gameplay-mechanics.item.ender-pearl.creative-cooldown", enderPearlCooldownCreative);
enderPearlEndermiteChance = (float) getDouble("gameplay-mechanics.item.ender-pearl.endermite-spawn-chance", enderPearlEndermiteChance);

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

@@ -26,10 +26,10 @@ index f037d50f26f7532f11a71790448de7a71644b6ca..b3a79dc4357ad4392101353fbc99aac1
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ff4a50643c52a199b3c16812223062a9ea2f100f..83cf123c29fb8dc6e3998dbf1779b1d3e724af59 100644
index 86846ad7459d96ad27c6d7f55f414022f0d62507..f72c0e9ac75e4e564ec953414248529c185c134f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1063,6 +1063,7 @@ public class PurpurWorldConfig {
@@ -1061,6 +1061,7 @@ public class PurpurWorldConfig {
public double drownedJockeyChance = 0.05D;
public boolean drownedJockeyTryExistingChickens = true;
public boolean drownedTakeDamageFromWater = false;
@@ -37,7 +37,7 @@ index ff4a50643c52a199b3c16812223062a9ea2f100f..83cf123c29fb8dc6e3998dbf1779b1d3
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -1078,6 +1079,7 @@ public class PurpurWorldConfig {
@@ -1076,6 +1077,7 @@ public class PurpurWorldConfig {
drownedJockeyChance = getDouble("mobs.drowned.jockey.chance", drownedJockeyChance);
drownedJockeyTryExistingChickens = getBoolean("mobs.drowned.jockey.try-existing-chickens", drownedJockeyTryExistingChickens);
drownedTakeDamageFromWater = getBoolean("mobs.drowned.takes-damage-from-water", drownedTakeDamageFromWater);

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

@@ -18,10 +18,10 @@ index 515dd3b769917c4aa60ce180ef24f38ca12e6848..c7ad716f607afe382436d088a2b2e622
this.tickTimer = 0;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 83cf123c29fb8dc6e3998dbf1779b1d3e724af59..7cf5c1d883b62abea2d855136c6c3c95bdd6e73f 100644
index f72c0e9ac75e4e564ec953414248529c185c134f..03db186c6799e3b64e1995d62e11963600773ffb 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2576,4 +2576,9 @@ public class PurpurWorldConfig {
@@ -2574,4 +2574,9 @@ public class PurpurWorldConfig {
zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
zombifiedPiglinTakeDamageFromWater = getBoolean("mobs.zombified_piglin.takes-damage-from-water", zombifiedPiglinTakeDamageFromWater);
}

4
patches/server/0176-Tool-actionable-options.patch
View File

@@ -157,10 +157,10 @@ index 24f6a158e4759aac3be8da4cf5e0d40bd295355b..6b7dbb570f8a698c87c6bce992d84d87
return InteractionResult.PASS;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7cf5c1d883b62abea2d855136c6c3c95bdd6e73f..e355fa02cdb19cb9aaccb6ac35b936e44e506f64 100644
index 03db186c6799e3b64e1995d62e11963600773ffb..4520df0b1ecc6e9c8f382bda2a70fc2a0ad64f50 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -489,6 +489,280 @@ public class PurpurWorldConfig {
@@ -487,6 +487,280 @@ public class PurpurWorldConfig {
snowballDamage = getInt("gameplay-mechanics.projectile-damage.snowball", snowballDamage);
}

6
patches/server/0180-option-to-disable-shulker-box-items-from-dropping-co.patch
View File

@@ -18,10 +18,10 @@ index 3253361d91e2a2e68d354eaf3dd3e3cd486e191d..2649188930653610b8aaaeb18797c808
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e355fa02cdb19cb9aaccb6ac35b936e44e506f64..91b2f4b6a24ea07835cf6caa4994fadbeee97b46 100644
index 4520df0b1ecc6e9c8f382bda2a70fc2a0ad64f50..f8632e9e4da31d963890d600587414599ac2eff8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -206,6 +206,7 @@ public class PurpurWorldConfig {
@@ -204,6 +204,7 @@ public class PurpurWorldConfig {
public int enderPearlCooldownCreative = 20;
public float enderPearlEndermiteChance = 0.05F;
public int glowBerriesEatGlowDuration = 0;
@@ -29,7 +29,7 @@ index e355fa02cdb19cb9aaccb6ac35b936e44e506f64..91b2f4b6a24ea07835cf6caa4994fadb
private void itemSettings() {
itemImmuneToCactus.clear();
getList("gameplay-mechanics.item.immune.cactus", new ArrayList<>()).forEach(key -> {
@@ -252,6 +253,7 @@ public class PurpurWorldConfig {
@@ -250,6 +251,7 @@ public class PurpurWorldConfig {
enderPearlCooldownCreative = getInt("gameplay-mechanics.item.ender-pearl.creative-cooldown", enderPearlCooldownCreative);
enderPearlEndermiteChance = (float) getDouble("gameplay-mechanics.item.ender-pearl.endermite-spawn-chance", enderPearlEndermiteChance);
glowBerriesEatGlowDuration = getInt("gameplay-mechanics.item.glow_berries.eat-glow-duration", glowBerriesEatGlowDuration);

4
patches/server/0181-Big-dripleaf-tilt-delay.patch
View File

@@ -24,10 +24,10 @@ index 8240c32d676a88aa23dcd052ee0136767e54fb0d..372c4ab9d390d5afd98947f21c79aae0
if (i != -1) {
world.scheduleTick(blockposition, (Block) this, i);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 91b2f4b6a24ea07835cf6caa4994fadbeee97b46..36becc96a815ebd0dde7e8b9b8072948df4ee758 100644
index f8632e9e4da31d963890d600587414599ac2eff8..dc384130f18debadd5cf9d4bf00404754dd2b015 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -804,6 +804,22 @@ public class PurpurWorldConfig {
@@ -802,6 +802,22 @@ public class PurpurWorldConfig {
}
}

6
patches/server/0182-Player-ridable-in-water-option.patch
View File

@@ -23,10 +23,10 @@ index 2fe3af832a228b1352b9b85dec06115009ef658f..cb6f161d32fe9642e9e9b1efc47d8861
if (!this.isPassenger() && this.onGround() && !this.isInWater() && !this.isInPowderSnow) {
if (this.getShoulderEntityLeft().isEmpty()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 36becc96a815ebd0dde7e8b9b8072948df4ee758..ba419b8681659ca1b3cc619915b3a07bdd4abe29 100644
index dc384130f18debadd5cf9d4bf00404754dd2b015..49abcdb2448af0625e134181cb10c3d4d13a8006 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -379,6 +379,7 @@ public class PurpurWorldConfig {
@@ -377,6 +377,7 @@ public class PurpurWorldConfig {
public double playerCriticalDamageMultiplier = 1.5D;
public int playerBurpDelay = 10;
public boolean playerBurpWhenFull = false;
@@ -34,7 +34,7 @@ index 36becc96a815ebd0dde7e8b9b8072948df4ee758..ba419b8681659ca1b3cc619915b3a07b
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -401,6 +402,7 @@ public class PurpurWorldConfig {
@@ -399,6 +400,7 @@ public class PurpurWorldConfig {
playerCriticalDamageMultiplier = getDouble("gameplay-mechanics.player.critical-damage-multiplier", playerCriticalDamageMultiplier);
playerBurpDelay = getInt("gameplay-mechanics.player.burp-delay", playerBurpDelay);
playerBurpWhenFull = getBoolean("gameplay-mechanics.player.burp-when-full", playerBurpWhenFull);

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

@@ -17,10 +17,10 @@ index f2e21c9d3cefb635c4eb583ac9355b46675c94e7..2855efc4670c58219ca1e78770ac289a
for (int i = 0; i < 64; ++i) {
if (this.teleport()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ba419b8681659ca1b3cc619915b3a07bdd4abe29..af53cf014a45bd012b735e73f44dfcb661fdbb3f 100644
index 49abcdb2448af0625e134181cb10c3d4d13a8006..c4173598759f0c64817ff60bbd00dbab736ca073 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1434,6 +1434,7 @@ public class PurpurWorldConfig {
@@ -1432,6 +1432,7 @@ public class PurpurWorldConfig {
public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
public boolean endermanIgnorePlayerDragonHead = false;
public boolean endermanDisableStareAggro = false;
@@ -28,7 +28,7 @@ index ba419b8681659ca1b3cc619915b3a07bdd4abe29..af53cf014a45bd012b735e73f44dfcb6
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -1456,6 +1457,7 @@ public class PurpurWorldConfig {
@@ -1454,6 +1455,7 @@ public class PurpurWorldConfig {
endermanAggroEndermitesOnlyIfPlayerSpawned = getBoolean("mobs.enderman.aggressive-towards-endermites-only-spawned-by-player-thrown-ender-pearls", endermanAggroEndermitesOnlyIfPlayerSpawned);
endermanIgnorePlayerDragonHead = getBoolean("mobs.enderman.ignore-players-wearing-dragon-head", endermanIgnorePlayerDragonHead);
endermanDisableStareAggro = getBoolean("mobs.enderman.disable-player-stare-aggression", endermanDisableStareAggro);

6
patches/server/0184-Add-compass-command.patch
View File

@@ -89,10 +89,10 @@ index e61adb459d148390851607c6ea7cf710344b26e8..21dff6a902b3c4e0fb40e61b4974ead7
hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);
uptimeFormat = getString("settings.command.uptime.format", uptimeFormat);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index af53cf014a45bd012b735e73f44dfcb661fdbb3f..96e366d6f12671b580f83f428e07d08c221b888b 100644
index c4173598759f0c64817ff60bbd00dbab736ca073..7b7a6488f2baadd77a1247b64b46d5589c882514 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -207,6 +207,7 @@ public class PurpurWorldConfig {
@@ -205,6 +205,7 @@ public class PurpurWorldConfig {
public float enderPearlEndermiteChance = 0.05F;
public int glowBerriesEatGlowDuration = 0;
public boolean shulkerBoxItemDropContentsWhenDestroyed = true;
@@ -100,7 +100,7 @@ index af53cf014a45bd012b735e73f44dfcb661fdbb3f..96e366d6f12671b580f83f428e07d08c
private void itemSettings() {
itemImmuneToCactus.clear();
getList("gameplay-mechanics.item.immune.cactus", new ArrayList<>()).forEach(key -> {
@@ -254,6 +255,7 @@ public class PurpurWorldConfig {
@@ -252,6 +253,7 @@ public class PurpurWorldConfig {
enderPearlEndermiteChance = (float) getDouble("gameplay-mechanics.item.ender-pearl.endermite-spawn-chance", enderPearlEndermiteChance);
glowBerriesEatGlowDuration = getInt("gameplay-mechanics.item.glow_berries.eat-glow-duration", glowBerriesEatGlowDuration);
shulkerBoxItemDropContentsWhenDestroyed = getBoolean("gameplay-mechanics.item.shulker_box.drop-contents-when-destroyed", shulkerBoxItemDropContentsWhenDestroyed);

9
patches/server/0185-Toggle-for-kinetic-damage.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for kinetic damage
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 3b77111bdf50cd836d6e4199e6224b594430b147..bc31065aed8d09b5242310de52f895a0173c0534 100644
index 9367e0f148d3aa9a60dfd8881a3c337630a53129..6b76ca326d08853a8a508ec22d7bc6cf370223dd 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2983,6 +2983,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -17,18 +17,17 @@ index 3b77111bdf50cd836d6e4199e6224b594430b147..bc31065aed8d09b5242310de52f895a0
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 96e366d6f12671b580f83f428e07d08c221b888b..4d9ae3f9312b7427f1e4e4583bb5ecfa57f09f20 100644
index 7b7a6488f2baadd77a1247b64b46d5589c882514..c2e2fd46eb79727fec1f2083effcccc132a784c8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -178,12 +178,14 @@ public class PurpurWorldConfig {
public boolean elytraIgnoreUnbreaking = false;
@@ -177,11 +177,13 @@ public class PurpurWorldConfig {
public double elytraDamageMultiplyBySpeed = 0;
public int elytraDamagePerFireworkBoost = 0;
public int elytraDamagePerTridentBoost = 0;
+ public boolean elytraKineticDamage = true;
private void elytraSettings() {
elytraDamagePerSecond = getInt("gameplay-mechanics.elytra.damage-per-second", elytraDamagePerSecond);
elytraDamageMultiplyBySpeed = getDouble("gameplay-mechanics.elytra.damage-multiplied-by-speed", elytraDamageMultiplyBySpeed);
elytraIgnoreUnbreaking = getBoolean("gameplay-mechanics.elytra.ignore-unbreaking", elytraIgnoreUnbreaking);
elytraDamagePerFireworkBoost = getInt("gameplay-mechanics.elytra.damage-per-boost.firework", elytraDamagePerFireworkBoost);
elytraDamagePerTridentBoost = getInt("gameplay-mechanics.elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
+ elytraKineticDamage = getBoolean("gameplay-mechanics.elytra.kinetic-damage", elytraKineticDamage);

4
patches/server/0186-Add-Option-for-disable-observer-clocks.patch
View File

@@ -18,10 +18,10 @@ index b38fbe5121f293f425d7673a6ce49b11d0ced0d9..2a74f42672b92393b52a61c27c5b8af7
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 4d9ae3f9312b7427f1e4e4583bb5ecfa57f09f20..d78268f4b1740c922bc979de7d5f1f8ccec3af2f 100644
index c2e2fd46eb79727fec1f2083effcccc132a784c8..6df0f31600623ada9ea8207feeaa0de8368be8fd 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -354,6 +354,11 @@ public class PurpurWorldConfig {
@@ -352,6 +352,11 @@ public class PurpurWorldConfig {
villageSiegeSpawning = getBoolean("gameplay-mechanics.mob-spawning.village-sieges", predicate);
}

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

@@ -18,10 +18,10 @@ index 3c4cff3f095cdf2dd74df7bf4bb8f3d5600b342d..9bb75b49ea2d0bd8aafbe537b65f86eb
return InteractionResult.SUCCESS;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d78268f4b1740c922bc979de7d5f1f8ccec3af2f..863fa41dc970b59e31aa0fe78729eb305780cf19 100644
index 6df0f31600623ada9ea8207feeaa0de8368be8fd..e6101274efffc8a51d9ce8bd9245c33fa09041d4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2837,6 +2837,8 @@ public class PurpurWorldConfig {
@@ -2835,6 +2835,8 @@ public class PurpurWorldConfig {
public double zombieVillagerJockeyChance = 0.05D;
public boolean zombieVillagerJockeyTryExistingChickens = true;
public boolean zombieVillagerTakeDamageFromWater = false;
@@ -30,7 +30,7 @@ index d78268f4b1740c922bc979de7d5f1f8ccec3af2f..863fa41dc970b59e31aa0fe78729eb30
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2852,6 +2854,8 @@ public class PurpurWorldConfig {
@@ -2850,6 +2852,8 @@ public class PurpurWorldConfig {
zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater);

4
patches/server/0188-Option-for-sponges-to-work-on-lava-and-mud.patch
View File

@@ -30,10 +30,10 @@ index a676ccfa6b02e8986df6f6a2e04cbb06b3edd0ff..6fe44572e34ad3e3a1851e73138bd8b7
if (!iblockdata.is(Blocks.KELP) && !iblockdata.is(Blocks.KELP_PLANT) && !iblockdata.is(Blocks.SEAGRASS) && !iblockdata.is(Blocks.TALL_SEAGRASS)) {
return false;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 863fa41dc970b59e31aa0fe78729eb305780cf19..93faa1e96703c32bc19a235479ba271ef1f2aa06 100644
index e6101274efffc8a51d9ce8bd9245c33fa09041d4..9a21a85a8d0bdd1a953c55d1cf9c17537939d7f2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -990,9 +990,13 @@ public class PurpurWorldConfig {
@@ -988,9 +988,13 @@ public class PurpurWorldConfig {
public int spongeAbsorptionArea = 65;
public int spongeAbsorptionRadius = 6;

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

@@ -18,10 +18,10 @@ index 15c9321763ad9f3bb31d7a05cb7ed9cb64e9a8a4..c37c27eec9d0b293063fc8841ac85810
// this.level().globalLevelEvent(1023, new BlockPosition(this), 0);
int viewDistance = ((ServerLevel) this.level()).getCraftServer().getViewDistance() * 16;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 93faa1e96703c32bc19a235479ba271ef1f2aa06..e0ed820f2b2369d2c2892683c99feb0e84831f5a 100644
index 9a21a85a8d0bdd1a953c55d1cf9c17537939d7f2..cb5e0cccb4e812db5e7c1713c9ff2a01d02cf817 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2682,6 +2682,7 @@ public class PurpurWorldConfig {
@@ -2680,6 +2680,7 @@ public class PurpurWorldConfig {
public boolean witherTakeDamageFromWater = false;
public boolean witherCanRideVehicles = false;
public float witherExplosionRadius = 1.0F;
@@ -29,7 +29,7 @@ index 93faa1e96703c32bc19a235479ba271ef1f2aa06..e0ed820f2b2369d2c2892683c99feb0e
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2703,6 +2704,7 @@ public class PurpurWorldConfig {
@@ -2701,6 +2702,7 @@ public class PurpurWorldConfig {
witherTakeDamageFromWater = getBoolean("mobs.wither.takes-damage-from-water", witherTakeDamageFromWater);
witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);
witherExplosionRadius = (float) getDouble("mobs.wither.explosion-radius", witherExplosionRadius);

4
patches/server/0190-Cactus-breaks-from-solid-neighbors-config.patch
View File

@@ -18,10 +18,10 @@ index ff4dda48116a2969704b355ff96407ba869b466e..9200d75b05ce535f7b7f5c1572cd8f62
return false;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e0ed820f2b2369d2c2892683c99feb0e84831f5a..c9e9f39d9583cac71f9703f5f8a8bcf621a9a70a 100644
index cb5e0cccb4e812db5e7c1713c9ff2a01d02cf817..9fa9cc62d9f8f3cb1eec8c5738ce04bb8cdda9b7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -831,6 +831,11 @@ public class PurpurWorldConfig {
@@ -829,6 +829,11 @@ public class PurpurWorldConfig {
});
}

6
patches/server/0191-Config-to-remove-curse-of-binding-with-weakness.patch
View File

@@ -18,10 +18,10 @@ index 6c0b6abb1698fac9bb902f695b725d4ab783ee90..091e3c3514fcb378b68098114106d09f
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c9e9f39d9583cac71f9703f5f8a8bcf621a9a70a..0b06d64ca0fe0d33345526e9b62e58ec073e610b 100644
index 9fa9cc62d9f8f3cb1eec8c5738ce04bb8cdda9b7..329954562a9c66c7fd33c9f816ff09a7739fc854 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -389,6 +389,7 @@ public class PurpurWorldConfig {
@@ -387,6 +387,7 @@ public class PurpurWorldConfig {
public int playerBurpDelay = 10;
public boolean playerBurpWhenFull = false;
public boolean playerRidableInWater = false;
@@ -29,7 +29,7 @@ index c9e9f39d9583cac71f9703f5f8a8bcf621a9a70a..0b06d64ca0fe0d33345526e9b62e58ec
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -412,6 +413,7 @@ public class PurpurWorldConfig {
@@ -410,6 +411,7 @@ public class PurpurWorldConfig {
playerBurpDelay = getInt("gameplay-mechanics.player.burp-delay", playerBurpDelay);
playerBurpWhenFull = getBoolean("gameplay-mechanics.player.burp-when-full", playerBurpWhenFull);
playerRidableInWater = getBoolean("gameplay-mechanics.player.ridable-in-water", playerRidableInWater);

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

@@ -97,10 +97,10 @@ index c1759aeb3e6ad0e4eb66cba3da1b120dd1dce812..1a91bc2e422db0eba65694ac046f1b36
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 0b06d64ca0fe0d33345526e9b62e58ec073e610b..fc4d67cb6e8f730cfd141818bc7a6380c872f605 100644
index 329954562a9c66c7fd33c9f816ff09a7739fc854..27860fcde1f1decdce9c1f54f92ea6097700ee50 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2903,4 +2903,27 @@ public class PurpurWorldConfig {
@@ -2901,4 +2901,27 @@ public class PurpurWorldConfig {
private void hungerSettings() {
hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
}

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

@@ -47,10 +47,10 @@ index a2bd54dae4b0460d200f6d5300194a7ef5a28830..bf189a171530abfc9bba5db5a305feb3
if (dripChance < f1) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index fc4d67cb6e8f730cfd141818bc7a6380c872f605..dc98e302cbe5ad2f016913d2b41c6d68d94b589e 100644
index 27860fcde1f1decdce9c1f54f92ea6097700ee50..7cc3ff173bb97b720b69b3b82a621868849fc443 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2926,4 +2926,15 @@ public class PurpurWorldConfig {
@@ -2924,4 +2924,15 @@ public class PurpurWorldConfig {
});
conduitBlocks = conduitBlockList.toArray(Block[]::new);
}

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

@@ -29,10 +29,10 @@ index fde6bae8a5d9eba7ec87c73047a6e3f91629828e..0e9a4e473b1f1887804507cfadfdeeed
protected void registerGoals() {
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b953cf6ff70684ef4735ea4f328f647649ea9ce4..faf2b37977bb0b3d1b8a95f31159ab4b142bf56a 100644
index 250d455cc9c723bd83f9d7617b73014aa55759aa..7fefcc2bba871c821172264810e373278a92caa0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2244,6 +2244,7 @@ public class PurpurWorldConfig {
@@ -2242,6 +2242,7 @@ public class PurpurWorldConfig {
public double shulkerSpawnFromBulletNearbyRange = 8.0D;
public String shulkerSpawnFromBulletNearbyEquation = "(nearby - 1) / 5.0";
public boolean shulkerSpawnFromBulletRandomColor = false;
@@ -40,7 +40,7 @@ index b953cf6ff70684ef4735ea4f328f647649ea9ce4..faf2b37977bb0b3d1b8a95f31159ab4b
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -2260,6 +2261,7 @@ public class PurpurWorldConfig {
@@ -2258,6 +2259,7 @@ public class PurpurWorldConfig {
shulkerSpawnFromBulletNearbyRange = getDouble("mobs.shulker.spawn-from-bullet.nearby-range", shulkerSpawnFromBulletNearbyRange);
shulkerSpawnFromBulletNearbyEquation = getString("mobs.shulker.spawn-from-bullet.nearby-equation", shulkerSpawnFromBulletNearbyEquation);
shulkerSpawnFromBulletRandomColor = getBoolean("mobs.shulker.spawn-from-bullet.random-color", shulkerSpawnFromBulletRandomColor);

6
patches/server/0199-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
View File

@@ -50,10 +50,10 @@ index 223259e7a09ada681b6181c898f6857888594f85..7d58a95f7ae8983b466b275f4f82597d
.sound(SoundType.FLOWERING_AZALEA)
.noOcclusion()
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3a8c99464eaff70be5695cafd83caa3d1c6f7a03..0a854ab320f008eed19b9bd77d29a62c7dafdec5 100644
index 02770064c5569a20aeb3ee167254d4214455a9e2..cb754bc007f543b72651c6e744c1691ad8ce3f95 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -791,6 +791,11 @@ public class PurpurWorldConfig {
@@ -789,6 +789,11 @@ public class PurpurWorldConfig {
anvilColorsUseMiniMessage = getBoolean("blocks.anvil.use-mini-message", anvilColorsUseMiniMessage);
}
@@ -65,7 +65,7 @@ index 3a8c99464eaff70be5695cafd83caa3d1c6f7a03..0a854ab320f008eed19b9bd77d29a62c
public int beaconLevelOne = 20;
public int beaconLevelTwo = 30;
public int beaconLevelThree = 40;
@@ -928,6 +933,11 @@ public class PurpurWorldConfig {
@@ -926,6 +931,11 @@ public class PurpurWorldConfig {
farmlandTramplingFeatherFalling = getBoolean("blocks.farmland.feather-fall-distance-affects-trampling", farmlandTramplingFeatherFalling);
}

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