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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@850b736 Close PRs opened from orgs or bot accounts (#10281)
PaperMC/Paper@54a2340 check if itemstack is stackable first (#10285)
PaperMC/Paper@9c4bb0d add rich message component support to configuration (#10225)
PaperMC/Paper@8870d22 Fire EntityDamageByEntityEvent for unowned wither skulls patch (#10244)
PaperMC/Paper@bbc03d8 improve BanList types (#10239)
PaperMC/Paper@ce5c8dd Configurable max block/fluid ticks (#10266)
PaperMC/Paper@880fef7 Deprecate extra ban methods with raw BanEntry (#9580)
PaperMC/Paper@60218cd Don't tick empty worlds (#9025)
PaperMC/Paper@b21eb4d add overloads to use suspicious effect entry to mushroom cow and suspicious stew meta (#10245)
PaperMC/Paper@89d51d5 Allow enabling sand duping (#10191)
PaperMC/Paper@6ad63fb Per world ticks per spawn settings (#6891)
This commit is contained in:
granny
2024-03-03 23:38:36 -08:00
parent d80fbedf5d
commit 642956fe61
150 changed files with 412 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.20.4-R0.1-SNAPSHOT
mcVersion = 1.20.4
paperCommit = 681bbff110d9a56152ae898c4dfe1c0356b40e69
paperCommit = 6ad63fba30e7ecd1b11bb8d77e8ed43f0a6e9ce9
org.gradle.caching = true
org.gradle.parallel = true

4
patches/api/0003-Purpur-config-files.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index b4f8281d3797ec825a7671f38077cd65d5a1d76e..86807781e9d80544d822c979493e16cdcedac962 100644
index 0eb61b090d6f8fa6d99735ff3680dac774c52c1f..771f9f054268aa574b76c976b4734595b529aae9 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2214,6 +2214,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2229,6 +2229,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
}
// Paper end

4
patches/api/0005-Purpur-client-support.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 254a02ddb5dc867c9dd6c2086791f7ab94247fd3..37b1f55923d0a2aae79ebe4e5b06c7944ba5eeff 100644
index c6cb4f17469a8f2e60dd3e28d41402851ce5fb21..6692bc3bedf0f78a3b8cd937e1943d1113e51584 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3687,4 +3687,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3711,4 +3711,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end

4
patches/api/0010-AFK-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 37b1f55923d0a2aae79ebe4e5b06c7944ba5eeff..9386029164f5cd1e38f0e54a42e2c1c8a8f21cf6 100644
index 6692bc3bedf0f78a3b8cd937e1943d1113e51584..654516bb7545d74a9e00efc154b5b75707038c96 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3695,5 +3695,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3719,5 +3719,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return True if Player uses Purpur Client
*/
public boolean usesPurpurClient();

8
patches/api/0011-Bring-back-server-name.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index ca27559cf4aa1c2e44fdca2022e213b1b1c80f4e..07632f62a75c1e43be8386786d21f16f9cad895f 100644
index db46e3233edf18bd91a6da8612ccc9f0080d5c17..13eeaf8a59c83ecfdbdb8cf62e78fd70b00d170b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2862,4 +2862,15 @@ public final class Bukkit {
@@ -2878,4 +2878,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index ca27559cf4aa1c2e44fdca2022e213b1b1c80f4e..07632f62a75c1e43be8386786d21f16f
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 86807781e9d80544d822c979493e16cdcedac962..13de03608bf8ec8892754b48a1016bc0e76ea5f7 100644
index 771f9f054268aa574b76c976b4734595b529aae9..5e44a3cb8b8865e760d2f600af1351259b2867fe 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2509,4 +2509,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2524,4 +2524,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API

8
patches/api/0014-Lagging-threshold.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 07632f62a75c1e43be8386786d21f16f9cad895f..96f63969955af4baf93aff1bae9fcb8b73a4f62b 100644
index 13eeaf8a59c83ecfdbdb8cf62e78fd70b00d170b..812d903e8883ab087ec7ae154d76dceb019bac17 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2872,5 +2872,14 @@ public final class Bukkit {
@@ -2888,5 +2888,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 07632f62a75c1e43be8386786d21f16f9cad895f..96f63969955af4baf93aff1bae9fcb8b
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 13de03608bf8ec8892754b48a1016bc0e76ea5f7..d5e7619f222e69fe29f4ae7a3fd2df1ba6362b86 100644
index 5e44a3cb8b8865e760d2f600af1351259b2867fe..45287918b72c3053f21b56cd33b6daf692c9888a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2517,5 +2517,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2532,5 +2532,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();

4
patches/api/0032-Extended-OfflinePlayer-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Extended OfflinePlayer API
diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
index abb5109ed08a3a651c2c27d4d17a3d49eb06da1e..98308b759907e03b168f7e06704a91925ffcd3fd 100644
index 30298a629b39bd43ce14b414fc697b2dfcbea89c..ce00af9121de7a910aaea4e0685a06d4cf31b4e3 100644
--- a/src/main/java/org/bukkit/OfflinePlayer.java
+++ b/src/main/java/org/bukkit/OfflinePlayer.java
@@ -545,4 +545,106 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
@@ -557,4 +557,106 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
*/
@Nullable
public Location getLocation();

8
patches/api/0033-Added-the-ability-to-add-combustible-items.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Added the ability to add combustible items
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 96f63969955af4baf93aff1bae9fcb8b73a4f62b..3f06db1c4a5f9418790fe4d3fe6f0f41d37c89ca 100644
index 812d903e8883ab087ec7ae154d76dceb019bac17..17bb5de3f1216ddfcb66152a0791c63334460051 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2881,5 +2881,24 @@ public final class Bukkit {
@@ -2897,5 +2897,24 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -34,10 +34,10 @@ index 96f63969955af4baf93aff1bae9fcb8b73a4f62b..3f06db1c4a5f9418790fe4d3fe6f0f41
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index d5e7619f222e69fe29f4ae7a3fd2df1ba6362b86..6f77c4a839d228ee2c84fa52961d19eea538d9cf 100644
index 45287918b72c3053f21b56cd33b6daf692c9888a..109811ccc128006e29751e2242e171519c8557c7 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2524,5 +2524,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2539,5 +2539,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging
*/
boolean isLagging();

12
patches/api/0041-Debug-Marker-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Debug Marker API
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 3f06db1c4a5f9418790fe4d3fe6f0f41d37c89ca..d218cd30fc0733a83e3e0ba3279eb21561b0b08e 100644
index 17bb5de3f1216ddfcb66152a0791c63334460051..afe47ecf0e7ae673aaf62b226e9cb07d2ed393eb 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2900,5 +2900,89 @@ public final class Bukkit {
@@ -2916,5 +2916,89 @@ public final class Bukkit {
public static void removeFuel(@NotNull Material material) {
server.removeFuel(material);
}
@@ -99,10 +99,10 @@ index 3f06db1c4a5f9418790fe4d3fe6f0f41d37c89ca..d218cd30fc0733a83e3e0ba3279eb215
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 6f77c4a839d228ee2c84fa52961d19eea538d9cf..be0e4c789a02d67160287c39cf6bdf8ef2229afc 100644
index 109811ccc128006e29751e2242e171519c8557c7..90f109af3c83a1bc12cb27497d107de5029d0ce6 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2539,5 +2539,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2554,5 +2554,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @param material The material that will no longer be a fuel
*/
public void removeFuel(@NotNull Material material);
@@ -260,10 +260,10 @@ index 9ac1ee847e64427cb9b1b396c23b6689f7c99f9c..565ce4b0c5eb300953aaefa786b9f893
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 9386029164f5cd1e38f0e54a42e2c1c8a8f21cf6..fed6d78e1d30a551db021dbe8c5e6d70eced681a 100644
index 654516bb7545d74a9e00efc154b5b75707038c96..f2aa9de6b1b6475435f72e9b7939fa7af9583ed3 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3715,5 +3715,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3739,5 +3739,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @deprecated Use {@link #resetIdleDuration()} instead
*/
void resetIdleTimer();

4
patches/api/0042-Add-death-screen-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index fed6d78e1d30a551db021dbe8c5e6d70eced681a..6dc63bfe85d83a7cff369f06c57ebe0aa04c63a3 100644
index f2aa9de6b1b6475435f72e9b7939fa7af9583ed3..5d22249f7bc98bc88ee798974f481c37807f7c5e 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3785,5 +3785,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3809,5 +3809,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Clears all debug block highlights
*/
void clearBlockHighlights();

20
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@@ -1471,10 +1471,10 @@ index 0000000000000000000000000000000000000000..facd55463d44cb7e3d2ca6892982f549
+ }
+}
diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
index 850f75172e9efa72cabb8e5bd124b96a0b1a945f..3db1de70c76e1427e257d988d1a7f26e986b5617 100644
index e028353e0261310afc42ca0454b723d9f1ffc131..2222625a515d9ae6c3e9c92fc4d4a5bf974af5f8 100644
--- a/src/main/java/io/papermc/paper/util/MCUtil.java
+++ b/src/main/java/io/papermc/paper/util/MCUtil.java
@@ -212,7 +212,7 @@ public final class MCUtil {
@@ -215,7 +215,7 @@ public final class MCUtil {
}
public static long getCoordinateKey(final Entity entity) {
@@ -1738,7 +1738,7 @@ index 529ab44baaf573b97cf7e89560c548642733188f..db55ad9aaabfa1ea998754f3ac352d16
this.wasOnGround = this.entity.onGround();
this.teleportDelay = 0;
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 6907d1be36fbdf0856c0e11983218d2fd1f9cb46..531c9ef0d6504fc1632b83bd93b9cf76e91377e8 100644
index bf5e47e8c3706590fdc0731bd9a5858b56d06136..62ad086b5b07303d920fdb3534a556673ef51f71 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -894,6 +894,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1918,7 +1918,7 @@ index d6cbe98e67fdbf8db46338a88ab1356dd63b50a3..20dd3a63b2f955b05a75eb240e33ae4c
int LARGE_MAX_STACK_SIZE = 64;
int DEFAULT_DISTANCE_LIMIT = 8;
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 45439b0cc4ea69e409fd41d4684403c0e0feab12..098c410f0285948d7ac48835c352f9c97742c5c7 100644
index 51097f1d04d981db2823e8647b546658b8fd27c1..d18296739a833dbe6c3bf45e00d5d5c2e80099ac 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -309,7 +309,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -2517,7 +2517,7 @@ index 24044795d8e0f1fb15a4f2f5401f44897092f2a3..96ca567af2d8fb2ba39f995be80b9353
if (this.assignProfessionWhenSpawned) {
this.assignProfessionWhenSpawned = false;
diff --git a/src/main/java/net/minecraft/world/entity/player/Inventory.java b/src/main/java/net/minecraft/world/entity/player/Inventory.java
index 309acf7bd07e38043aa81e0e686edba1136bd04c..deabb3400ee2406a8ec179a96d8cfd86f8edbbd6 100644
index 96c898086f35fd83f9b1ce7e3fe53d31b2fa4c31..c6a925cbd35eb33b27b90bfa8344ac7515d28b76 100644
--- a/src/main/java/net/minecraft/world/entity/player/Inventory.java
+++ b/src/main/java/net/minecraft/world/entity/player/Inventory.java
@@ -687,6 +687,8 @@ public class Inventory implements Container, Nameable {
@@ -2697,10 +2697,10 @@ index 27b0a79f7a7c47047216aae42944bac2a2151181..a097cfc528f709c80575f35483b68783
autorecipestackmanager.initialize(this); // Paper - better exact choice recipes
int i = 0;
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index f476ba6c97944bdffae5aacae2e285d17541f46e..506100b02e7e9a3eabfde6b1f93858c4cc048524 100644
index bc89f9e90af3d69872a58c47a4c2545ba91b6ba5..dbbb726f90077b4116b0c9424aa95c9db52ae100 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -207,6 +207,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -216,6 +216,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public abstract ResourceKey<LevelStem> getTypeKey();
@@ -2709,7 +2709,7 @@ index f476ba6c97944bdffae5aacae2e285d17541f46e..506100b02e7e9a3eabfde6b1f93858c4
protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - create paper world config; Async-Anti-Xray: Pass executor
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
@@ -1308,14 +1310,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1317,14 +1319,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
try {
tickConsumer.accept(entity);
MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick
@@ -2727,7 +2727,7 @@ index f476ba6c97944bdffae5aacae2e285d17541f46e..506100b02e7e9a3eabfde6b1f93858c4
}
}
// Paper start - Option to prevent armor stands from doing entity lookups
@@ -1788,6 +1790,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1797,6 +1799,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
public ProfilerFiller getProfiler() {
@@ -3271,7 +3271,7 @@ index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7
@Nullable
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 9f7ed337463cc9bb370a5541d9de5cd8f9c1a78a..9f5a6398a7dca841570a895054cee969dc96bca4 100644
index c490a29bcf7410bc54959ee71375605964379ed5..18bfe2fb7efad66f5fae07a30593d640c597bf77 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -266,7 +266,7 @@ import javax.annotation.Nullable; // Paper

8
patches/server/0003-Fix-pufferfish-issues.patch
View File

@@ -40,7 +40,7 @@ index f6a3364175476c57a7763a087ff55e1689474800..5e01bfdad663656168604fc878a993dd
"This can improve performance by a few percent, but has minor gameplay implications.");
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 531c9ef0d6504fc1632b83bd93b9cf76e91377e8..09594f96cf79aa38142a859bef2e3b6b8d00f7db 100644
index 62ad086b5b07303d920fdb3534a556673ef51f71..15aaa270e51b9194596e7ed5061c85c9fb54e177 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -924,7 +924,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -62,7 +62,7 @@ index 531c9ef0d6504fc1632b83bd93b9cf76e91377e8..09594f96cf79aa38142a859bef2e3b6b
private int currentIceAndSnowTick = 0; protected void resetIceAndSnowTick() { this.currentIceAndSnowTick = this.randomTickRandom.nextInt(16); } // Pufferfish
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 098c410f0285948d7ac48835c352f9c97742c5c7..3773b05d0e2875db8817835e623272292855925f 100644
index d18296739a833dbe6c3bf45e00d5d5c2e80099ac..d25dd9018eff5f3817c1b56f49632cc0a9388b8e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -825,7 +825,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -88,10 +88,10 @@ index 837f68825f601971f374be47952b23108bf66ba6..2a8a8030feefae84e394460612405887
return;
}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 506100b02e7e9a3eabfde6b1f93858c4cc048524..27447e4acb7db91b7595a7c25b682a4a4ce8c151 100644
index dbbb726f90077b4116b0c9424aa95c9db52ae100..9f5cde72a5305572202c316e750ad1b5e778fd87 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -207,7 +207,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -216,7 +216,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public abstract ResourceKey<LevelStem> getTypeKey();

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

@@ -92,7 +92,7 @@ index 435b129c433704c24828d8fb57e14333c9423207..aa47b0af34cff5eaa638d6c24c718d02
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // Paper - init PaperBrigadierProvider
gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index d6a08f06812bc15813559eb8ff66eddf7cf22888..bce8df10ac9dfb7a9bba76fc05357c8b6a0520e4 100644
index 9f5cde72a5305572202c316e750ad1b5e778fd87..1513300064314a761adf4a08cc72782ec93947d1 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -173,6 +173,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -103,7 +103,7 @@ index d6a08f06812bc15813559eb8ff66eddf7cf22888..bce8df10ac9dfb7a9bba76fc05357c8b
public final co.aikar.timings.WorldTimingsHandler timings; // Paper
public static BlockPos lastPhysicsProblem; // Spigot
private org.spigotmc.TickLimiter entityLimiter;
@@ -212,6 +213,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -221,6 +222,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - create paper world config; Async-Anti-Xray: Pass executor
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
@@ -112,7 +112,7 @@ index d6a08f06812bc15813559eb8ff66eddf7cf22888..bce8df10ac9dfb7a9bba76fc05357c8b
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 357d7b8ca85ec3ed1fc53b230ae574d9f7c8cddf..460e21d0bcead970eda3e49dadc9e77c0bdf98bf 100644
index 86c234c123fac96b4f94873d1dcfab30e9835e43..f36a87ba93da564b3b2c8b9f9190f8853557bdcd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1054,6 +1054,7 @@ public final class CraftServer implements Server {
@@ -139,7 +139,7 @@ index 357d7b8ca85ec3ed1fc53b230ae574d9f7c8cddf..460e21d0bcead970eda3e49dadc9e77c
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -3018,6 +3021,18 @@ public final class CraftServer implements Server {
@@ -3033,6 +3036,18 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}

4
patches/server/0013-Bring-back-server-name.patch
View File

@@ -17,10 +17,10 @@ index bab2471616404821671264ccefd729cab8d0bf58..ae75edfaa9e4c72f11fbb7ffc66294be
public final boolean spawnNpcs = this.get("spawn-npcs", true);
public final boolean pvp = this.get("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 460e21d0bcead970eda3e49dadc9e77c0bdf98bf..8a9af4a0d5c59361ffcf0ed572a1f1ee141d1780 100644
index f36a87ba93da564b3b2c8b9f9190f8853557bdcd..a34f3eaa47c2b193a1b8dfbdf6f0c79bd3ace489 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3264,4 +3264,11 @@ public final class CraftServer implements Server {
@@ -3279,4 +3279,11 @@ public final class CraftServer implements Server {
}
// Paper end

4
patches/server/0016-Lagging-threshold.patch
View File

@@ -25,10 +25,10 @@ index c90a488e41ef65b57818cd91403e65e5f5e19cd9..feece6ec8fda944e2fcbf7c59327d0a1
}
// Paper end - further improve server tick loop
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8a9af4a0d5c59361ffcf0ed572a1f1ee141d1780..152a10866560549d7d8deed328ee9ee2d9ed932c 100644
index a34f3eaa47c2b193a1b8dfbdf6f0c79bd3ace489..8f21c4aee84070eab2798cfcd4200b6d2e8320a4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3270,5 +3270,10 @@ public final class CraftServer implements Server {
@@ -3285,5 +3285,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}

4
patches/server/0059-Add-5-second-tps-average-in-tps.patch
View File

@@ -74,10 +74,10 @@ index 38fe7e5014332f45e41a3d5d91c28dd0acfdc3b0..479657ddef21f0279b361117b82549f7
this.values[this.vp++ & 255] = (int)(l * 100L / Runtime.getRuntime().maxMemory());
this.repaint();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 152a10866560549d7d8deed328ee9ee2d9ed932c..4342ad11ed1ee8f00b56a5ce4710fbd3350b0fdc 100644
index 8f21c4aee84070eab2798cfcd4200b6d2e8320a4..a6affd4d7ecbe57a79fa18f4473c60662053d663 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3062,6 +3062,7 @@ public final class CraftServer implements Server {
@@ -3077,6 +3077,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {

4
patches/server/0070-Add-allow-water-in-end-world-option.patch
View File

@@ -27,10 +27,10 @@ index 6371f326fc86cfc53e39bf8ed13b646f7705fbbc..3dec0c5fc8dece5341634eaf8e94fe19
return true;
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index bce8df10ac9dfb7a9bba76fc05357c8b6a0520e4..c2e6f6d2c4bdda3cafd2f7b42f3586242cdff738 100644
index 1513300064314a761adf4a08cc72782ec93947d1..1e55c024a8dd7f1a5f324937bbd3f13b3ac8f076 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1902,4 +1902,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1911,4 +1911,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
return null;
}
// Paper end - optimize redstone (Alternate Current)

6
patches/server/0101-Add-adjustable-breeding-cooldown-to-config.patch
View File

@@ -42,7 +42,7 @@ index 081d1e38b7b1f286e138b0981aaa760e58761215..d94928a78d166dd3d836261b4f99fb4f
EntityBreedEvent entityBreedEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreedEvent(entityageable, this, other, breeder, this.breedItem, experience);
if (entityBreedEvent.isCancelled()) {
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index c2e6f6d2c4bdda3cafd2f7b42f3586242cdff738..85d0a644fa876978d1295d8a2d88ab2869b33904 100644
index 1e55c024a8dd7f1a5f324937bbd3f13b3ac8f076..d35e2338fb423f2f8306a1c33d808a0456c3af2a 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -191,6 +191,49 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -95,7 +95,7 @@ index c2e6f6d2c4bdda3cafd2f7b42f3586242cdff738..85d0a644fa876978d1295d8a2d88ab28
public CraftWorld getWorld() {
return this.world;
}
@@ -214,6 +257,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -223,6 +266,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
this.purpurConfig = new org.purpurmc.purpur.PurpurWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur
@@ -104,7 +104,7 @@ index c2e6f6d2c4bdda3cafd2f7b42f3586242cdff738..85d0a644fa876978d1295d8a2d88ab28
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 6654234cae07b569ff97a51284a459335af300a4..52b9e364056b0b405779965daa634a8b0f1f82e0 100644
index 364933d9f861adb2957b2f636f1608f3cee3ab66..c469fc30efcc71af34b446475af16870049487b6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -115,6 +115,7 @@ public class PurpurWorldConfig {

44
patches/server/0176-Add-toggle-for-sand-duping-fix.patch
View File

@@ -1,44 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 4 Jun 2021 09:13:54 -0500
Subject: [PATCH] Add toggle for sand duping fix
diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
index 0aef6a8d51cb1351daaea16022f5cbb27ceaff0d..65cb5994142351e2b19f6d4ff2963f9ae7752205 100644
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
@@ -134,7 +134,7 @@ public class FallingBlockEntity extends Entity {
@Override
public void tick() {
// Paper start - fix sand duping
- if (this.isRemoved()) {
+ if (this.level().purpurConfig.fixSandDuping && this.isRemoved()) { // Purpur
return;
}
// Paper end - fix sand duping
@@ -150,7 +150,7 @@ public class FallingBlockEntity extends Entity {
this.move(MoverType.SELF, this.getDeltaMovement());
// Paper start - fix sand duping
- if (this.isRemoved()) {
+ if (this.level().purpurConfig.fixSandDuping && this.isRemoved()) { // Purpur
return;
}
// Paper end - fix sand duping
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 991e8491c5bc254eb2ba0cbdcd06cb410d286fbb..6fb87c1ab0397d4c659dc69f33d0a4743c4d0dcd 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -683,6 +683,11 @@ public class PurpurWorldConfig {
}
}
+ public boolean fixSandDuping = true;
+ private void sandSettings() {
+ fixSandDuping = getBoolean("blocks.sand.fix-duping", fixSandDuping);
+ }
+
public boolean slabHalfBreak = false;
private void slabSettings() {
slabHalfBreak = getBoolean("blocks.slab.break-individual-slabs-when-sneaking", slabHalfBreak);

2
patches/server/0178-Make-lightning-rod-range-configurable.patch → patches/server/0176-Make-lightning-rod-range-configurable.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Make lightning rod range configurable
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 5af5a22e725bdae1cc15702b37982f585c46286f..8a695b29d9c641dbd35d6faa1c2f97c0c83c99bb 100644
index b9ed172cee34ef2e140c362b9ac7030c8231b97a..aef2bd930125b3fbd9f564db86a575ddfbd7d894 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1192,7 +1192,7 @@ public class ServerLevel extends Level implements WorldGenLevel {

62
patches/server/0177-Add-toggle-for-end-portal-safe-teleporting.patch
View File

@@ -1,62 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Wed, 9 Jun 2021 11:03:40 -0500
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 d79cbbcf0e6e6e6096e138be2617b727ea991c18..c868a61d73b4563807c70c9539f63cb0645a9984 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3238,7 +3238,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
}
this.processPortalCooldown();
- this.tickEndPortal(); // Paper - make end portalling safe
+ if (this.level().purpurConfig.endPortalSafeTeleporting) this.tickEndPortal(); // Paper - make end portalling safe // Purpur
}
}
diff --git a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
index a5a8bd6813b68ab2e913fc3ae30c9950c242beb3..f277a4a21b15627c45061e51c8f6c0812a176a10 100644
--- a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
@@ -69,6 +69,22 @@ public class EndPortalBlock extends BaseEntityBlock {
// return; // CraftBukkit - always fire event in case plugins wish to change it
}
+ // Purpur start
+ if (!world.purpurConfig.endPortalSafeTeleporting) {
+ // CraftBukkit start - Entity in portal
+ EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ()));
+ world.getCraftServer().getPluginManager().callEvent(event);
+
+ if (entity instanceof ServerPlayer) {
+ ((ServerPlayer) entity).changeDimension(worldserver, PlayerTeleportEvent.TeleportCause.END_PORTAL);
+ return;
+ }
+ // CraftBukkit end
+ entity.changeDimension(worldserver);
+ return;
+ }
+ // Purpur end
+
// Paper start - move all of this logic into portal tick
entity.portalWorld = ((ServerLevel)world);
entity.portalBlock = pos.immutable();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 6fb87c1ab0397d4c659dc69f33d0a4743c4d0dcd..722563c25d745f1991ce914f6e758633756e435e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -631,6 +631,11 @@ public class PurpurWorldConfig {
furnaceUseLavaFromUnderneath = getBoolean("blocks.furnace.use-lava-from-underneath", furnaceUseLavaFromUnderneath);
}
+ public boolean endPortalSafeTeleporting = true;
+ private void endPortalSettings() {
+ endPortalSafeTeleporting = getBoolean("blocks.end_portal.safe-teleporting", endPortalSafeTeleporting);
+ }
+
public boolean mobsSpawnOnPackedIce = true;
public boolean mobsSpawnOnBlueIce = true;
private void iceSettings() {

2
patches/server/0179-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch → patches/server/0177-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
View File

@@ -55,7 +55,7 @@ index c3448707fd8a632b457cc97b35d08a9c6933d5ee..2840c0b16d9b8147703f34bac5a8aa21
public void eat(Item item, ItemStack stack) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 722563c25d745f1991ce914f6e758633756e435e..2a1c8d85ef72a3ef3367ba8f7e830e95608b60f9 100644
index 991e8491c5bc254eb2ba0cbdcd06cb410d286fbb..ee94f8f165428072ae2f27d2f70a15b6aa3b242a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -388,6 +388,8 @@ public class PurpurWorldConfig {

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

0
patches/server/0181-Add-portal-permission-bypass.patch → patches/server/0179-Add-portal-permission-bypass.patch
View File

6
patches/server/0182-Shulker-spawn-from-bullet-options.patch → patches/server/0180-Shulker-spawn-from-bullet-options.patch
View File

@@ -68,10 +68,10 @@ index 88e1c2431d51d8cdc3d555b711e506648225d289..ac8735cc9d127fc1f867b40d4000c033
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 79a93bb2ce4a86586bfac8635706a4c2d1d1f407..1225ffe648086a279c084ce2f18e5f2126660b7c 100644
index ee94f8f165428072ae2f27d2f70a15b6aa3b242a..cc612f8328abfa27d784181c5aebbcd9e0b10c05 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 {
@@ -1907,6 +1907,11 @@ public class PurpurWorldConfig {
public boolean shulkerControllable = true;
public double shulkerMaxHealth = 30.0D;
public boolean shulkerTakeDamageFromWater = false;
@@ -83,7 +83,7 @@ index 79a93bb2ce4a86586bfac8635706a4c2d1d1f407..1225ffe648086a279c084ce2f18e5f21
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -1928,6 +1933,11 @@ public class PurpurWorldConfig {
@@ -1918,6 +1923,11 @@ public class PurpurWorldConfig {
}
shulkerMaxHealth = getDouble("mobs.shulker.attributes.max_health", shulkerMaxHealth);
shulkerTakeDamageFromWater = getBoolean("mobs.shulker.takes-damage-from-water", shulkerTakeDamageFromWater);

2
patches/server/0183-Eating-glow-berries-adds-glow-effect.patch → patches/server/0181-Eating-glow-berries-adds-glow-effect.patch
View File

@@ -18,7 +18,7 @@ index 7fbd4bf29bcc0795aa4b0e6d5d4bc3745bf7a1c0..e83ea53da012f3dcaa1f53bf6082a17a
public static final Item SOUL_CAMPFIRE = registerBlock(Blocks.SOUL_CAMPFIRE);
public static final Item SHROOMLIGHT = registerBlock(Blocks.SHROOMLIGHT);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3cdd1f0fa067160f879fb617b81f42678270cde6..1275e2a3799d064244f22894a03cc2dd53477f04 100644
index cc612f8328abfa27d784181c5aebbcd9e0b10c05..b21d288f62f473cd9d1057d3d2a452f16b0291d0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -220,6 +220,7 @@ public class PurpurWorldConfig {

8
patches/server/0184-Option-to-make-drowned-break-doors.patch → patches/server/0182-Option-to-make-drowned-break-doors.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Option to make drowned break doors
diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
index a315e2fc10b9d404a92971dea6a0a5fae16d8133..6e6d7f68cf1c1c224b67a9d674fdcaa67ea00359 100644
index 8850d8fc54d7025d323bc273a87a609baacea174..13427d23f1e614c0d83e9ccd68944ea4e1993c73 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
@@ -29,6 +29,7 @@ import net.minecraft.world.entity.ai.goal.MoveToBlockGoal;
@@ -34,10 +34,10 @@ index a315e2fc10b9d404a92971dea6a0a5fae16d8133..6e6d7f68cf1c1c224b67a9d674fdcaa6
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 1275e2a3799d064244f22894a03cc2dd53477f04..d9409fa6d82b6f512e8b482f319b139489675828 100644
index b21d288f62f473cd9d1057d3d2a452f16b0291d0..5a3dad2ba18f56724e22ec2dcb99cf22af61e2aa 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 {
@@ -1053,6 +1053,7 @@ public class PurpurWorldConfig {
public double drownedJockeyChance = 0.05D;
public boolean drownedJockeyTryExistingChickens = true;
public boolean drownedTakeDamageFromWater = false;
@@ -45,7 +45,7 @@ index 1275e2a3799d064244f22894a03cc2dd53477f04..d9409fa6d82b6f512e8b482f319b1394
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -1078,6 +1079,7 @@ public class PurpurWorldConfig {
@@ -1068,6 +1069,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/0185-Configurable-hunger-starvation-damage.patch → patches/server/0183-Configurable-hunger-starvation-damage.patch
View File

@@ -18,10 +18,10 @@ index 2840c0b16d9b8147703f34bac5a8aa21f82e6e44..e8079d126e6c0cf0b15c01afb6498922
this.tickTimer = 0;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index cce6cbf83e1d57c609ea5575553e2cef5a526bf9..e308af8e5dbb066b1976b341cc8362aa7b546964 100644
index 5a3dad2ba18f56724e22ec2dcb99cf22af61e2aa..c294a2a89e23cd5889472ebe586c2ab3de043733 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 {
@@ -2566,4 +2566,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);
}

0
patches/server/0186-Enhance-SysoutCatcher.patch → patches/server/0184-Enhance-SysoutCatcher.patch
View File

2
patches/server/0187-Add-uptime-command.patch → patches/server/0185-Add-uptime-command.patch
View File

@@ -17,7 +17,7 @@ index 9c335df92b0a6c7705c9def89ba5c320d2c8ed03..c2b8a653b01aa3e0856afa3e96555f5e
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6887e871fe3773df55636749c8d3d65a7cacff83..1e3a1792927f42e7597e4cb2067844f45a3f0bfb 100644
index 69af88f3ed690cbb751d367171c4cf6aa0ee2fca..1381e16fcac730eaecfc621a0c602bbf15d744f3 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -293,6 +293,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

2
patches/server/0188-Tool-actionable-options.patch → patches/server/0186-Tool-actionable-options.patch
View File

@@ -153,7 +153,7 @@ index 21212462e6b415e96536a27b2c009d1562f18946..193bcb12152347f5f02ce18b01ba918e
return InteractionResult.PASS;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 97295817c15bfaab80241ae89134bde1bb129462..c67400bf2e22557095b1de43d410b8efd7705f90 100644
index c294a2a89e23cd5889472ebe586c2ab3de043733..2335a56bb46fd9ece82547544e8cac883562eba2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -503,6 +503,280 @@ public class PurpurWorldConfig {

0
patches/server/0189-Store-placer-on-Block-when-placed.patch → patches/server/0187-Store-placer-on-Block-when-placed.patch
View File

0
patches/server/0190-Summoner-API.patch → patches/server/0188-Summoner-API.patch
View File

4
patches/server/0191-Customizable-sleeping-actionbar-messages.patch → patches/server/0189-Customizable-sleeping-actionbar-messages.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Customizable sleeping actionbar messages
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 8a695b29d9c641dbd35d6faa1c2f97c0c83c99bb..6971ce789c329d733bbc373422000fa0efff7ef6 100644
index aef2bd930125b3fbd9f564db86a575ddfbd7d894..9394aa9e300721b335238f143500528e93ce8385 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1241,11 +1241,27 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -38,7 +38,7 @@ index 8a695b29d9c641dbd35d6faa1c2f97c0c83c99bb..6971ce789c329d733bbc373422000fa0
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 9e6b399584d21aeca1beeb84e67dee10424e8f19..88a8fda97854e19e658c52434eb25542f3699f35 100644
index c679111a4420ee55b191ad768444123d41d250fb..bc153d1f14483ecaf648918f269e81a11151e392 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1469,7 +1469,19 @@ public class ServerPlayer extends Player {

4
patches/server/0192-option-to-disable-shulker-box-items-from-dropping-co.patch → patches/server/0190-option-to-disable-shulker-box-items-from-dropping-co.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] option to disable shulker box items from dropping contents
diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
index efdf56044396b4ce486948d2c993971f99174a5e..21916ab9bde38ef8383e746f2ce597b0fcb81d9b 100644
index 8d2c0accadaf0c5d28e7db6e62a05f6c619cf02f..b1779e3cf4b01afc15aa367cfadb999366e46d19 100644
--- a/src/main/java/net/minecraft/world/item/BlockItem.java
+++ b/src/main/java/net/minecraft/world/item/BlockItem.java
@@ -287,7 +287,7 @@ public class BlockItem extends Item {
@@ -19,7 +19,7 @@ index efdf56044396b4ce486948d2c993971f99174a5e..21916ab9bde38ef8383e746f2ce597b0
CompoundTag nbttagcompound = BlockItem.getBlockEntityData(itemstack);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c67400bf2e22557095b1de43d410b8efd7705f90..a6459228449b76956c61be7dd88b04e1edd04b11 100644
index 2335a56bb46fd9ece82547544e8cac883562eba2..6be3b83976cfd92f984f2ce9479d6f0f5d883e17 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -221,6 +221,7 @@ public class PurpurWorldConfig {

4
patches/server/0193-Big-dripleaf-tilt-delay.patch → patches/server/0191-Big-dripleaf-tilt-delay.patch
View File

@@ -11,7 +11,7 @@ PARTIAL: big_dripleaf with PARTIAL tilt will change to FULL tilt after 10 ticks
UNSTABLE: big_dripleaf with FULL tilt will change back to no tilt after 100 ticks
diff --git a/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java b/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java
index 8e4a6a1188b2ce2825dc5750505212c72efb5c7b..c7f78ccb228d261984ac360f2ca6ae9478786184 100644
index 0d92bd6f1e4f3470a62f573add3490220e60ef7a..2e89b22de852f43f2694be52043799f07f14800b 100644
--- a/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java
@@ -243,7 +243,7 @@ public class BigDripleafBlock extends HorizontalDirectionalBlock implements Bone
@@ -24,7 +24,7 @@ index 8e4a6a1188b2ce2825dc5750505212c72efb5c7b..c7f78ccb228d261984ac360f2ca6ae94
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 a6459228449b76956c61be7dd88b04e1edd04b11..8bbc9eea77aa96ebd20c5901c03b35e66e79ce63 100644
index 6be3b83976cfd92f984f2ce9479d6f0f5d883e17..8a2015ef0e97d86eb516d81f5bc49e2cfed8b4df 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -818,6 +818,22 @@ public class PurpurWorldConfig {

2
patches/server/0194-Player-ridable-in-water-option.patch → patches/server/0192-Player-ridable-in-water-option.patch
View File

@@ -21,7 +21,7 @@ index 992ac6cfba700839259b973fa1eabb5ce6c301af..e8000f236d3ec0476ec782f08e159eea
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 fc209fcd02343dba4e7d22f341cb9a0e88db9ae9..470bf7896527a23cb7888fdf9d502183f4487f68 100644
index 8a2015ef0e97d86eb516d81f5bc49e2cfed8b4df..a2bbf31e81318cce9b69be32b999b307e9256c46 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -394,6 +394,7 @@ public class PurpurWorldConfig {

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

@@ -17,10 +17,10 @@ index 7621237df388ee10ef962b0c4e795c9de88762d0..19d7142d62339d01ce2d3936a95c8296
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 14164ef2a4204886c279897b89aca6e071005870..f626232a488a38ba6dd2a491afbfa7dbaf4ff3bf 100644
index a2bbf31e81318cce9b69be32b999b307e9256c46..8ecd8465b5758a38d73636ac436432885cc85df5 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 {
@@ -1424,6 +1424,7 @@ public class PurpurWorldConfig {
public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
public boolean endermanIgnorePlayerDragonHead = false;
public boolean endermanDisableStareAggro = false;
@@ -28,7 +28,7 @@ index 14164ef2a4204886c279897b89aca6e071005870..f626232a488a38ba6dd2a491afbfa7db
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -1456,6 +1457,7 @@ public class PurpurWorldConfig {
@@ -1446,6 +1447,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/0196-Add-compass-command.patch → patches/server/0194-Add-compass-command.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add compass command
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index f6d6c3d96056a744fffb4883240e991896348e0c..7e266a126180000dcad4b3bd8606349bdc95c30b 100644
index c2b8a653b01aa3e0856afa3e96555f5e8f0e81bd..0026235782aeb5e663faa3aaf11040635cd12204 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -255,6 +255,7 @@ public class Commands {
@@ -17,7 +17,7 @@ index f6d6c3d96056a744fffb4883240e991896348e0c..7e266a126180000dcad4b3bd8606349b
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 88a8fda97854e19e658c52434eb25542f3699f35..d9911426361684a20e3559f8a6694a52b30d7479 100644
index bc153d1f14483ecaf648918f269e81a11151e392..8601df7eefe25b2a6f5cc3a2dbda35695b1e0202 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -283,6 +283,7 @@ public class ServerPlayer extends Player {
@@ -89,7 +89,7 @@ index 6aa225252d1026979fe88c273652e3d9ebdeb5f3..477639dddb7c5ae0c9cc45a6eca73d82
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 f626232a488a38ba6dd2a491afbfa7dbaf4ff3bf..fd07ab7ce9eaec09429ecd75c93c57db437d5aa5 100644
index 8ecd8465b5758a38d73636ac436432885cc85df5..b914dd9a6535f3e45637157e59a4dc339911e26d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -222,6 +222,7 @@ public class PurpurWorldConfig {

2
patches/server/0197-Toggle-for-kinetic-damage.patch → patches/server/0195-Toggle-for-kinetic-damage.patch
View File

@@ -17,7 +17,7 @@ index 4af345c848040fabdde82b4f0493ba796a7fef1f..9f542c8ddb25faaef00d5db354f1c1fe
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index df782822909207321e083684c8155ad675a11828..beb7e2c46a180773cbc653a65b5a699fd96b9bab 100644
index b914dd9a6535f3e45637157e59a4dc339911e26d..50ea604c69d5f237ef229cd20ff5aa1233ccfb3a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -182,12 +182,14 @@ public class PurpurWorldConfig {

2
patches/server/0198-Add-Option-for-disable-observer-clocks.patch → patches/server/0196-Add-Option-for-disable-observer-clocks.patch
View File

@@ -18,7 +18,7 @@ index 713352b68f82d4c4a19a712d5207de0f99456713..d056e80c98973e9ba64adc5a8554acc8
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 1714f839c688129184947c789731ac4d2b1c2fe1..a56818870503b2694d9e4dd232b91e1c6a54333f 100644
index 50ea604c69d5f237ef229cd20ff5aa1233ccfb3a..aa4e7d9082ded09b9cca7f6ea45da2c51203144d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -369,6 +369,11 @@ public class PurpurWorldConfig {

8
patches/server/0199-Customizeable-Zombie-Villager-curing-times.patch → patches/server/0197-Customizeable-Zombie-Villager-curing-times.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Customizeable Zombie Villager curing times
diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
index 135ce8822ed7e3d6182755deca37a2c0531960c6..6a85de8af9b260e92b4ccffa2ae3503cd29b0b98 100644
index 438302f6705bcf3d60f27dde279de010bd95aad4..40465fbe6f78da6176d5fad8a3687cefd93dcf43 100644
--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
@@ -221,7 +221,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
@@ -18,10 +18,10 @@ index 135ce8822ed7e3d6182755deca37a2c0531960c6..6a85de8af9b260e92b4ccffa2ae3503c
return InteractionResult.SUCCESS;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a3d20bb3cddeebc7237cf7b7796f37cd2008a4dd..318cbbaf38831008a74d2f7e951db5b67fce55b7 100644
index aa4e7d9082ded09b9cca7f6ea45da2c51203144d..1c658c65cd7268fe8cf52b107d26974f2f42194e 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 {
@@ -2827,6 +2827,8 @@ public class PurpurWorldConfig {
public double zombieVillagerJockeyChance = 0.05D;
public boolean zombieVillagerJockeyTryExistingChickens = true;
public boolean zombieVillagerTakeDamageFromWater = false;
@@ -30,7 +30,7 @@ index a3d20bb3cddeebc7237cf7b7796f37cd2008a4dd..318cbbaf38831008a74d2f7e951db5b6
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 {
@@ -2842,6 +2844,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/0200-Option-for-sponges-to-work-on-lava-and-mud.patch → patches/server/0198-Option-for-sponges-to-work-on-lava-and-mud.patch
View File

@@ -30,10 +30,10 @@ index 1737a670aa81c17233f8e9a8632f0e0876be367c..7e87b4299979c9e46abb582da7a8e54a
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 ac7238a490e1f564a66fca05ce012ad416b9591f..deba979e6987f60308c6b4a286943b18aa2974f4 100644
index 1c658c65cd7268fe8cf52b107d26974f2f42194e..2ab00b885ebf0071f1825cafa46a95cc460d1ac4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1014,9 +1014,13 @@ public class PurpurWorldConfig {
@@ -1004,9 +1004,13 @@ public class PurpurWorldConfig {
public int spongeAbsorptionArea = 65;
public int spongeAbsorptionRadius = 6;

6
patches/server/0201-Toggle-for-Wither-s-spawn-sound.patch → patches/server/0199-Toggle-for-Wither-s-spawn-sound.patch
View File

@@ -18,10 +18,10 @@ index b5ce9576ce7e91204f981c86fe70abb4cd0f267f..461247f3424b854032ccd45855c877aa
// 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 deba979e6987f60308c6b4a286943b18aa2974f4..8d726d509e4c0693ff06ee3c43b5af23ee7f9806 100644
index 2ab00b885ebf0071f1825cafa46a95cc460d1ac4..a0f75c7d96bcc96be22ef4671eab8315d5cc4504 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 {
@@ -2672,6 +2672,7 @@ public class PurpurWorldConfig {
public boolean witherTakeDamageFromWater = false;
public boolean witherCanRideVehicles = false;
public float witherExplosionRadius = 1.0F;
@@ -29,7 +29,7 @@ index deba979e6987f60308c6b4a286943b18aa2974f4..8d726d509e4c0693ff06ee3c43b5af23
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2703,6 +2704,7 @@ public class PurpurWorldConfig {
@@ -2693,6 +2694,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/0202-Cactus-breaks-from-solid-neighbors-config.patch → patches/server/0200-Cactus-breaks-from-solid-neighbors-config.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Cactus breaks from solid neighbors config
diff --git a/src/main/java/net/minecraft/world/level/block/CactusBlock.java b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
index a9629a102c4fa4e5720e63fcf4590e9231426c62..89c0006c06098e0d09a259ea8415d55b997367aa 100644
index ba4aaf850af36a84517c70581e141157c4f15b99..84b04419d2cb536ac42ec5373cc74cc29418755c 100644
--- a/src/main/java/net/minecraft/world/level/block/CactusBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
@@ -114,7 +114,7 @@ public class CactusBlock extends Block {
@@ -18,7 +18,7 @@ index a9629a102c4fa4e5720e63fcf4590e9231426c62..89c0006c06098e0d09a259ea8415d55b
return false;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b7e145289e241c0d2e02d90eafe3f2039be794c5..3dd2e8c271bbd24f2b4712934fc19a982ed4d1d2 100644
index a0f75c7d96bcc96be22ef4671eab8315d5cc4504..72eb63341b14ae213094390bf12e957e94e9cc60 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -845,6 +845,11 @@ public class PurpurWorldConfig {

2
patches/server/0203-Config-to-remove-curse-of-binding-with-weakness.patch → patches/server/0201-Config-to-remove-curse-of-binding-with-weakness.patch
View File

@@ -18,7 +18,7 @@ index 9af1da3858d6cf79b8bfaf99dde1370ccc50d023..1acb41fab25bdbc4109913b111dbe3b0
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3dd2e8c271bbd24f2b4712934fc19a982ed4d1d2..3deab8fff2c67fdc47db8c739a29173d65b13bbf 100644
index 72eb63341b14ae213094390bf12e957e94e9cc60..6cb425d017cc8b12aece5bc1982d85056fc58431 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -404,6 +404,7 @@ public class PurpurWorldConfig {

4
patches/server/0204-Conduit-behavior-configuration.patch → patches/server/0202-Conduit-behavior-configuration.patch
View File

@@ -89,10 +89,10 @@ index f0b0348e105fb27c829ec29e638433c57bfd5f64..57ce4b7c5fcfe7a88928cd4124f29af3
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e13c22d0d6e4b2f1a7db27c32a856cb0e78a5036..2d3339d3f5c8fe12cf61aaed5d19b0d72ba35f5c 100644
index 6cb425d017cc8b12aece5bc1982d85056fc58431..60b511bd94288badd8b6390b5f66d5c79478a71b 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 {
@@ -2893,4 +2893,27 @@ public class PurpurWorldConfig {
private void hungerSettings() {
hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
}

4
patches/server/0205-Cauldron-fill-chances.patch → patches/server/0203-Cauldron-fill-chances.patch
View File

@@ -47,10 +47,10 @@ index 5835872df922b859a31b44e3723c67097f21a641..ecb595ddf21b593175c27d59fd9587e7
if (dripChance < f1) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2d3339d3f5c8fe12cf61aaed5d19b0d72ba35f5c..5c06b7933b9001031e9cb7b511ff6644718bb458 100644
index 60b511bd94288badd8b6390b5f66d5c79478a71b..0893e133393e35a6b0a66c09cb800265426ec427 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 {
@@ -2916,4 +2916,15 @@ public class PurpurWorldConfig {
});
conduitBlocks = conduitBlockList.toArray(Block[]::new);
}

4
patches/server/0206-Config-to-allow-mobs-to-pathfind-over-rails.patch → patches/server/0204-Config-to-allow-mobs-to-pathfind-over-rails.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Config to allow mobs to pathfind over rails
diff --git a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
index 2aca9b193db5dadc4fb90b8d7548277b698924aa..7702cd386247c1a850bb22ccf8c0724d5bec1020 100644
index 70c7c735fdd0c1b66243915622e47eab8a57e7cc..0dc05919dfbbf73230505fcdc25d949b1602801c 100644
--- a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
+++ b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
@@ -241,7 +241,7 @@ public class WalkNodeEvaluator extends NodeEvaluator {
@@ -18,7 +18,7 @@ index 2aca9b193db5dadc4fb90b8d7548277b698924aa..7702cd386247c1a850bb22ccf8c0724d
if (node != null && (node.type == BlockPathTypes.OPEN || node.type == BlockPathTypes.WALKABLE) && this.mob.getBbWidth() < 1.0F) {
double g = (double)(x - direction.getStepX()) + 0.5D;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2f5662582492573aef4efee54def5921be7351ea..9bc0c44fa2f02596b716f4c180178b419e6c1194 100644
index 0893e133393e35a6b0a66c09cb800265426ec427..7f0b09f7e7e1f294bd7d4b384c587789dd8ffb12 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -138,6 +138,7 @@ public class PurpurWorldConfig {

8
patches/server/0207-Shulker-change-color-with-dye.patch → patches/server/0205-Shulker-change-color-with-dye.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Shulker change color with dye
diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
index bf3c02e78df66ca57773d667350197220df5d2d1..47abc81aa04774abeb97c912cd118bbab3b51e86 100644
index df944e733ca589d407af3709e0ff025f568600b7..25b9f131f9d0fdb0a53ddcc685d8ae250cb3abd6 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
@@ -22,6 +22,8 @@ import net.minecraft.tags.DamageTypeTags;
@@ -47,10 +47,10 @@ index bf3c02e78df66ca57773d667350197220df5d2d1..47abc81aa04774abeb97c912cd118bba
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 9bc0c44fa2f02596b716f4c180178b419e6c1194..f9b529da8e9367c3a7c9d89eb16760bc691ea59d 100644
index 7f0b09f7e7e1f294bd7d4b384c587789dd8ffb12..ba161c85a17aed57bcb7b5f8ec347757f45ef003 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 {
@@ -2234,6 +2234,7 @@ public class PurpurWorldConfig {
public double shulkerSpawnFromBulletNearbyRange = 8.0D;
public String shulkerSpawnFromBulletNearbyEquation = "(nearby - 1) / 5.0";
public boolean shulkerSpawnFromBulletRandomColor = false;
@@ -58,7 +58,7 @@ index 9bc0c44fa2f02596b716f4c180178b419e6c1194..f9b529da8e9367c3a7c9d89eb16760bc
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -2260,6 +2261,7 @@ public class PurpurWorldConfig {
@@ -2250,6 +2251,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);

2
patches/server/0208-Extended-OfflinePlayer-API.patch → patches/server/0206-Extended-OfflinePlayer-API.patch
View File

@@ -243,7 +243,7 @@ index 4a875bce9563f3b9351ebecde9b0eb1287beb50e..42d83cfd9318d6ebe9a5392edef3b667
+ // Purpur end - OfflinePlayer API
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 498310a94284c25d2e28d7de8299b80b1f34de3b..ec95d213d05e539547c35e13c36458519a0bd4f0 100644
index f74e632f6be8ab2c7bdf9f5ba2ad2a2a0ef4d14e..219d6019eed162a2127f4d175aff817f52d93544 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2670,6 +2670,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

4
patches/server/0209-Added-the-ability-to-add-combustible-items.patch → patches/server/0207-Added-the-ability-to-add-combustible-items.patch
View File

@@ -24,7 +24,7 @@ index 1af7e1548f0648890a1ef2fc0ff4e4c3a56c947c..decea1697c075e7549ccc7501c8e5935
} else if (this.isFuel(itemstack1)) {
if (!this.moveItemStackTo(itemstack1, 1, 2, false)) {
diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
index acfacda5001ef188acfef8ac0d319d66ce1883fb..1d179e9485df78657ce67ab7ca4c4b1bcaf6c4ea 100644
index c5bbb83f54d942d438ce8cf3a060ef2184069b88..5a3a619c4b936a4d186c0593f5af7b2493b85825 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
@@ -209,6 +209,22 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
@@ -51,7 +51,7 @@ index acfacda5001ef188acfef8ac0d319d66ce1883fb..1d179e9485df78657ce67ab7ca4c4b1b
private int maxStack = MAX_STACK;
public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4342ad11ed1ee8f00b56a5ce4710fbd3350b0fdc..a4f812588b9cc1d6df556373ea0d7991058261ee 100644
index a6affd4d7ecbe57a79fa18f4473c60662053d663..14e60675d23f9696fd8f64eb026fcd0b82b498f0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1589,6 +1589,19 @@ public final class CraftServer implements Server {

4
patches/server/0210-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch → patches/server/0208-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Option for if rain and thunder should stop on sleep
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 6971ce789c329d733bbc373422000fa0efff7ef6..e675d7e82245e1b7ef94fc55f393002ab572e2ba 100644
index 9394aa9e300721b335238f143500528e93ce8385..f141031f668898b8cc0ac1970b9026da6be4a466 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1401,6 +1401,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -25,7 +25,7 @@ index 6971ce789c329d733bbc373422000fa0efff7ef6..e675d7e82245e1b7ef94fc55f393002a
// CraftBukkit start
// If we stop due to everyone sleeping we should reset the weather duration to some other random value.
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 15410deb58a80ff8050d8f1b94004eb64e86f262..8644472c44f32c10a46749aab58a3be5444dcc33 100644
index ba161c85a17aed57bcb7b5f8ec347757f45ef003..6151c7d3bf9de065227c200b62dd03f7dba3f504 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -139,6 +139,8 @@ public class PurpurWorldConfig {

2
patches/server/0211-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch → patches/server/0209-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
View File

@@ -45,7 +45,7 @@ index 1c7bb504a576568bd275b4f1373208d37d1419e5..3d48293c34fa37ba5091c6058dadb32a
public static final Block PINK_PETALS = register("pink_petals", new PinkPetalsBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().sound(SoundType.PINK_PETALS).pushReaction(PushReaction.DESTROY)));
public static final Block MOSS_BLOCK = register("moss_block", new MossBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GREEN).strength(0.1F).sound(SoundType.MOSS).pushReaction(PushReaction.DESTROY)));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f75b12f80e02c2b85c55c41096b4ee4759ce63b0..767659256e391854c0cd3035f138d86bbcaf6949 100644
index 6151c7d3bf9de065227c200b62dd03f7dba3f504..951a4fcdc1f47189ea7f36fc232faaf06310db59 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -805,6 +805,11 @@ public class PurpurWorldConfig {

4
patches/server/0212-Shift-right-click-to-use-exp-for-mending.patch → patches/server/0210-Shift-right-click-to-use-exp-for-mending.patch
View File

@@ -36,7 +36,7 @@ index 1aa98f8ff062a906035c62875c454aeb0bc6f179..f8edb6b0d119582cf404b9931adc0948
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index cac4127571c514a6f7697f31eb7d1edeca47d99a..5e17a72dbe105a1a0221d857b6da39a855127aab 100644
index affe433994ec5c5cd6cecd3989a5daa90db3b203..72ac438ec1a6628c861bdab9626c77666d4ba2b6 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2051,6 +2051,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -48,7 +48,7 @@ index cac4127571c514a6f7697f31eb7d1edeca47d99a..5e17a72dbe105a1a0221d857b6da39a8
cancelled = event.useItemInHand() == Event.Result.DENY;
} else {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index da270cdc4afe91c65513469b04b4d247066a05ec..83da28a7edb4b101138034ed6ac71a0ae36a091b 100644
index 951a4fcdc1f47189ea7f36fc232faaf06310db59..da79bad084e062cdbff25a47c3a324c8d072a471 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -411,6 +411,7 @@ public class PurpurWorldConfig {

6
patches/server/0213-Dolphins-naturally-aggressive-to-players-chance.patch → patches/server/0211-Dolphins-naturally-aggressive-to-players-chance.patch
View File

@@ -48,10 +48,10 @@ index 21e804d391478c613f4f89076fd268a9eb2e2ecf..9c35059d390c94f6d641c0fe8d37777f
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 83da28a7edb4b101138034ed6ac71a0ae36a091b..a46cbcd6393cf27a919405db0bfb4903b2f6e6fd 100644
index da79bad084e062cdbff25a47c3a324c8d072a471..1e3f63240e76102a46bfa13500629172360bc48d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1342,6 +1342,7 @@ public class PurpurWorldConfig {
@@ -1332,6 +1332,7 @@ public class PurpurWorldConfig {
public double dolphinMaxHealth = 10.0D;
public boolean dolphinDisableTreasureSearching = false;
public boolean dolphinTakeDamageFromWater = false;
@@ -59,7 +59,7 @@ index 83da28a7edb4b101138034ed6ac71a0ae36a091b..a46cbcd6393cf27a919405db0bfb4903
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinControllable = getBoolean("mobs.dolphin.controllable", dolphinControllable);
@@ -1356,6 +1357,7 @@ public class PurpurWorldConfig {
@@ -1346,6 +1347,7 @@ public class PurpurWorldConfig {
dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);
dolphinDisableTreasureSearching = getBoolean("mobs.dolphin.disable-treasure-searching", dolphinDisableTreasureSearching);
dolphinTakeDamageFromWater = getBoolean("mobs.dolphin.takes-damage-from-water", dolphinTakeDamageFromWater);

8
patches/server/0214-Cows-naturally-aggressive-to-players-chance.patch → patches/server/0212-Cows-naturally-aggressive-to-players-chance.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Cows naturally aggressive to players chance
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
index f76b0d92150fd985a8fc699f6f884527d589dfd3..3c12e179861b5514e081d0db1664f7173955629c 100644
index 4c2cc5ba3c8f15c26f01361e786d25b399747974..da3dfa10e08750e7ad84ff32a0c0136e055ee3a7 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
@@ -42,6 +42,7 @@ import org.bukkit.event.player.PlayerBucketFillEvent;
@@ -57,10 +57,10 @@ index f76b0d92150fd985a8fc699f6f884527d589dfd3..3c12e179861b5514e081d0db1664f717
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 727a70ef18192e27736ecdd6775711a17f8ce79b..e967ce42a54d97f28e50509167c7c7ac693a285b 100644
index 1e3f63240e76102a46bfa13500629172360bc48d..50429a76847b7c655cf88c49f6f3b0dbccda9d8b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1291,7 +1291,14 @@ public class PurpurWorldConfig {
@@ -1281,7 +1281,14 @@ public class PurpurWorldConfig {
public int cowFeedMushrooms = 0;
public int cowBreedingTicks = 6000;
public boolean cowTakeDamageFromWater = false;
@@ -75,7 +75,7 @@ index 727a70ef18192e27736ecdd6775711a17f8ce79b..e967ce42a54d97f28e50509167c7c7ac
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
cowControllable = getBoolean("mobs.cow.controllable", cowControllable);
@@ -1304,6 +1311,8 @@ public class PurpurWorldConfig {
@@ -1294,6 +1301,8 @@ public class PurpurWorldConfig {
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
cowBreedingTicks = getInt("mobs.cow.breeding-delay-ticks", cowBreedingTicks);
cowTakeDamageFromWater = getBoolean("mobs.cow.takes-damage-from-water", cowTakeDamageFromWater);

2
patches/server/0215-Option-for-beds-to-explode-on-villager-sleep.patch → patches/server/0213-Option-for-beds-to-explode-on-villager-sleep.patch
View File

@@ -22,7 +22,7 @@ index ee509b5eea71c17ff466fb93fe63168710065add..d2b6d094c4b93055a4e6622372c6a0a8
this.brain.setMemory(MemoryModuleType.LAST_SLEPT, this.level().getGameTime()); // CraftBukkit - decompile error
this.brain.eraseMemory(MemoryModuleType.WALK_TARGET);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 60643dc828b134d1a3956a280b1fc72348b0bd5c..8703e603f4c45fc79b0a44dd22e8497060421254 100644
index 50429a76847b7c655cf88c49f6f3b0dbccda9d8b..9b19961631c0bd2f922820ce0a33bace926afdf7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -824,6 +824,7 @@ public class PurpurWorldConfig {

6
patches/server/0216-Halloween-options-and-optimizations.patch → patches/server/0214-Halloween-options-and-optimizations.patch
View File

@@ -43,7 +43,7 @@ index 3f9e81c0bdd85bec24a1209ad3fd3dc43d988a4f..cb378b343f721c16868a6673aba59856
this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F;
}
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index 2dad874c0a425cf2d0a385b6061ab79d81b82c86..47b5a928574a57107dfaeaecf49459496a64a036 100644
index e568d014f577ab705645152446156dc04895b3bf..9e373fa5eba63ed061e666510e01a6d8cdd6997b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -586,11 +586,7 @@ public class Zombie extends Monster {
@@ -60,10 +60,10 @@ index 2dad874c0a425cf2d0a385b6061ab79d81b82c86..47b5a928574a57107dfaeaecf4945949
this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 82522611cbca7ce08b9a12e514fb8286a3280550..9e3181b5f2329d44025f7d811f1865d353cb6a96 100644
index 9b19961631c0bd2f922820ce0a33bace926afdf7..e956e8d742a525a9485bdd691e81407ae06c08f0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1684,6 +1684,13 @@ public class PurpurWorldConfig {
@@ -1674,6 +1674,13 @@ public class PurpurWorldConfig {
guardianTakeDamageFromWater = getBoolean("mobs.guardian.takes-damage-from-water", guardianTakeDamageFromWater);
}

2
patches/server/0217-Config-for-grindstones.patch → patches/server/0215-Config-for-grindstones.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Config for grindstones
diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
index 076c2b2938c9b88b7e71dbc2aa9d8c7e90d4fe75..c79e87fde9de55dbfe8c3deaf725e2a73dc2af38 100644
index 23462de504932bd351b8dfacde514fe361343912..2a2bcd0fc2b7653d9087b88e9a01034b51f017b9 100644
--- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
@@ -130,7 +130,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {

2
patches/server/0218-UPnP-Port-Forwarding.patch → patches/server/0216-UPnP-Port-Forwarding.patch
View File

@@ -32,7 +32,7 @@ index 1381e16fcac730eaecfc621a0c602bbf15d744f3..4a0e56f4fb6903ea5f4974052d9d5544
if (this.server != null) {
this.server.disablePlugins();
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index f0745f41ba4c1931e4b61ac75edcff8f8cea5b34..20bf50f07f50409d0d1f394d7c3acde9a00ff98d 100644
index d66fc3f1b8d960782a7a2e08dd72831025f9c8fd..0d70fe71651c8f9d75a604ed2d5c480b41df1dd6 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -279,6 +279,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface

2
patches/server/0219-Campfire-option-for-lit-when-placed.patch → patches/server/0217-Campfire-option-for-lit-when-placed.patch
View File

@@ -18,7 +18,7 @@ index 9c7ee02d3aa3c33b45db4dc5c079495a69d60b15..5eed401d3d722c6553240aba4a8e2337
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a50ceedce4a99e36374062dd894bf7a1f9eee17c..2b0093b9f30d5fe2c53b4a3fd02ad813d5aad555 100644
index e956e8d742a525a9485bdd691e81407ae06c08f0..a9c1bf5b07daa33325316366338f5a57027f617d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -867,6 +867,11 @@ public class PurpurWorldConfig {

2
patches/server/0220-options-to-extinguish-fire-blocks-with-snowballs.patch → patches/server/0218-options-to-extinguish-fire-blocks-with-snowballs.patch
View File

@@ -46,7 +46,7 @@ index 8d1591c3b29e02794f6f66b742ec6a121920ad71..bb61e1132c28274175215a679befdcfa
protected void onHit(HitResult hitResult) {
super.onHit(hitResult);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2b0093b9f30d5fe2c53b4a3fd02ad813d5aad555..2c3ea77d66f889fddde73bd49e6607aa2a0c3ad9 100644
index a9c1bf5b07daa33325316366338f5a57027f617d..00593e16024af69699d1b5ad7c5acb84d756a25c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -231,6 +231,9 @@ public class PurpurWorldConfig {

8
patches/server/0221-Add-option-to-disable-zombie-villagers-cure.patch → patches/server/0219-Add-option-to-disable-zombie-villagers-cure.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to disable zombie villagers cure
diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
index 6a85de8af9b260e92b4ccffa2ae3503cd29b0b98..faf03e2c69b6b4ee7d7425322b5b19974e37cb85 100644
index 40465fbe6f78da6176d5fad8a3687cefd93dcf43..f902814a23ef8a7d3893fc0349d1a0b3c203a123 100644
--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
@@ -215,7 +215,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
@@ -18,10 +18,10 @@ index 6a85de8af9b260e92b4ccffa2ae3503cd29b0b98..faf03e2c69b6b4ee7d7425322b5b1997
itemstack.shrink(1);
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ac8dcd839c1f002c02d2cdb324ec2f44794e3001..bcfe67362f5bd58b071dd96c0fc6804a22184fcd 100644
index 00593e16024af69699d1b5ad7c5acb84d756a25c..1c77929516d70407a281a0899c6722cc4210eb79 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2903,6 +2903,7 @@ public class PurpurWorldConfig {
@@ -2893,6 +2893,7 @@ public class PurpurWorldConfig {
public boolean zombieVillagerTakeDamageFromWater = false;
public int zombieVillagerCuringTimeMin = 3600;
public int zombieVillagerCuringTimeMax = 6000;
@@ -29,7 +29,7 @@ index ac8dcd839c1f002c02d2cdb324ec2f44794e3001..bcfe67362f5bd58b071dd96c0fc6804a
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2920,6 +2921,7 @@ public class PurpurWorldConfig {
@@ -2910,6 +2911,7 @@ public class PurpurWorldConfig {
zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater);
zombieVillagerCuringTimeMin = getInt("mobs.zombie_villager.curing_time.min", zombieVillagerCuringTimeMin);
zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax);

2
patches/server/0222-Persistent-BlockEntity-Lore-and-DisplayName.patch → patches/server/0220-Persistent-BlockEntity-Lore-and-DisplayName.patch
View File

@@ -195,7 +195,7 @@ index 9ea74d37cd951e0dc76d20ed8234b5871035566c..8e1afae66742fc69d5aab1074ba94a39
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index bcfe67362f5bd58b071dd96c0fc6804a22184fcd..3ba96a753639a5094c8c820bf28a14c90accddff 100644
index 1c77929516d70407a281a0899c6722cc4210eb79..b4d5ae4025d315cfe0e19fa1b077d1c5956523ba 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -130,6 +130,7 @@ public class PurpurWorldConfig {

10
patches/server/0223-Signs-allow-color-codes.patch → patches/server/0221-Signs-allow-color-codes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Signs allow color codes
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index cd449e35bbc689ce6d2595693a4fbe1f226998c8..943e864d7e25f77023337d7c719fc3d9a4b3ac55 100644
index 8601df7eefe25b2a6f5cc3a2dbda35695b1e0202..c0543808d13453f9d1f56ef83b9ab16db2edd5bf 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1589,6 +1589,7 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index cd449e35bbc689ce6d2595693a4fbe1f226998c8..943e864d7e25f77023337d7c719fc3d9
this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos(), front));
}
diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
index a3ec2f522be2d02b9e37810799cecc2ba14f58f3..b0f3095a8eacf1c903c6190db440b21ca0d9acb1 100644
index 927c7ea03560be0c86884cec70ee8e408e66cb07..93764bf849ad8e427bf119f6ff3dbcbcc4c2415e 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
@@ -200,16 +200,31 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
@@ -84,11 +84,11 @@ index a3ec2f522be2d02b9e37810799cecc2ba14f58f3..b0f3095a8eacf1c903c6190db440b21c
public CompoundTag getUpdateTag() {
return this.saveWithoutMetadata();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 72c6b244e358aceffd934e1224952b459940e608..d5ce0eda09bfa4b6e708b5468697102cc853cfc7 100644
index b4d5ae4025d315cfe0e19fa1b077d1c5956523ba..d807da2719c5677c200e5f017e4cf5a1c7fa0ce9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1042,6 +1042,11 @@ public class PurpurWorldConfig {
fixSandDuping = getBoolean("blocks.sand.fix-duping", fixSandDuping);
@@ -1032,6 +1032,11 @@ public class PurpurWorldConfig {
}
}
+ public boolean signAllowColors = false;

0
patches/server/0224-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch → patches/server/0222-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch
View File

274
patches/server/0225-Mobs-always-drop-experience.patch → patches/server/0223-Mobs-always-drop-experience.patch
View File

File diff suppressed because it is too large Load Diff

0
patches/server/0226-Potion-NamespacedKey.patch → patches/server/0224-Potion-NamespacedKey.patch
View File

2
patches/server/0227-Grindstone-API.patch → patches/server/0225-Grindstone-API.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Grindstone API
diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
index c79e87fde9de55dbfe8c3deaf725e2a73dc2af38..b1eacb9691b320a10de3420fae3632bb9d5b7ae3 100644
index 2a2bcd0fc2b7653d9087b88e9a01034b51f017b9..af99ce32872e079beb6ac1caf3a8ac4c3cae4648 100644
--- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
@@ -95,9 +95,11 @@ public class GrindstoneMenu extends AbstractContainerMenu {

4
patches/server/0228-Ability-for-hoe-to-replant-crops-and-nether-warts.patch → patches/server/0226-Ability-for-hoe-to-replant-crops-and-nether-warts.patch
View File

@@ -34,7 +34,7 @@ index bed3d9c781c7d3ca260027b4737970889a54689c..db1941ed32d141327a8b11e54b3ff990
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/world/level/block/CropBlock.java b/src/main/java/net/minecraft/world/level/block/CropBlock.java
index 0e06958657201806f425990ac01a5f8acc540f3e..2dbfc522990964b2ae5a9e5f84426e0749f92563 100644
index 55e28eef76d9d534037d888d85c0609052478118..2077cb5dcf2352c9d5b502744aeb9a66df256939 100644
--- a/src/main/java/net/minecraft/world/level/block/CropBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/CropBlock.java
@@ -214,4 +214,15 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
@@ -74,7 +74,7 @@ index 0fc333f240d6918e841a9221be42973839408802..464a9d2e4c694d5d4aae6c2d3e8a5fad
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ecf28b77b6d899827d6f35681bfdc1bb5b993dc1..476545737acdb0da8e5f5def12164c7f83cbaa80 100644
index f66cb47080fb4e046ba9fd9aa589f2d9d85dc8c3..3a455bd12ee2a4497393cea44bd3507300c19d98 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -539,6 +539,8 @@ public class PurpurWorldConfig {

4
patches/server/0229-Turtle-eggs-random-tick-crack-chance.patch → patches/server/0227-Turtle-eggs-random-tick-crack-chance.patch
View File

@@ -18,10 +18,10 @@ index 430ccf1b9f5c6306bbe610d1f9058c1a4bfa2986..b18545e1bd55fa468af6d6c03211036e
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b3b79975bc3d4e56246e7aec34750f50dd85c61a..0ce9870c1da0cba4e3ee7ccb05ace4fc4e1b0223 100644
index 3a455bd12ee2a4497393cea44bd3507300c19d98..c3c6d0a25a7f068f54ab0c5065f64599abd8e04f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1076,11 +1076,13 @@ public class PurpurWorldConfig {
@@ -1066,11 +1066,13 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromItems = false;
public boolean turtleEggsBreakFromMinecarts = false;
public boolean turtleEggsBypassMobGriefing = false;

18
patches/server/0230-Mob-head-visibility-percent.patch → patches/server/0228-Mob-head-visibility-percent.patch
View File

@@ -32,10 +32,10 @@ index 9f542c8ddb25faaef00d5db354f1c1fe3cfc3c45..99c5cd7f20435be1f78cfed4f952e4c7
// Purpur start
if (entity instanceof LivingEntity entityliving) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 0ce9870c1da0cba4e3ee7ccb05ace4fc4e1b0223..7bd8d35e35a9893e25de6f671f95fb806d788485 100644
index c3c6d0a25a7f068f54ab0c5065f64599abd8e04f..a3b5ab71509a61825b6344889d7f0b82d9822ba7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1370,6 +1370,7 @@ public class PurpurWorldConfig {
@@ -1360,6 +1360,7 @@ public class PurpurWorldConfig {
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
@@ -43,7 +43,7 @@ index 0ce9870c1da0cba4e3ee7ccb05ace4fc4e1b0223..7bd8d35e35a9893e25de6f671f95fb80
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1387,6 +1388,7 @@ public class PurpurWorldConfig {
@@ -1377,6 +1378,7 @@ public class PurpurWorldConfig {
creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);
creeperHealthRadius = getBoolean("mobs.creeper.health-impacts-explosion", creeperHealthRadius);
creeperAlwaysDropExp = getBoolean("mobs.creeper.always-drop-exp", creeperAlwaysDropExp);
@@ -51,7 +51,7 @@ index 0ce9870c1da0cba4e3ee7ccb05ace4fc4e1b0223..7bd8d35e35a9893e25de6f671f95fb80
}
public boolean dolphinRidable = false;
@@ -2173,6 +2175,7 @@ public class PurpurWorldConfig {
@@ -2163,6 +2165,7 @@ public class PurpurWorldConfig {
public boolean piglinTakeDamageFromWater = false;
public int piglinPortalSpawnModifier = 2000;
public boolean piglinAlwaysDropExp = false;
@@ -59,7 +59,7 @@ index 0ce9870c1da0cba4e3ee7ccb05ace4fc4e1b0223..7bd8d35e35a9893e25de6f671f95fb80
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -2187,6 +2190,7 @@ public class PurpurWorldConfig {
@@ -2177,6 +2180,7 @@ public class PurpurWorldConfig {
piglinTakeDamageFromWater = getBoolean("mobs.piglin.takes-damage-from-water", piglinTakeDamageFromWater);
piglinPortalSpawnModifier = getInt("mobs.piglin.portal-spawn-modifier", piglinPortalSpawnModifier);
piglinAlwaysDropExp = getBoolean("mobs.piglin.always-drop-exp", piglinAlwaysDropExp);
@@ -67,7 +67,7 @@ index 0ce9870c1da0cba4e3ee7ccb05ace4fc4e1b0223..7bd8d35e35a9893e25de6f671f95fb80
}
public boolean piglinBruteRidable = false;
@@ -2446,6 +2450,7 @@ public class PurpurWorldConfig {
@@ -2436,6 +2440,7 @@ public class PurpurWorldConfig {
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
@@ -75,7 +75,7 @@ index 0ce9870c1da0cba4e3ee7ccb05ace4fc4e1b0223..7bd8d35e35a9893e25de6f671f95fb80
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2458,6 +2463,7 @@ public class PurpurWorldConfig {
@@ -2448,6 +2453,7 @@ public class PurpurWorldConfig {
skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
@@ -83,7 +83,7 @@ index 0ce9870c1da0cba4e3ee7ccb05ace4fc4e1b0223..7bd8d35e35a9893e25de6f671f95fb80
}
public boolean skeletonHorseRidable = false;
@@ -2992,6 +2998,7 @@ public class PurpurWorldConfig {
@@ -2982,6 +2988,7 @@ public class PurpurWorldConfig {
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
@@ -91,7 +91,7 @@ index 0ce9870c1da0cba4e3ee7ccb05ace4fc4e1b0223..7bd8d35e35a9893e25de6f671f95fb80
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -3010,6 +3017,7 @@ public class PurpurWorldConfig {
@@ -3000,6 +3007,7 @@ public class PurpurWorldConfig {
zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
zombieAlwaysDropExp = getBoolean("mobs.zombie.always-drop-exp", zombieAlwaysDropExp);

0
patches/server/0231-Configurable-valid-characters-for-usernames.patch → patches/server/0229-Configurable-valid-characters-for-usernames.patch
View File

0
patches/server/0232-Shears-can-have-looting-enchantment.patch → patches/server/0230-Shears-can-have-looting-enchantment.patch
View File

8
patches/server/0233-Stop-bees-from-dying-after-stinging.patch → patches/server/0231-Stop-bees-from-dying-after-stinging.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Stop bees from dying after stinging
diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
index 6d7b8c9f9bfe296263f1752f485dcf8f53af8142..0a4ca865d1e41efca0eb8287c833e642e838b01a 100644
index 9fa937d2d6c3b23e390447e4d4fa24543e2679e5..c2dae3636145105ecb3ae950e07095f278f72ac2 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
@@ -446,6 +446,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -17,10 +17,10 @@ index 6d7b8c9f9bfe296263f1752f485dcf8f53af8142..0a4ca865d1e41efca0eb8287c833e642
++this.timeSinceSting;
if (this.timeSinceSting % 5 == 0 && this.random.nextInt(Mth.clamp(1200 - this.timeSinceSting, 1, 1200)) == 0) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c793c0c91f7ef6d5e847fd10a908fee09208bc12..a3ec794d6690574bac653321301668aba420a967 100644
index a3b5ab71509a61825b6344889d7f0b82d9822ba7..278cc18842f83b8a997dd3fa43449fb90660693c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1171,6 +1171,7 @@ public class PurpurWorldConfig {
@@ -1161,6 +1161,7 @@ public class PurpurWorldConfig {
public boolean beeCanWorkAtNight = false;
public boolean beeCanWorkInRain = false;
public boolean beeAlwaysDropExp = false;
@@ -28,7 +28,7 @@ index c793c0c91f7ef6d5e847fd10a908fee09208bc12..a3ec794d6690574bac653321301668ab
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -1187,6 +1188,7 @@ public class PurpurWorldConfig {
@@ -1177,6 +1178,7 @@ public class PurpurWorldConfig {
beeCanWorkAtNight = getBoolean("mobs.bee.can-work-at-night", beeCanWorkAtNight);
beeCanWorkInRain = getBoolean("mobs.bee.can-work-in-rain", beeCanWorkInRain);
beeAlwaysDropExp = getBoolean("mobs.bee.always-drop-exp", beeAlwaysDropExp);

0
patches/server/0234-Give-bee-counts-in-beehives-to-Purpur-clients.patch → patches/server/0232-Give-bee-counts-in-beehives-to-Purpur-clients.patch
View File

4
patches/server/0235-Configurable-farmland-trample-height.patch → patches/server/0233-Configurable-farmland-trample-height.patch
View File

@@ -22,7 +22,7 @@ Value set -> Actual fall distance needed to trample
6.0 -> 6.75
diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
index 5c93cf7f97ecf4fba2c905b293ca7d21d1424f30..c4eca9db159d6a581d863558ebc3008d51d25cfb 100644
index 00a6aa924e47e18ae80b57e9fe1d38e2de15dd72..0c39126ce51439cce05747161aba43bce33a12d8 100644
--- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
@@ -110,7 +110,7 @@ public class FarmBlock extends Block {
@@ -35,7 +35,7 @@ index 5c93cf7f97ecf4fba2c905b293ca7d21d1424f30..c4eca9db159d6a581d863558ebc3008d
org.bukkit.event.Cancellable cancellable;
if (entity instanceof Player) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a3ec794d6690574bac653321301668aba420a967..63c29714c855f95f62ecdf19b1502881699206c9 100644
index 278cc18842f83b8a997dd3fa43449fb90660693c..52b08015601eb266719c907f4dbed4a0ce8af072 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -959,6 +959,7 @@ public class PurpurWorldConfig {

2
patches/server/0236-Configurable-player-pickup-exp-delay.patch → patches/server/0234-Configurable-player-pickup-exp-delay.patch
View File

@@ -35,7 +35,7 @@ index 4297622fecf2cde16cdcb206ecc3e912b06c0a66..43199815ffe3d666577390b96187aa89
} else if (!entity.isRemoved()) {
this.touch(entity);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e7eb471bb2c91be2a6da2918e31f5b18be584646..631467b92404a37849d673f15ddfadfe544cff19 100644
index 52b08015601eb266719c907f4dbed4a0ce8af072..1350e3de8ca03eb7c6653f1f5523c2a8455d9975 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -420,6 +420,7 @@ public class PurpurWorldConfig {

4
patches/server/0237-Allow-void-trading.patch → patches/server/0235-Allow-void-trading.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow void trading
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index e675d7e82245e1b7ef94fc55f393002ab572e2ba..e2c5a03bcf008db05e6170184c6167d2ca1555fb 100644
index f141031f668898b8cc0ac1970b9026da6be4a466..6c165580b2c57a7fb95833208a72af33988427dc 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2909,7 +2909,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -18,7 +18,7 @@ index e675d7e82245e1b7ef94fc55f393002ab572e2ba..e2c5a03bcf008db05e6170184c6167d2
}
// Paper end - Fix merchant inventory not closing on entity removal
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a9dba090d637c5942d09ffc4698e3397a137a7ac..09cac0ae130610fd1ce50eb092fe758cfe71a4dd 100644
index 1350e3de8ca03eb7c6653f1f5523c2a8455d9975..eaa7070d71d6c8ae3adcaaeb52eb3439cf87c034 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -421,6 +421,7 @@ public class PurpurWorldConfig {

8
patches/server/0238-Configurable-phantom-size.patch → patches/server/0236-Configurable-phantom-size.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable phantom size
diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
index ab9ed9acc394dedf2151b83ff5cf998e0e0be21e..355445b7f8972cb789d33f59d03c382f238c294d 100644
index 8591fb95aa3079d7722f445ce1b1743c1f02b9bc..44a24707530ca46a6a42e8a4d9049e75f65aa66b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
@@ -272,7 +272,11 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -22,10 +22,10 @@ index ab9ed9acc394dedf2151b83ff5cf998e0e0be21e..355445b7f8972cb789d33f59d03c382f
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 09cac0ae130610fd1ce50eb092fe758cfe71a4dd..1620ed5e1fab8575af02fefc910865d1b8a50322 100644
index eaa7070d71d6c8ae3adcaaeb52eb3439cf87c034..bc3b4d6efe2182b634c021ad5772a8a81d4cc2d9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2113,6 +2113,8 @@ public class PurpurWorldConfig {
@@ -2103,6 +2103,8 @@ public class PurpurWorldConfig {
public boolean phantomFlamesOnSwoop = false;
public boolean phantomTakeDamageFromWater = false;
public boolean phantomAlwaysDropExp = false;
@@ -34,7 +34,7 @@ index 09cac0ae130610fd1ce50eb092fe758cfe71a4dd..1620ed5e1fab8575af02fefc910865d1
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -2149,6 +2151,13 @@ public class PurpurWorldConfig {
@@ -2139,6 +2141,13 @@ public class PurpurWorldConfig {
phantomFlamesOnSwoop = getBoolean("mobs.phantom.flames-on-swoop", phantomFlamesOnSwoop);
phantomTakeDamageFromWater = getBoolean("mobs.phantom.takes-damage-from-water", phantomTakeDamageFromWater);
phantomAlwaysDropExp = getBoolean("mobs.phantom.always-drop-exp", phantomAlwaysDropExp);

0
patches/server/0239-Configurable-food-attributes.patch → patches/server/0237-Configurable-food-attributes.patch
View File

0
patches/server/0240-Max-joins-per-second.patch → patches/server/0238-Max-joins-per-second.patch
View File

6
patches/server/0241-Configurable-minimum-demand-for-trades.patch → patches/server/0239-Configurable-minimum-demand-for-trades.patch
View File

@@ -40,10 +40,10 @@ index 02feea12c998f37098b72becf6bfaf6b27d155de..9c89a85d934955c9388cfe1361f13e70
public ItemStack assemble() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 4a953d543fb14bc36e775a976710f11633da7c86..c312382eeb38b9d6b2420b482c1467d6f27beb81 100644
index bc3b4d6efe2182b634c021ad5772a8a81d4cc2d9..c5eaf27e8983949ede5555da7905fa7bc1bf5700 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2794,6 +2794,7 @@ public class PurpurWorldConfig {
@@ -2784,6 +2784,7 @@ public class PurpurWorldConfig {
public boolean villagerTakeDamageFromWater = false;
public boolean villagerAllowTrading = true;
public boolean villagerAlwaysDropExp = false;
@@ -51,7 +51,7 @@ index 4a953d543fb14bc36e775a976710f11633da7c86..c312382eeb38b9d6b2420b482c1467d6
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2814,6 +2815,7 @@ public class PurpurWorldConfig {
@@ -2804,6 +2805,7 @@ public class PurpurWorldConfig {
villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater);
villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading);
villagerAlwaysDropExp = getBoolean("mobs.villager.always-drop-exp", villagerAlwaysDropExp);

6
patches/server/0242-Lobotomize-stuck-villagers.patch → patches/server/0240-Lobotomize-stuck-villagers.patch
View File

@@ -105,10 +105,10 @@ index 6c15d40979fd3e3d246a447c432b321fbf29ada3..6ace76a829c88e2e747dbbcce0a6582c
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c312382eeb38b9d6b2420b482c1467d6f27beb81..6fa783b3f064b0e62c67f5a5709fbe9c0d3b51a7 100644
index c5eaf27e8983949ede5555da7905fa7bc1bf5700..0135c477ca5e8401177083bcd41573d7e24ec850 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2795,6 +2795,9 @@ public class PurpurWorldConfig {
@@ -2785,6 +2785,9 @@ public class PurpurWorldConfig {
public boolean villagerAllowTrading = true;
public boolean villagerAlwaysDropExp = false;
public int villagerMinimumDemand = 0;
@@ -118,7 +118,7 @@ index c312382eeb38b9d6b2420b482c1467d6f27beb81..6fa783b3f064b0e62c67f5a5709fbe9c
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2816,6 +2819,18 @@ public class PurpurWorldConfig {
@@ -2806,6 +2809,18 @@ public class PurpurWorldConfig {
villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading);
villagerAlwaysDropExp = getBoolean("mobs.villager.always-drop-exp", villagerAlwaysDropExp);
villagerMinimumDemand = getInt("mobs.villager.minimum-demand", villagerMinimumDemand);

6
patches/server/0243-Option-for-villager-display-trade-item.patch → patches/server/0241-Option-for-villager-display-trade-item.patch
View File

@@ -17,10 +17,10 @@ index c3e0b1f11b58668f9f24eb421abc340e1b49dfac..d809fa4f96e2c528075f544355397903
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 26351f5ba9fd4f2e231481cfdd52341e0f4d96a4..38ebf581f6abc16b7556057c05cead5c2bfaa0f7 100644
index 0135c477ca5e8401177083bcd41573d7e24ec850..a1b2c5ea3687fc0cfc3c1b9e170aa801c9cc541c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2798,6 +2798,7 @@ public class PurpurWorldConfig {
@@ -2788,6 +2788,7 @@ public class PurpurWorldConfig {
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheckInterval = 100;
public boolean villagerLobotomizeWaitUntilTradeLocked = false;
@@ -28,7 +28,7 @@ index 26351f5ba9fd4f2e231481cfdd52341e0f4d96a4..38ebf581f6abc16b7556057c05cead5c
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2831,6 +2832,7 @@ public class PurpurWorldConfig {
@@ -2821,6 +2822,7 @@ public class PurpurWorldConfig {
villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
villagerLobotomizeCheckInterval = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheckInterval);
villagerLobotomizeWaitUntilTradeLocked = getBoolean("mobs.villager.lobotomize.wait-until-trade-locked", villagerLobotomizeWaitUntilTradeLocked);

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

@@ -17,10 +17,10 @@ index 9b897cf53f4bb5d366e6ac88dbed93c59d8fe541..fc61f93e04e5bc893b89c746deb2b89c
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7f91d3d56f6c4077e773c82da0f96103c892b82b..440ba9fb9c30973ea3268298923812962034b2db 100644
index a1b2c5ea3687fc0cfc3c1b9e170aa801c9cc541c..a07d11bd3abdb77e16a7cb7db498690c4326613f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1063,8 +1063,10 @@ public class PurpurWorldConfig {
@@ -1053,8 +1053,10 @@ public class PurpurWorldConfig {
}
public boolean spawnerDeactivateByRedstone = false;

2
patches/server/0245-Config-for-mob-last-hurt-by-player-time.patch → patches/server/0243-Config-for-mob-last-hurt-by-player-time.patch
View File

@@ -38,7 +38,7 @@ index 9730a5469f81687cfde0a19a58d1c2147588d1d2..e3f724a19ab2f9821d84f9b03acf7c92
// Paper end
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d88a842902523d0a44996876ed5b789c9b83a837..9ffbf8e1957cff2c82a0d127dfa84f62766c20d3 100644
index a07d11bd3abdb77e16a7cb7db498690c4326613f..2b5475c0032171fec4a5e8a7b435168c5b95b17b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -142,6 +142,7 @@ public class PurpurWorldConfig {

2
patches/server/0246-Anvil-repair-damage-options.patch → patches/server/0244-Anvil-repair-damage-options.patch
View File

@@ -64,7 +64,7 @@ index 9fca247f51e8b4d445f61ab5c16faf3928626deb..583bb1282fedcab75dbe4359a9f53b76
return InteractionResult.SUCCESS;
} else {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 6d1a29d5b9695c4f2392a82f8c1b11db220ea727..92019e20b9a67eb3c8be875ed57943c1ee1538d6 100644
index 2b5475c0032171fec4a5e8a7b435168c5b95b17b..d00d9068134957fb76740e94e7cce055d8ea9f43 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -820,9 +820,13 @@ public class PurpurWorldConfig {

4
patches/server/0247-Option-to-disable-turtle-egg-trampling-with-feather-.patch → patches/server/0245-Option-to-disable-turtle-egg-trampling-with-feather-.patch
View File

@@ -24,10 +24,10 @@ index b18545e1bd55fa468af6d6c03211036eb9fa146d..9a76665c6369b4106d152370dc3d2f56
return world.purpurConfig.turtleEggsBypassMobGriefing || world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
// Purpur end
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b291d8943dc6fe38ccc2ca2a17b53d3cfb5eb894..2c577f12f86ed843f823f5756fd7cddb8bb807a6 100644
index d00d9068134957fb76740e94e7cce055d8ea9f43..bafd2cd23363a2bc3c64f402842d0e39731eed1c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1091,12 +1091,14 @@ public class PurpurWorldConfig {
@@ -1081,12 +1081,14 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromMinecarts = false;
public boolean turtleEggsBypassMobGriefing = false;
public int turtleEggsRandomTickCrackChance = 500;

2
patches/server/0248-Add-toggle-for-enchant-level-clamping.patch → patches/server/0246-Add-toggle-for-enchant-level-clamping.patch
View File

@@ -31,7 +31,7 @@ index 2048899f8e4c8211e8dde0d11148d647678009fa..1eec84e217f6dc929091fa7451cd235e
@Nullable
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index f17b160b304b1adbde80690ae482986309f3befe..c6628a28387023b334dd99a4e469126a2108c38b 100644
index a05da9ff158c6e7d55abb23e4b28f3703e9e5b3d..a504f727f5aaa605809938b4e7e7bbe9b84c522a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -398,6 +398,7 @@ public class PurpurConfig {

0
patches/server/0249-Skip-junit-tests-for-purpur-commands.patch → patches/server/0247-Skip-junit-tests-for-purpur-commands.patch
View File

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

@@ -18,10 +18,10 @@ index a188a36d919037fa3177ad7f6930570f5e130fc9..ef7c67f591ca4a3c73b87a7c44b37ad0
AABB axisalignedbb = this.getBoundingBox().inflate(10.0D, 10.0D, 10.0D);
List<Villager> list = world.getEntitiesOfClass(Villager.class, axisalignedbb);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2c577f12f86ed843f823f5756fd7cddb8bb807a6..adf1064af51c737f97c071fb65019a874a881a18 100644
index bafd2cd23363a2bc3c64f402842d0e39731eed1c..d58497ff0cf698d8739e07083ef391f65aa39090 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2809,6 +2809,8 @@ public class PurpurWorldConfig {
@@ -2799,6 +2799,8 @@ public class PurpurWorldConfig {
public int villagerLobotomizeCheckInterval = 100;
public boolean villagerLobotomizeWaitUntilTradeLocked = false;
public boolean villagerDisplayTradeItem = true;
@@ -30,7 +30,7 @@ index 2c577f12f86ed843f823f5756fd7cddb8bb807a6..adf1064af51c737f97c071fb65019a87
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2843,6 +2845,8 @@ public class PurpurWorldConfig {
@@ -2833,6 +2835,8 @@ public class PurpurWorldConfig {
villagerLobotomizeCheckInterval = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheckInterval);
villagerLobotomizeWaitUntilTradeLocked = getBoolean("mobs.villager.lobotomize.wait-until-trade-locked", villagerLobotomizeWaitUntilTradeLocked);
villagerDisplayTradeItem = getBoolean("mobs.villager.display-trade-item", villagerDisplayTradeItem);

4
patches/server/0251-Stonecutter-damage.patch → patches/server/0249-Stonecutter-damage.patch
View File

@@ -152,10 +152,10 @@ index a504f727f5aaa605809938b4e7e7bbe9b84c522a..9bc5cc4944dcd3918b2a90bde9dd8fdd
public static boolean advancementOnlyBroadcastToAffectedPlayer = false;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index adf1064af51c737f97c071fb65019a874a881a18..f78b58599325a93658f6c6c2df9bde1ae4fb8784 100644
index d58497ff0cf698d8739e07083ef391f65aa39090..b099b1abfe527b066c2bc9e89dc98c52db34c3eb 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1086,6 +1086,11 @@ public class PurpurWorldConfig {
@@ -1076,6 +1076,11 @@ public class PurpurWorldConfig {
spongeAbsorbsWaterFromMud = getBoolean("blocks.sponge.absorbs-water-from-mud", spongeAbsorbsWaterFromMud);
}

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

@@ -18,10 +18,10 @@ index 746c211b575ca588deadbbcd5c55b614e8660ba8..2f38bac9efc224084505e80254662326
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f78b58599325a93658f6c6c2df9bde1ae4fb8784..f0dbcc6193f5fca36e9e54c792d55d135b03b4ca 100644
index b099b1abfe527b066c2bc9e89dc98c52db34c3eb..6dfc93af8bab6462d4ab0940ea61652065b0b581 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1022,6 +1022,13 @@ public class PurpurWorldConfig {
@@ -1017,6 +1017,13 @@ public class PurpurWorldConfig {
pistonBlockPushLimit = getInt("blocks.piston.block-push-limit", pistonBlockPushLimit);
}

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

@@ -22,10 +22,10 @@ index a3da9536c3a3ad33d1c795673bdd7b05d6534054..9b057f3967aae5d0ca621b19d1212db9
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index bbd1eefc53f91adce1102d865bd0c92c2cc090c2..b301f0778a2dc0de4a899da06598aed314ef545c 100644
index 6dfc93af8bab6462d4ab0940ea61652065b0b581..ba8d194d1a6ecab995b31d04687f269389811754 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1003,9 +1003,11 @@ public class PurpurWorldConfig {
@@ -998,9 +998,11 @@ public class PurpurWorldConfig {
public boolean mobsSpawnOnPackedIce = true;
public boolean mobsSpawnOnBlueIce = true;

6
patches/server/0254-Skeletons-eat-wither-roses.patch → patches/server/0252-Skeletons-eat-wither-roses.patch
View File

@@ -94,10 +94,10 @@ index 2064d6177b3e43810d5962102fe914296e2627ff..30ff77f5f137614b5d0d2df6dc90f47c
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 163b01e476dc3b53d0176b6606f65ce2cbc6bc21..b08fd09753dfab6c31cf59c189f9a55d9f77c5a5 100644
index ba8d194d1a6ecab995b31d04687f269389811754..e77c777096229ff1ad14fe58c531e2bf1ed7bf3b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2492,6 +2492,7 @@ public class PurpurWorldConfig {
@@ -2482,6 +2482,7 @@ public class PurpurWorldConfig {
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
public double skeletonHeadVisibilityPercent = 0.5D;
@@ -105,7 +105,7 @@ index 163b01e476dc3b53d0176b6606f65ce2cbc6bc21..b08fd09753dfab6c31cf59c189f9a55d
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2505,6 +2506,7 @@ public class PurpurWorldConfig {
@@ -2495,6 +2496,7 @@ public class PurpurWorldConfig {
skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
skeletonHeadVisibilityPercent = getDouble("mobs.skeleton.head-visibility-percent", skeletonHeadVisibilityPercent);

6
patches/server/0255-Enchantment-Table-Persists-Lapis.patch → patches/server/0253-Enchantment-Table-Persists-Lapis.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Enchantment Table Persists Lapis
diff --git a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
index c5c509fbb915c60dfa95aac8510684d0b9f8b0ff..d604b7ec46f08993647979ed220a84842e3fe325 100644
index 343f44db579839eb61376f876b5eff2e615dc2e5..849b6a30d412d10f1e2e6e88f2d8d990e4a720e4 100644
--- a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
@@ -40,6 +40,12 @@ import org.bukkit.event.enchantment.PrepareItemEnchantEvent;
@@ -146,10 +146,10 @@ index 65e1381bb2d10bd212463feb602c60f8fdb9ade1..b7370e64fd0d50e8725d7d5afc30af2e
+ // Purpur
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ef6ed71bf4674b7f0275e3cc4487f9f311d4cf48..5af36ce329de61f867e702740edb8c1cebe2cc09 100644
index e77c777096229ff1ad14fe58c531e2bf1ed7bf3b..7f159bc172cf9414cf34e8141d841764b80b204d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1529,6 +1529,11 @@ public class PurpurWorldConfig {
@@ -1519,6 +1519,11 @@ public class PurpurWorldConfig {
elderGuardianAlwaysDropExp = getBoolean("mobs.elder_guardian.always-drop-exp", elderGuardianAlwaysDropExp);
}

0
patches/server/0256-Spark-Profiler.patch → patches/server/0254-Spark-Profiler.patch
View File

2
patches/server/0257-Option-to-disable-kick-for-out-of-order-chat.patch → patches/server/0255-Option-to-disable-kick-for-out-of-order-chat.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Option to disable kick for out of order chat
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 5e17a72dbe105a1a0221d857b6da39a855127aab..7dec861f49e7db0ac7cf4f4942881f237ebcd61f 100644
index 72ac438ec1a6628c861bdab9626c77666d4ba2b6..9107cc4860f81460f3424aeac4ca026b891ab47f 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1716,7 +1716,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

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