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

Fix Enderman aggressiveness towards Endermites

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-26 22:22:56 -05:00
parent 9269c86878
commit f690dd42eb
54 changed files with 214 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
patches/api/0042-Add-back-player-spawned-endermite-API.patch Normal file
View File

@@ -0,0 +1,39 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 26 Jun 2021 22:08:57 -0500
Subject: [PATCH] Add back player spawned endermite API
diff --git a/src/main/java/org/bukkit/entity/Endermite.java b/src/main/java/org/bukkit/entity/Endermite.java
index f76ddd80f9fc926f73b1cc50f0a2767abbc549bb..d71afdfa9f7eb66dffd9943d6e51314b0e91b4d0 100644
--- a/src/main/java/org/bukkit/entity/Endermite.java
+++ b/src/main/java/org/bukkit/entity/Endermite.java
@@ -6,24 +6,20 @@ package org.bukkit.entity;
public interface Endermite extends Monster {
/**
- * Gets whether this Endermite was spawned by a player.
+ * Gets whether this Endermite was spawned by a player from throwing an ender pearl
*
- * An Endermite spawned by a player will be attacked by nearby Enderman.
+ * An Endermite spawned by a player might be attacked by nearby Enderman depending on purpur.yml settings
*
* @return player spawned status
- * @deprecated this functionality no longer exists
*/
- @Deprecated
boolean isPlayerSpawned();
/**
- * Sets whether this Endermite was spawned by a player.
+ * Sets whether this Endermite was spawned by a player from throwing an ender pearl
*
- * An Endermite spawned by a player will be attacked by nearby Enderman.
+ * An Endermite spawned by a player might be attacked by nearby Enderman depending on purpur.yml settings
*
* @param playerSpawned player spawned status
- * @deprecated this functionality no longer exists
*/
- @Deprecated
void setPlayerSpawned(boolean playerSpawned);
}

8
patches/server/0002-Purpur-config-files.patch
View File

