diff --git a/divinemc-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch b/divinemc-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch index 27bfd2a..ee38ed3 100644 --- a/divinemc-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch +++ b/divinemc-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -4011,4 +_,14 @@ +@@ -4047,4 +_,14 @@ sendDeathScreen(message); } // Purpur end diff --git a/divinemc-server/paper-patches/features/0001-Rebrand.patch b/divinemc-server/paper-patches/features/0001-Rebrand.patch index dd2e214..dd16252 100644 --- a/divinemc-server/paper-patches/features/0001-Rebrand.patch +++ b/divinemc-server/paper-patches/features/0001-Rebrand.patch @@ -171,10 +171,10 @@ index 99eb04643fce44c37fd96c99756837ccafe7b559..7f5678aa5c6d6d4365ea219c7c78ff23 if (stream != null) { diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 6e1e1b45c178b8917cb63d62dec8538a7eb7aa1a..41618cd4f38167d89ca73391fe6d89123a6f88a8 100644 +index 776bc01784b53e3f1d9a35046109c3b9ee4f0882..ce6c05dd9a83a4f169496e53e28398ec5e73b068 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java -@@ -77,14 +77,14 @@ public class WatchdogThread extends Thread { +@@ -77,14 +77,14 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre if (isLongTimeout) { // Paper end logger.log(Level.SEVERE, "------------------------------"); @@ -192,7 +192,7 @@ index 6e1e1b45c178b8917cb63d62dec8538a7eb7aa1a..41618cd4f38167d89ca73391fe6d8912 if (net.minecraft.world.level.Level.lastPhysicsProblem != null) { logger.log(Level.SEVERE, "------------------------------"); -@@ -104,12 +104,12 @@ public class WatchdogThread extends Thread { +@@ -104,12 +104,12 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre } // Paper end } else { @@ -207,7 +207,7 @@ index 6e1e1b45c178b8917cb63d62dec8538a7eb7aa1a..41618cd4f38167d89ca73391fe6d8912 FeatureHooks.dumpAllChunkLoadInfo(MinecraftServer.getServer(), isLongTimeout); // Paper - log detailed tick information WatchdogThread.dumpThread(ManagementFactory.getThreadMXBean().getThreadInfo(MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE), logger); logger.log(Level.SEVERE, "------------------------------"); -@@ -122,7 +122,7 @@ public class WatchdogThread extends Thread { +@@ -122,7 +122,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre WatchdogThread.dumpThread(thread, logger); } } else { diff --git a/divinemc-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch b/divinemc-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch index 66b2f60..83e1f7b 100644 --- a/divinemc-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch +++ b/divinemc-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -208,7 +_,7 @@ +@@ -213,7 +_,7 @@ private boolean hasPlayedBefore = false; private final ConversationTracker conversationTracker = new ConversationTracker(); private final Set channels = new HashSet(); @@ -9,7 +9,7 @@ private final Set unlistedEntities = new HashSet<>(); // Paper - Add Listing API for Player private static final WeakHashMap> pluginWeakReferences = new WeakHashMap<>(); private int hash = 0; -@@ -2264,8 +_,14 @@ +@@ -2269,8 +_,14 @@ @Override public boolean canSee(org.bukkit.entity.Entity entity) { @@ -26,7 +26,7 @@ public boolean canSeePlayer(UUID uuid) { org.bukkit.entity.Entity entity = this.getServer().getPlayer(uuid); -@@ -3644,4 +_,19 @@ +@@ -3682,4 +_,19 @@ this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundPlayerCombatKillPacket(getEntityId(), io.papermc.paper.adventure.PaperAdventure.asVanilla(message))); } // Purpur end - Death screen API diff --git a/gradle.properties b/gradle.properties index c4a5a7e..c411360 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = space.bxteam.divinemc mcVersion=1.21.4 version=1.21.4-R0.1-SNAPSHOT -purpurRef=5583a3f19b75a9d07367e2ca80adbbafa9af6593 +purpurRef=9b57576430f054d3bacf2d56bec7898fd501152b experimental=false org.gradle.configuration-cache=true