@@ -164,7 +164,7 @@ index 862553e98a7237d39a26036c615b9cbd001bd3bf..d11b463548b847382a22fdf50496b186
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..7c5ecdbd5a05ae07a440cadf79d59a439e4db524
index 0000000000000000000000000000000000000000..32f44983aaec838960e6435580ee261cfa266b53
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,130 @@
@@ -223,8 +223,8 @@ index 0000000000000000000000000000000000000000..7c5ecdbd5a05ae07a440cadf79d59a43
+ commands = new HashMap<>();
+ commands.put("purpur", new PurpurCommand("purpur"));
+
+ version = getInt("config-version", 14);
+ set("config-version", 14);
+ version = getInt("config-version", 15);
+ set("config-version", 15);
+
+ readConfig(PurpurConfig.class, null);
+ }
@@ -461,7 +461,7 @@ index 0000000000000000000000000000000000000000..6e7f56fe2b78d7a09d5d130f2c88338f
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7461319b935189fae47ef24cebee0fc1e058315e..4547dd9d4c1f9a35adf52c1cbbf23be9a9a23d68 100644
index c61ff190f04ac3d765d34f3eeb6a927d49f8d491..84858994a92380d71ae9c456853ab3ea54afa98e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -876,6 +876,7 @@ public final class CraftServer implements Server {

78
patches/server/0164-Add-back-player-spawned-endermite-API.patch Normal file
View File

@@ -0,0 +1,78 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Encode42 <me@encode42.dev>
Date: Tue, 9 Mar 2021 16:10:39 -0500
Subject: [PATCH] Add back player spawned endermite API
diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
index d9e2bc9d37968430910c8de33390004ba5db22a6..1578a8196f860995370a1b8938b6d71040f5d3a9 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
@@ -30,6 +30,7 @@ import net.minecraft.world.level.block.state.BlockState;
public class Endermite extends Monster {
private static final int MAX_LIFE = 2400;
private int life;
+ private boolean isPlayerSpawned; // Purpur
public Endermite(EntityType<? extends Endermite> type, Level world) {
super(type, world);
@@ -51,6 +52,14 @@ public class Endermite extends Monster {
public void initAttributes() {
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.endermiteMaxHealth);
}
+
+ public boolean isPlayerSpawned() {
+ return this.isPlayerSpawned;
+ }
+
+ public void setPlayerSpawned(boolean playerSpawned) {
+ this.isPlayerSpawned = playerSpawned;
+ }
// Purpur end
@Override
@@ -104,12 +113,14 @@ public class Endermite extends Monster {
public void readAdditionalSaveData(CompoundTag nbt) {
super.readAdditionalSaveData(nbt);
this.life = nbt.getInt("Lifetime");
+ this.isPlayerSpawned = nbt.getBoolean("PlayerSpawned"); // Purpur
}
@Override
public void addAdditionalSaveData(CompoundTag nbt) {
super.addAdditionalSaveData(nbt);
nbt.putInt("Lifetime", this.life);
+ nbt.putBoolean("PlayerSpawned", this.isPlayerSpawned); // Purpur
}
@Override
diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
index c2db9485e69b9679a33a57bc84cf2c76c1de2a42..6e4cffa397d07c9c0910f2a1ec0fb8bf04a1b6ba 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
@@ -72,6 +72,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
if (this.random.nextFloat() < this.level.purpurConfig.enderPearlEndermiteChance && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING)) { // Purpur
Endermite entityendermite = (Endermite) EntityType.ENDERMITE.create(this.level);
+ entityendermite.setPlayerSpawned(true); // Purpur
entityendermite.moveTo(entity.getX(), entity.getY(), entity.getZ(), entity.getYRot(), entity.getXRot());
this.level.addEntity(entityendermite, CreatureSpawnEvent.SpawnReason.ENDER_PEARL);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java
index 04976616da8c85b1278dad33ff05554aa74a6b33..046e0e174119e65686e74eaf11853e6832b90e80 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java
@@ -27,11 +27,11 @@ public class CraftEndermite extends CraftMonster implements Endermite {
@Override
public boolean isPlayerSpawned() {
- return false;
+ return getHandle().isPlayerSpawned(); // Purpur
}
@Override
public void setPlayerSpawned(boolean playerSpawned) {
- // Nop
+ getHandle().setPlayerSpawned(playerSpawned); // Purpur
}
}

28
patches/server/0164-Config-for-Enderman-to-aggro-spawned-Endermites.patch → patches/server/0165-Config-Enderman-aggressiveness-towards-Endermites.patch
View File

@@ -1,12 +1,11 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Encode42 <me@encode42.dev>
Date: Tue, 9 Mar 2021 16:10:39 -0500
Subject: [PATCH] Config for Enderman to aggro spawned Endermites
Subject: [PATCH] Config Enderman aggressiveness towards Endermites
By default, Enderman do not attack Endermites unless spawned by an Ender Pearl.
diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
index 3907b7cb559dabdd3cc347678d42071215c66a6c..91e23061ed8d40ba36cb8f10fc9ccbe482d2b893 100644
index 3907b7cb559dabdd3cc347678d42071215c66a6c..e8779b23b5e1a399dde19fc66d820101d61f36bc 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -114,7 +114,7 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -14,27 +13,38 @@ index 3907b7cb559dabdd3cc347678d42071215c66a6c..91e23061ed8d40ba36cb8f10fc9ccbe4
this.targetSelector.addGoal(1, new EnderMan.EndermanLookForPlayerGoal(this, this::isAngryAt));
this.targetSelector.addGoal(2, new HurtByTargetGoal(this, new Class[0]));
- this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Endermite.class, true, false));
+ this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Endermite.class, 10, true, false, (entityliving) -> entityliving instanceof Endermite && entityliving.level.purpurConfig.endermanAggroSpawnedEndermites)); // Purpur
+ this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Endermite.class, 10, true, false, (entityliving) -> entityliving.level.purpurConfig.endermanAggroEndermites && entityliving instanceof Endermite endermite && (!entityliving.level.purpurConfig.endermanAggroEndermitesOnlyIfPlayerSpawned || endermite.isPlayerSpawned()))); // Purpur
this.targetSelector.addGoal(4, new ResetUniversalAngerTargetGoal<>(this, false));
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 95058c3c61275407b9393c3fa874e7993c100ded..d854e7caa9533e0b91157d04458c08707deffe70 100644
index 3cdf1832a1552e10d8fc36d06200439bc36de7e1..f324621df51c8f84b0761e2ef60d57d37aecf1a8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -897,6 +897,7 @@ public class PurpurWorldConfig {
@@ -897,6 +897,8 @@ public class PurpurWorldConfig {
public boolean endermanDespawnEvenWithBlock = false;
public boolean endermanBypassMobGriefing = false;
public boolean endermanTakeDamageFromWater = true;
+ public boolean endermanAggroSpawnedEndermites = false;
+ public boolean endermanAggroEndermites = true;
+ public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -910,6 +911,7 @@ public class PurpurWorldConfig {
@@ -905,11 +907,17 @@ public class PurpurWorldConfig {
set("mobs.enderman.attributes.max-health", null);
set("mobs.enderman.attributes.max_health", oldValue);
}
+ if (PurpurConfig.version < 15) {
+ // remove old option
+ set("mobs.enderman.aggressive-towards-spawned-endermites", null);
+ }
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);
endermanBypassMobGriefing = getBoolean("mobs.enderman.bypass-mob-griefing", endermanBypassMobGriefing);
endermanTakeDamageFromWater = getBoolean("mobs.enderman.takes-damage-from-water", endermanTakeDamageFromWater);
+ endermanAggroSpawnedEndermites = getBoolean("mobs.enderman.aggressive-towards-spawned-endermites", endermanAggroSpawnedEndermites);
+ endermanAggroEndermites = getBoolean("mobs.enderman.aggressive-towards-endermites", endermanAggroEndermites);
+ endermanAggroEndermitesOnlyIfPlayerSpawned = getBoolean("mobs.enderman.aggressive-towards-endermites-only-spawned-by-player-thrown-ender-pearls", endermanAggroEndermitesOnlyIfPlayerSpawned);
}
public boolean endermiteRidable = false;

16
patches/server/0165-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch → patches/server/0166-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
View File

@@ -7,7 +7,7 @@ Prevents Enderman from becoming aggresive towards players that are wearing a Dra
Adds functionality to a useless item!
diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
index 91e23061ed8d40ba36cb8f10fc9ccbe482d2b893..a3d9a3182d76141cb7c0f8aaf601e1491cd73e45 100644
index e8779b23b5e1a399dde19fc66d820101d61f36bc..ba61f78874d8578b862f317fe00a3162c45253e0 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -250,7 +250,7 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -20,22 +20,22 @@ index 91e23061ed8d40ba36cb8f10fc9ccbe482d2b893..a3d9a3182d76141cb7c0f8aaf601e149
} else {
Vec3 vec3d = player.getViewVector(1.0F).normalize();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d854e7caa9533e0b91157d04458c08707deffe70..1f8d418043e21a9ec78e9511a1bda398f81533c3 100644
index f324621df51c8f84b0761e2ef60d57d37aecf1a8..973820013187457ee9dbae89159103e9140b3115 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -898,6 +898,8 @@ public class PurpurWorldConfig {
public boolean endermanBypassMobGriefing = false;
@@ -899,6 +899,8 @@ public class PurpurWorldConfig {
public boolean endermanTakeDamageFromWater = true;
public boolean endermanAggroSpawnedEndermites = false;
public boolean endermanAggroEndermites = true;
public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
+ public boolean endermanIgnorePlayerDragonHead = false;
+ public boolean endermanDisableStareAggro = false;
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -912,6 +914,8 @@ public class PurpurWorldConfig {
endermanBypassMobGriefing = getBoolean("mobs.enderman.bypass-mob-griefing", endermanBypassMobGriefing);
@@ -918,6 +920,8 @@ public class PurpurWorldConfig {
endermanTakeDamageFromWater = getBoolean("mobs.enderman.takes-damage-from-water", endermanTakeDamageFromWater);
endermanAggroSpawnedEndermites = getBoolean("mobs.enderman.aggressive-towards-spawned-endermites", endermanAggroSpawnedEndermites);
endermanAggroEndermites = getBoolean("mobs.enderman.aggressive-towards-endermites", endermanAggroEndermites);
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);
}

2
patches/server/0166-Tick-fluids-config.patch → patches/server/0167-Tick-fluids-config.patch
View File

@@ -36,7 +36,7 @@ index 087601ffdeea97ec4cbb9959607bdcbcbae7c6fa..ad24daa0c727df15dbe0549036290a6c
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1f8d418043e21a9ec78e9511a1bda398f81533c3..848424475771b6a76ec3f646e895ab62cf4afa03 100644
index 973820013187457ee9dbae89159103e9140b3115..bf20d52a22390b8b61bf5d7d7f12632133d0e7c5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -387,6 +387,7 @@ public class PurpurWorldConfig {

6
patches/server/0167-Config-to-disable-Llama-caravans.patch → patches/server/0168-Config-to-disable-Llama-caravans.patch
View File

@@ -32,10 +32,10 @@ index 873e1d64b917e961c9d9b5217fe664a91d0ab5bc..c31ffb302dba05d9771db7bd17993a1e
this.caravanHead.caravanTail = this;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 848424475771b6a76ec3f646e895ab62cf4afa03..30da1109a1eba6b1b1daedaead295f8406da0e73 100644
index bf20d52a22390b8b61bf5d7d7f12632133d0e7c5..7026ac6e77d248be658e223e662e69a952fe9181 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1159,6 +1159,7 @@ public class PurpurWorldConfig {
@@ -1165,6 +1165,7 @@ public class PurpurWorldConfig {
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
public int llamaBreedingTicks = 6000;
@@ -43,7 +43,7 @@ index 848424475771b6a76ec3f646e895ab62cf4afa03..30da1109a1eba6b1b1daedaead295f84
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1176,6 +1177,7 @@ public class PurpurWorldConfig {
@@ -1182,6 +1183,7 @@ public class PurpurWorldConfig {
llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks);

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

@@ -50,7 +50,7 @@ index c550b8c19837ed9bf730a3eb777bc00de4e7ceb2..02494dcc8a342f65b2855612aebeb019
private void spawnLingeringCloud() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 30da1109a1eba6b1b1daedaead295f8406da0e73..3111472648d224b8745f4bcca1ee7f208fd4e8fc 100644
index 7026ac6e77d248be658e223e662e69a952fe9181..353e220c37997f8d48645e811b2c75ac29f1dd72 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -772,6 +772,7 @@ public class PurpurWorldConfig {

6
patches/server/0169-Configurable-ravager-griefable-blocks-list.patch → patches/server/0170-Configurable-ravager-griefable-blocks-list.patch
View File

@@ -31,10 +31,10 @@ index 3c51e6d419a244b9270119590aa299527163c331..b466b0430dd94777975a1e7ab9792166
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3111472648d224b8745f4bcca1ee7f208fd4e8fc..5792990243d3db6d92b9f22f17ec36e438603be1 100644
index 353e220c37997f8d48645e811b2c75ac29f1dd72..256dd7999edbeb7f64509aea2f9bfad55564cf53 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1469,6 +1469,7 @@ public class PurpurWorldConfig {
@@ -1475,6 +1475,7 @@ public class PurpurWorldConfig {
public boolean ravagerRidableInWater = false;
public double ravagerMaxHealth = 100.0D;
public boolean ravagerBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index 3111472648d224b8745f4bcca1ee7f208fd4e8fc..5792990243d3db6d92b9f22f17ec36e4
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1479,6 +1480,23 @@ public class PurpurWorldConfig {
@@ -1485,6 +1486,23 @@ public class PurpurWorldConfig {
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
ravagerBypassMobGriefing = getBoolean("mobs.ravager.bypass-mob-griefing", ravagerBypassMobGriefing);

2
patches/server/0170-Sneak-to-bulk-process-composter.patch → patches/server/0171-Sneak-to-bulk-process-composter.patch
View File

@@ -62,7 +62,7 @@ index 4c9ae6bdb2f0358798f84928271a2d783dcba7b4..47bf769a031ae39cc72d2191195d1378
int i = (Integer) iblockdata.getValue(ComposterBlock.LEVEL);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5792990243d3db6d92b9f22f17ec36e438603be1..46b55243f074ecf8453eec11144c7b315510170a 100644
index 256dd7999edbeb7f64509aea2f9bfad55564cf53..0bf00191954f1b08661677f88b0c1c43f483eb5d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -471,6 +471,11 @@ public class PurpurWorldConfig {

2
patches/server/0171-Config-for-skipping-night.patch → patches/server/0172-Config-for-skipping-night.patch
View File

@@ -18,7 +18,7 @@ index dbdaadfaeea555904556136a7cca02aa59b85369..04b9a36d978b085d9cb35030c6e6395e
long l = this.levelData.getDayTime() + 24000L;
TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (l - l % 24000L) - this.getDayTime());
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 46b55243f074ecf8453eec11144c7b315510170a..2c91dfc369432355b407777820914d0b14da457f 100644
index 0bf00191954f1b08661677f88b0c1c43f483eb5d..3cae0929bd136ec3cfa5893980fa686fec9c9770 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -300,6 +300,7 @@ public class PurpurWorldConfig {

10
patches/server/0172-Add-config-for-villager-trading.patch → patches/server/0173-Add-config-for-villager-trading.patch
View File

@@ -31,10 +31,10 @@ index c48935d35a6141c41db22e3ec172d5994fd317a2..fa4644c11cbb252734a6f5dc21c861d2
this.openTradingScreen(player, this.getDisplayName(), 1);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2c91dfc369432355b407777820914d0b14da457f..fb29e86075ecbf23edd3ae7b5d520bdd275ad751 100644
index 3cae0929bd136ec3cfa5893980fa686fec9c9770..8e711033337bacb669deb1986a2a47f17ad8dc98 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1813,6 +1813,7 @@ public class PurpurWorldConfig {
@@ -1819,6 +1819,7 @@ public class PurpurWorldConfig {
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index 2c91dfc369432355b407777820914d0b14da457f..fb29e86075ecbf23edd3ae7b5d520bdd
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1840,6 +1841,7 @@ public class PurpurWorldConfig {
@@ -1846,6 +1847,7 @@ public class PurpurWorldConfig {
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
@@ -50,7 +50,7 @@ index 2c91dfc369432355b407777820914d0b14da457f..fb29e86075ecbf23edd3ae7b5d520bdd
}
public boolean vindicatorRidable = false;
@@ -1863,6 +1865,7 @@ public class PurpurWorldConfig {
@@ -1869,6 +1871,7 @@ public class PurpurWorldConfig {
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
@@ -58,7 +58,7 @@ index 2c91dfc369432355b407777820914d0b14da457f..fb29e86075ecbf23edd3ae7b5d520bdd
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1874,6 +1877,7 @@ public class PurpurWorldConfig {
@@ -1880,6 +1883,7 @@ public class PurpurWorldConfig {
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);

2
patches/server/0173-Allow-infinity-on-crossbows.patch → patches/server/0174-Allow-infinity-on-crossbows.patch
View File

@@ -59,7 +59,7 @@ index 6f6106ca4d74d50a7b74b086adc96c58c7906cb6..d6417c1e77ac8823e18a179dc9f61757
public abstract boolean canEnchant(Item item);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 639e408b7f1db13524be6a9dc10474bbecac6d2d..709cae4bc41fe18dd8e4f270729cc71191614d03 100644
index 64748248817886cf56b76ea325975760d5713f2b..aed9304d8f14070d17134b117fb94170f367cb3e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -320,6 +320,7 @@ public class PurpurConfig {

4
patches/server/0174-Drowning-Settings.patch → patches/server/0175-Drowning-Settings.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Drowning Settings
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 158691a1912155390751698a833b1375a2b8e613..b0405b5a7456561e49bdd4eaf3fd616c283180d7 100644
index 59c2cd680830b87d6f412020672a0a156800b7fc..8223d014a00c09b0d3ee392b3a079f42dc67237a 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2932,7 +2932,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -40,7 +40,7 @@ index c123e723d4fc3202eb7a4c74a356ffcde19e2ba5..0a50c0d3450430de9b6251aa65a8bfc8
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fb29e86075ecbf23edd3ae7b5d520bdd275ad751..eb5f6bb989f82e74a7420ac62215fd09fafd4335 100644
index 8e711033337bacb669deb1986a2a47f17ad8dc98..b2af89516f18d16c87c949e66519cc693675d8e4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -111,6 +111,15 @@ public class PurpurWorldConfig {

2
patches/server/0175-Break-individual-slabs-when-sneaking.patch → patches/server/0176-Break-individual-slabs-when-sneaking.patch
View File

@@ -47,7 +47,7 @@ index eb7f8907bb362c0461194bbaf62917ce71c669f3..89f5e0d26500f1806dff9f91390546cd
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index eb5f6bb989f82e74a7420ac62215fd09fafd4335..644d01b09e35e385610185147c8444b1b34e4b4a 100644
index b2af89516f18d16c87c949e66519cc693675d8e4..593603eb6b014fe711ffecd8d4397366633878d2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -592,6 +592,11 @@ public class PurpurWorldConfig {

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

@@ -22,7 +22,7 @@ index fc34cfa8bfb3b82a8e1b28d261f0e901d837467e..35d47bb0d8c4a2b8374564133f040899
return false;
} else {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 644d01b09e35e385610185147c8444b1b34e4b4a..90b882c5dd10edc9094291f2735de7eb1cb5b09b 100644
index 593603eb6b014fe711ffecd8d4397366633878d2..3517de061b0278e2107be1539dd9e8ac7c2a75fe 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -544,8 +544,12 @@ public class PurpurWorldConfig {

2
patches/server/0177-Config-to-show-Armor-Stand-arms-on-spawn.patch → patches/server/0178-Config-to-show-Armor-Stand-arms-on-spawn.patch
View File

@@ -17,7 +17,7 @@ index d119f8ab447bc17deabc494463de496161c9b126..c9a44a4765f43b9c0247ed1005f4c134
public ArmorStand(Level world, double x, double y, double z) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 90b882c5dd10edc9094291f2735de7eb1cb5b09b..a1e95aeb3394f10e7a5aaffab95a81b8cbb42bb2 100644
index 3517de061b0278e2107be1539dd9e8ac7c2a75fe..897ab21292b3ec1dfff3802caa6cd4ee3b1c45b7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -95,6 +95,7 @@ public class PurpurWorldConfig {

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

@@ -67,7 +67,7 @@ index c903a1a8d2234bb0fa354d1c44ff3ab2275b04c7..d01e4064a772710c1383927e0848b9b3
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a1e95aeb3394f10e7a5aaffab95a81b8cbb42bb2..c964610e6f9d3337d4824740681db91362932872 100644
index 897ab21292b3ec1dfff3802caa6cd4ee3b1c45b7..cf27ecc93f92d57d25d1721fbb54af334ac725f8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -496,6 +496,16 @@ public class PurpurWorldConfig {

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

@@ -44,7 +44,7 @@ index 5bd25f8b8a554b965665b3f5686c14189b51f28e..4be9924556e0f447dbe6a53c2d4cb7fb
this.getOrCreateTag().put(key, tag);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 709cae4bc41fe18dd8e4f270729cc71191614d03..62d3b002da6946af256144de3c1cf29d3f8ef515 100644
index aed9304d8f14070d17134b117fb94170f367cb3e..c386351bac49aeb419305f69253d388719f5b318 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -321,6 +321,7 @@ public class PurpurConfig {

2
patches/server/0180-Configurable-sponge-absorption.patch → patches/server/0181-Configurable-sponge-absorption.patch
View File

@@ -43,7 +43,7 @@ index 1ef8eadd4e59f2e5d2bbd84f6f9bcf37b59db5bd..5b10e1110f938745c8f9ed0b55960566
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c964610e6f9d3337d4824740681db91362932872..0fccb3e1eb53d74aa74a131cab8c52c086c738ef 100644
index cf27ecc93f92d57d25d1721fbb54af334ac725f8..fd195e7263cd3efdd0a8161b474e2dc910261543 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -618,6 +618,13 @@ public class PurpurWorldConfig {

2
patches/server/0181-Projectile-offset-config.patch → patches/server/0182-Projectile-offset-config.patch
View File

@@ -96,7 +96,7 @@ index 3f53dc8f250ad3f7616ce7ef0a2353caa0ab1879..29130aa9673a3956030f3e43b784ac46
entitythrowntrident.pickup = AbstractArrow.Pickup.CREATIVE_ONLY;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0fccb3e1eb53d74aa74a131cab8c52c086c738ef..c3ea0fba956f36e9c0d1afa8a16b17a56b78ce25 100644
index fd195e7263cd3efdd0a8161b474e2dc910261543..061db49f1c88a34e055fd8da01a7a68d3b067cca 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -363,6 +363,23 @@ public class PurpurWorldConfig {

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

@@ -18,7 +18,7 @@ index 7fddb6fa8fd30ef88346a59f7867aae792f13772..40893e71fe8447b695350273bef9623b
} else {
int j = pos.getX();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c3ea0fba956f36e9c0d1afa8a16b17a56b78ce25..2b98c2b109ab5b8f9067633ead23c4c1a29e2a1a 100644
index 061db49f1c88a34e055fd8da01a7a68d3b067cca..7dee737fdfed09ac46490a5f2b785f150007d66a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -630,6 +630,11 @@ public class PurpurWorldConfig {

6
patches/server/0183-Piglin-portal-spawn-modifier.patch → patches/server/0184-Piglin-portal-spawn-modifier.patch
View File

@@ -31,10 +31,10 @@ index fef1027829c44957e23c0a121033bfb7640d06f0..c42349d0f6b0025525278295b36f4030
pos = pos.below();
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c7ea74eaab5372bb598d9e339198b99e2b78a3a3..90779057a89e67889161e07949fb49e0cc0f3478 100644
index 7dee737fdfed09ac46490a5f2b785f150007d66a..75b6c771f2a127202280a583ab6588295c3152bc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1434,6 +1434,7 @@ public class PurpurWorldConfig {
@@ -1440,6 +1440,7 @@ public class PurpurWorldConfig {
public boolean piglinRidableInWater = false;
public double piglinMaxHealth = 16.0D;
public boolean piglinBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index c7ea74eaab5372bb598d9e339198b99e2b78a3a3..90779057a89e67889161e07949fb49e0
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1444,6 +1445,7 @@ public class PurpurWorldConfig {
@@ -1450,6 +1451,7 @@ public class PurpurWorldConfig {
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
piglinBypassMobGriefing = getBoolean("mobs.piglin.bypass-mob-griefing", piglinBypassMobGriefing);

2
patches/server/0184-Config-to-change-max-number-of-bees.patch → patches/server/0185-Config-to-change-max-number-of-bees.patch
View File

@@ -18,7 +18,7 @@ index 8484e80a70129fb0358d56efab6fd54798b54e6e..ffacc4b8cc3ab8285c4131aec58e48ff
public BeehiveBlockEntity(BlockPos pos, BlockState state) {
super(BlockEntityType.BEEHIVE, pos, state);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 62d3b002da6946af256144de3c1cf29d3f8ef515..aebb1879ec9609b6c25be680a5781b409f50a500 100644
index c386351bac49aeb419305f69253d388719f5b318..c7686591a00253ff15f1a080d4e5e14ab21765eb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -302,6 +302,7 @@ public class PurpurConfig {

4
patches/server/0185-Configurable-damage-settings-for-magma-blocks.patch → patches/server/0186-Configurable-damage-settings-for-magma-blocks.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable damage settings for magma blocks
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index b0405b5a7456561e49bdd4eaf3fd616c283180d7..600f28d018c6792636ce28c64a6f6ff1e990a84d 100644
index 8223d014a00c09b0d3ee392b3a079f42dc67237a..9fcba5b2b35b83675a032a0ace1605d35a65380b 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1001,7 +1001,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -31,7 +31,7 @@ index 5d844ed98b916298a657d5e9766ab7f383a304e0..0129460ce1ca199a47b6657f824c75fd
entity.hurt(DamageSource.HOT_FLOOR, 1.0F);
org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9c6cdcdadd0b5d329565280d864389297dafa503..87ed54d38edd0bed1b62a28a09d1443f7aec6198 100644
index 75b6c771f2a127202280a583ab6588295c3152bc..7e4a41ea3b842dd2fe1e7b8159d59286c9c884ef 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -597,6 +597,13 @@ public class PurpurWorldConfig {

6
patches/server/0186-Config-for-wither-explosion-radius.patch → patches/server/0187-Config-for-wither-explosion-radius.patch
View File

@@ -18,10 +18,10 @@ index 430aa10101d9f21561155941ff24441fd0c4103a..de91f0dd7f9a62e5a96b4cc3e4f505ec
if (!event.isCancelled()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 87ed54d38edd0bed1b62a28a09d1443f7aec6198..467617ed9179b5a13e29a13f31b53d725af18104 100644
index 7e4a41ea3b842dd2fe1e7b8159d59286c9c884ef..f374f4feee29c798416eec156af3f90af96199b2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1970,6 +1970,7 @@ public class PurpurWorldConfig {
@@ -1976,6 +1976,7 @@ public class PurpurWorldConfig {
public int witherHealthRegenDelay = 20;
public boolean witherBypassMobGriefing = false;
public boolean witherCanRideVehicles = false;
@@ -29,7 +29,7 @@ index 87ed54d38edd0bed1b62a28a09d1443f7aec6198..467617ed9179b5a13e29a13f31b53d72
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1988,6 +1989,7 @@ public class PurpurWorldConfig {
@@ -1994,6 +1995,7 @@ public class PurpurWorldConfig {
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);

2
patches/server/0187-Gamemode-extra-permissions.patch → patches/server/0188-Gamemode-extra-permissions.patch
View File

@@ -54,7 +54,7 @@ index 79f6089b934124c3309c6bee2e48b36b937252e0..dff8ef0a1a2e52792070d93685c29002
for(ServerPlayer serverPlayer : targets) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index aebb1879ec9609b6c25be680a5781b409f50a500..324346d34ea7decb94700189b5e0231ca92f3d61 100644
index c7686591a00253ff15f1a080d4e5e14ab21765eb..4ae94c8df21508ccfb4dcccf5fbdc56ce878c47f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -298,6 +298,11 @@ public class PurpurConfig {

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

@@ -18,7 +18,7 @@ index e5562b407bba35ab93bf8bc3c22ac9d45e8353cb..c688bb73cd062f36524cfc231cb691f2
if (blockState2 != null && level.getBlockState(blockPos.above()).isAir()) {
level.playSound(player, blockPos, SoundEvents.SHOVEL_FLATTEN, SoundSource.BLOCKS, 1.0F, 1.0F);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 467617ed9179b5a13e29a13f31b53d725af18104..0588f31fb8310f9f4d28ad72fc182afc9eb9bc33 100644
index f374f4feee29c798416eec156af3f90af96199b2..c5dd8489877f6ff62db785bc0811b506d5556350 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -380,6 +380,21 @@ public class PurpurWorldConfig {

2
patches/server/0189-Configurable-piston-push-limit.patch → patches/server/0190-Configurable-piston-push-limit.patch
View File

@@ -36,7 +36,7 @@ index 744d91546d1a810f60a43c15ed74b4158f341a4a..354538daefa603f6df5a139b6bff87db
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0588f31fb8310f9f4d28ad72fc182afc9eb9bc33..4fe679fb63e11ba0a28878ffcc11380de2841afb 100644
index c5dd8489877f6ff62db785bc0811b506d5556350..21470690bc7acda4b9d5c32eb7ee80498bacd940 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -619,6 +619,11 @@ public class PurpurWorldConfig {

4
patches/server/0190-Configurable-broadcast-settings.patch → patches/server/0191-Configurable-broadcast-settings.patch
View File

@@ -17,7 +17,7 @@ index c46df052a5a39d92688f51377ee1f7b5b5b36faa..d7d2a975386cecb0d50b4f7ed37de8ad
// Paper end
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 177c61a306b9e07eb7aabbac664616cc23bfef5b..4775d9feb52dc899a30d34cdc0ab84149f085d8c 100644
index d5ee740792699f2eab3965d4920de913bd76f18e..434558824edd85809a747a436f2ad429e57a618c 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -874,6 +874,7 @@ public class ServerPlayer extends Player {
@@ -29,7 +29,7 @@ index 177c61a306b9e07eb7aabbac664616cc23bfef5b..4775d9feb52dc899a30d34cdc0ab8414
if (scoreboardteambase.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
this.server.getPlayerList().broadcastToTeam((Player) this, ichatbasecomponent);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 324346d34ea7decb94700189b5e0231ca92f3d61..045856a67bde9eba5a1cce960b9e93e1bb5b76bb 100644
index 4ae94c8df21508ccfb4dcccf5fbdc56ce878c47f..e152eb5884bc564e15415cd50b3942913825c13d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -150,6 +150,18 @@ public class PurpurConfig {

0
patches/server/0191-Fix-SPIGOT-6278.patch → patches/server/0192-Fix-SPIGOT-6278.patch
View File

2
patches/server/0192-Configurable-mob-blindness.patch → patches/server/0193-Configurable-mob-blindness.patch
View File

@@ -28,7 +28,7 @@ index 0a50c0d3450430de9b6251aa65a8bfc8633a8502..521a353a1de6573b7e4fcebc673494cd
return d0;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4fe679fb63e11ba0a28878ffcc11380de2841afb..151151c72a36062cb3081d218e509a79fe8a2b47 100644
index 21470690bc7acda4b9d5c32eb7ee80498bacd940..8481c6e6b4efacdabdd679fb3d36c6b7ff9e1fd7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -433,6 +433,7 @@ public class PurpurWorldConfig {

2
patches/server/0193-Hide-hidden-players-from-entity-selector.patch → patches/server/0194-Hide-hidden-players-from-entity-selector.patch
View File

@@ -59,7 +59,7 @@ index 0fb8f32427843f4bfd90ab88ecb3ab3e4a4fda31..f99f1ba7f912a2fd503e12c446b342a8
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 045856a67bde9eba5a1cce960b9e93e1bb5b76bb..2dc870397edf29c111fb5cc8a14f858f1c83672c 100644
index e152eb5884bc564e15415cd50b3942913825c13d..36912a7cfd3efd49cefbbaf9dc7110de105cd638 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -311,8 +311,10 @@ public class PurpurConfig {

2
patches/server/0194-Config-for-health-to-impact-Creeper-explosion-radius.patch → patches/server/0195-Config-for-health-to-impact-Creeper-explosion-radius.patch
View File

@@ -21,7 +21,7 @@ index 02494dcc8a342f65b2855612aebeb019095abf65..d66c8866f3c6b1412a6c1876c62e3b29
if (!event.isCancelled()) {
this.dead = true;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 151151c72a36062cb3081d218e509a79fe8a2b47..6802e8508536a412b58a68383b19f3b2f7d83443 100644
index 8481c6e6b4efacdabdd679fb3d36c6b7ff9e1fd7..0f5085a4d36c0f36043618cfd724141ec88de44b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -868,6 +868,7 @@ public class PurpurWorldConfig {

6
patches/server/0195-Iron-golem-poppy-calms-anger.patch → patches/server/0196-Iron-golem-poppy-calms-anger.patch
View File

@@ -17,10 +17,10 @@ index f4e983da7206923ee0b0f984e65a6c2b3a6a8aeb..cea3725009af1bc746a593c4db63ed63
this.goalSelector.addGoal(2, new MoveTowardsTargetGoal(this, 0.9D, 32.0F));
this.goalSelector.addGoal(2, new MoveBackToVillageGoal(this, 0.6D, false));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6802e8508536a412b58a68383b19f3b2f7d83443..7f48b0ccc6234044c57bd90450b23fa3ba4ea2bc 100644
index 0f5085a4d36c0f36043618cfd724141ec88de44b..92f0c19656f852fa2c6688e7d638362f7ce9022c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1237,6 +1237,7 @@ public class PurpurWorldConfig {
@@ -1243,6 +1243,7 @@ public class PurpurWorldConfig {
public boolean ironGolemRidableInWater = false;
public boolean ironGolemCanSwim = false;
public double ironGolemMaxHealth = 100.0D;
@@ -28,7 +28,7 @@ index 6802e8508536a412b58a68383b19f3b2f7d83443..7f48b0ccc6234044c57bd90450b23fa3
private void ironGolemSettings() {
ironGolemRidable = getBoolean("mobs.iron_golem.ridable", ironGolemRidable);
ironGolemRidableInWater = getBoolean("mobs.iron_golem.ridable-in-water", ironGolemRidableInWater);
@@ -1247,6 +1248,7 @@ public class PurpurWorldConfig {
@@ -1253,6 +1254,7 @@ public class PurpurWorldConfig {
set("mobs.iron_golem.attributes.max_health", oldValue);
}
ironGolemMaxHealth = getDouble("mobs.iron_golem.attributes.max_health", ironGolemMaxHealth);

6
patches/server/0196-Breedable-parrots.patch → patches/server/0197-Breedable-parrots.patch
View File

@@ -50,10 +50,10 @@ index 553b0aff0ccc5baf41d5faae1a2fd88249dd5a74..3da2b68fb03a80676d7a5eed271499f6
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7f48b0ccc6234044c57bd90450b23fa3ba4ea2bc..a81eb34270e9d1516e296eeff3bb234daa417ea5 100644
index 92f0c19656f852fa2c6688e7d638362f7ce9022c..d479eed0bccc72b5dd38c308f0ed60ca969c6a32 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1373,6 +1373,7 @@ public class PurpurWorldConfig {
@@ -1379,6 +1379,7 @@ public class PurpurWorldConfig {
public boolean parrotRidableInWater = false;
public double parrotMaxY = 256D;
public double parrotMaxHealth = 6.0D;
@@ -61,7 +61,7 @@ index 7f48b0ccc6234044c57bd90450b23fa3ba4ea2bc..a81eb34270e9d1516e296eeff3bb234d
private void parrotSettings() {
parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable);
parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater);
@@ -1383,6 +1384,7 @@ public class PurpurWorldConfig {
@@ -1389,6 +1390,7 @@ public class PurpurWorldConfig {
set("mobs.parrot.attributes.max_health", oldValue);
}
parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth);

2
patches/server/0197-Configurable-powered-rail-boost-modifier.patch → patches/server/0198-Configurable-powered-rail-boost-modifier.patch
View File

@@ -18,7 +18,7 @@ index 1e3077a22d9d3d26356b865001dcce81c9c1d7e5..cc57ff699d159a0cc748e91b61d53965
Vec3 vec3d5 = this.getDeltaMovement();
double d21 = vec3d5.x;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a81eb34270e9d1516e296eeff3bb234daa417ea5..714f6c7f7773c0d0df71d5c32f632734fe4fcf17 100644
index d479eed0bccc72b5dd38c308f0ed60ca969c6a32..29155dc3f7fd721a83510b1ba3a8435e97b30fc4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -216,6 +216,7 @@ public class PurpurWorldConfig {

2
patches/server/0198-Add-config-change-multiplier-critical-damage-value.patch → patches/server/0199-Add-config-change-multiplier-critical-damage-value.patch
View File

@@ -18,7 +18,7 @@ index f4f49b87b615a3c7ef56247896392de93eb1bb0d..dfe78217add616c761ba53fb4999cc65
f += f1;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 714f6c7f7773c0d0df71d5c32f632734fe4fcf17..6f9bb652abddc32c6581b3b58b8feed04b0a5e59 100644
index 29155dc3f7fd721a83510b1ba3a8435e97b30fc4..db3fc52dd68f351d3719ce706a1577348324d904 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -314,6 +314,7 @@ public class PurpurWorldConfig {

2
patches/server/0199-Option-to-disable-dragon-egg-teleporting.patch → patches/server/0200-Option-to-disable-dragon-egg-teleporting.patch
View File

@@ -17,7 +17,7 @@ index 78f51f3dd0e7249af69228479da932e9aea982d6..d9d4421f7f316281487828739168cfd6
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/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6f9bb652abddc32c6581b3b58b8feed04b0a5e59..3c93fa06d7109987ef1d61dab6d0d12c55a6169e 100644
index db3fc52dd68f351d3719ce706a1577348324d904..5bc7dcb5934d3e4f755db5623fa115800a46bd87 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -544,6 +544,11 @@ public class PurpurWorldConfig {

2
patches/server/0200-Config-for-unverified-username-message.patch → patches/server/0201-Config-for-unverified-username-message.patch
View File

@@ -18,7 +18,7 @@ index 5d26417b5d4e182fdefdf1ef5c81a0b7d7f2d4c1..43090b05642d252fd5b3d4a65149beab
}
} catch (AuthenticationUnavailableException authenticationunavailableexception) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 2e869dab6955691a1b0bada5251544d7f345845f..feba60bd2e4d8bb2a23d956ca53b60ff8c493e39 100644
index 36912a7cfd3efd49cefbbaf9dc7110de105cd638..598f058a5719e5f12467cb04a38e8aad3332a7c7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -139,6 +139,7 @@ public class PurpurConfig {

2
patches/server/0201-Make-anvil-cumulative-cost-configurable.patch → patches/server/0202-Make-anvil-cumulative-cost-configurable.patch
View File

@@ -18,7 +18,7 @@ index 2dbc71a3d76cc87e2683b8f351bd8db04481855e..44ecc27fd9bd5a02656321cf8c69bbae
public void setItemName(String newItemName) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 05c219bc29db631ded5b5f48ac4d6ac0641616fb..8b5f2de46838e8c7c9e3ca6dfbd72bdbc6d82036 100644
index 598f058a5719e5f12467cb04a38e8aad3332a7c7..cd5a0a47fe705b7ef9e257f9fd89d3a7b660af5c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -324,6 +324,7 @@ public class PurpurConfig {

2
patches/server/0202-ShulkerBox-allow-oversized-stacks.patch → patches/server/0203-ShulkerBox-allow-oversized-stacks.patch
View File

@@ -35,7 +35,7 @@ index b9c558060024d380e89116489c7fc12ad88db8ad..0a0a4be15bed899812fcd4af0e311f5f
CompoundTag compoundTag = shulkerBoxBlockEntity.saveToTag(new CompoundTag());
if (!compoundTag.isEmpty()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3c93fa06d7109987ef1d61dab6d0d12c55a6169e..4d9af4cc29a6a7cfb25f9cd9f083df8c54be591d 100644
index 5bc7dcb5934d3e4f755db5623fa115800a46bd87..94136f0a74e71fedbf64b17e760bf2093a090a23 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -656,6 +656,11 @@ public class PurpurWorldConfig {

2
patches/server/0203-Bee-can-work-when-raining-or-at-night.patch → patches/server/0204-Bee-can-work-when-raining-or-at-night.patch
View File

@@ -31,7 +31,7 @@ index ffacc4b8cc3ab8285c4131aec58e48ffa9e1952e..e0e039e2f614f2df48d8d1b6e8bbbe7a
return false;
} else {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4d9af4cc29a6a7cfb25f9cd9f083df8c54be591d..5457074dfb6def1335ccb6ddd2c3fb3b7a7ba5fe 100644
index 94136f0a74e71fedbf64b17e760bf2093a090a23..69bad8e2f93f888000ab8bfa195660413025048c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -760,6 +760,8 @@ public class PurpurWorldConfig {

2
patches/server/0204-API-for-any-mob-to-burn-daylight.patch → patches/server/0205-API-for-any-mob-to-burn-daylight.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] API for any mob to burn daylight
Co-authored by: Encode42 <me@encode42.dev>
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 600f28d018c6792636ce28c64a6f6ff1e990a84d..7f89c659f7fa51bdbf5d7f4aecc5026ded27d806 100644
index 9fcba5b2b35b83675a032a0ace1605d35a65380b..351a59c2e13f4180fc5eb3e77d9c239d0ae8b165 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4265,5 +4265,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

0
patches/server/0205-Fix-advancement-triggers-on-entity-death.patch → patches/server/0206-Fix-advancement-triggers-on-entity-death.patch
View File

2
patches/server/0206-Config-MobEffect-by-world.patch → patches/server/0207-Config-MobEffect-by-world.patch
View File

@@ -40,7 +40,7 @@ index 79e036d79dec2ec4404baf02c23ba5ccad20cdce..6706d8e6d43cc5f3058f08fdfde77bed
((ServerPlayer) entityhuman).connection.send(new ClientboundSetHealthPacket(((ServerPlayer) entityhuman).getBukkitEntity().getScaledHealth(), entityhuman.getFoodData().foodLevel, entityhuman.getFoodData().saturationLevel));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5457074dfb6def1335ccb6ddd2c3fb3b7a7ba5fe..3370e9ac545ab8e17a977cbe80c21eb68c229365 100644
index 69bad8e2f93f888000ab8bfa195660413025048c..d7a26b6388ef65b44b607b89af75b3bb470b5ba6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -272,6 +272,21 @@ public class PurpurWorldConfig {

2
patches/server/0207-Beacon-Activation-Range-Configurable.patch → patches/server/0208-Beacon-Activation-Range-Configurable.patch
View File

@@ -26,7 +26,7 @@ index c1a0b0d77b8783fd127b68449a209ec0e62e6005..4e7f7ac51a4777bbda4939c6ecc3edc9
} else {
return effectRange;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3370e9ac545ab8e17a977cbe80c21eb68c229365..aa80f80dbc9fc8928eb2cf596c5d2e1298bdbdb6 100644
index d7a26b6388ef65b44b607b89af75b3bb470b5ba6..9418035053aab66926b12f57915a6abeb7f18cd2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -509,6 +509,17 @@ public class PurpurWorldConfig {

2
patches/server/0208-Add-toggle-for-sand-duping-fix.patch → patches/server/0209-Add-toggle-for-sand-duping-fix.patch
View File

@@ -27,7 +27,7 @@ index 8336ea928faa92c6f58f8cdfb9faf1d8e26c9ccf..c765c182081fe83eb0f30dcbf97d8126
}
// Paper end - fix sand duping
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index aa80f80dbc9fc8928eb2cf596c5d2e1298bdbdb6..1ea4b72c5cf02801ff3ffc970354585a55cd95f1 100644
index 9418035053aab66926b12f57915a6abeb7f18cd2..31846035dbfd3320b8ad144e5f2737a0fa9e074c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -682,6 +682,11 @@ public class PurpurWorldConfig {

4
patches/server/0209-Add-toggle-for-end-portal-safe-teleporting.patch → patches/server/0210-Add-toggle-for-end-portal-safe-teleporting.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add toggle for end portal safe teleporting
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 7f89c659f7fa51bdbf5d7f4aecc5026ded27d806..ce89b0e7d544c89040605c9411ebcf27cda001c2 100644
index 351a59c2e13f4180fc5eb3e77d9c239d0ae8b165..39f84df6f7a9272c14066dff9145b8ecdafb60db 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2749,7 +2749,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -45,7 +45,7 @@ index 197482e1ace23c3de002242097a68c6cc297cd3f..428875a6a99a619d337e2a7bbd2cb182
entity.portalWorld = ((ServerLevel)world);
entity.portalBlock = pos.immutable();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1ea4b72c5cf02801ff3ffc970354585a55cd95f1..e73ddc1a78e458e9523ee73d6105dac0b560872a 100644
index 31846035dbfd3320b8ad144e5f2737a0fa9e074c..1a94a68e206eef5f9d4c3e5af49ef03690ee13ea 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -624,6 +624,11 @@ public class PurpurWorldConfig {

0
patches/server/0210-Flying-Fall-Damage-API.patch → patches/server/0211-Flying-Fall-Damage-API.patch
View File

2
patches/server/0211-Make-lightning-rod-range-configurable.patch → patches/server/0212-Make-lightning-rod-range-configurable.patch
View File

@@ -18,7 +18,7 @@ index 04b9a36d978b085d9cb35030c6e6395e41c8c758..c4d583c21cd95e02ff04dfa7cdd3ed1a
return optional.map((blockposition1) -> {
return blockposition1.above(1);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 8b5f2de46838e8c7c9e3ca6dfbd72bdbc6d82036..eaa0fcff033d59189475f7c04c5a3f2fc5421469 100644
index cd5a0a47fe705b7ef9e257f9fd89d3a7b660af5c..4776955acf6770a5b5a8c783f68523a7c0d47483 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -325,6 +325,7 @@ public class PurpurConfig {

2
patches/server/0212-Burp-after-eating-food-fills-hunger-bar-completely.patch → patches/server/0213-Burp-after-eating-food-fills-hunger-bar-completely.patch
View File

@@ -55,7 +55,7 @@ index 97133bd4af30d0ba92cbf884b83140f3399f92e2..c1130952e3fa22abaa27fcc1c4761c83
public void eat(Item item, ItemStack stack) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e73ddc1a78e458e9523ee73d6105dac0b560872a..4ed14e29855dee6af60d5674da4d771864a12a40 100644
index 1a94a68e206eef5f9d4c3e5af49ef03690ee13ea..6629addad421042fae15d1b70c0a8d51ecf5f3e2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -330,6 +330,7 @@ public class PurpurWorldConfig {

0
patches/server/0213-Allow-player-join-full-server-by-permission.patch → patches/server/0214-Allow-player-join-full-server-by-permission.patch
View File

4
patches/server/0214-Populator-seed-controls.patch → patches/server/0215-Populator-seed-controls.patch
View File

@@ -39,10 +39,10 @@ index a7a7e6cd87270e64a92448f03f8b0b0c7e375ec7..9fb19162c0e436122087d03d37b502a1
try {
region.setCurrentlyGenerating(supplier3);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4ed14e29855dee6af60d5674da4d771864a12a40..6eb1b895517436a552796d416c3785556fe57c05 100644
index 6629addad421042fae15d1b70c0a8d51ecf5f3e2..9c766351673b66f02db3b88ef7b1651e63779307 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -2236,4 +2236,20 @@ public class PurpurWorldConfig {
@@ -2242,4 +2242,20 @@ public class PurpurWorldConfig {
zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
}