diff --git a/divinemc-server/build.gradle.kts.patch b/divinemc-server/build.gradle.kts.patch index 2a307f6..7ca219c 100644 --- a/divinemc-server/build.gradle.kts.patch +++ b/divinemc-server/build.gradle.kts.patch @@ -7,7 +7,7 @@ +val bxTeamMavenPublicUrl = "https://repo.bxteam.org/snapshots/" dependencies { - mache("io.papermc:mache:1.21.8+build.1") + mache("io.papermc:mache:1.21.8+build.2") @@ -29,6 +_,7 @@ // Purpur start - Rebrand diff --git a/divinemc-server/minecraft-patches/features/0023-Option-to-disable-disconnect.spam.patch b/divinemc-server/minecraft-patches/features/0023-Option-to-disable-disconnect.spam.patch index acec63f..079adab 100644 --- a/divinemc-server/minecraft-patches/features/0023-Option-to-disable-disconnect.spam.patch +++ b/divinemc-server/minecraft-patches/features/0023-Option-to-disable-disconnect.spam.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option to disable disconnect.spam diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e269535609363528971268fdca9e6a6b70902608..637c5ca0c004e5de66bc3f84dba5fee47f729579 100644 +index 163a3db5863c8c07035d601ca8432c11ab4f4ae6..0211132aa0df7a35c8fcf19eba12b64ba3c65f2f 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -846,7 +846,7 @@ public class ServerGamePacketListenerImpl @@ -42,7 +42,7 @@ index e269535609363528971268fdca9e6a6b70902608..637c5ca0c004e5de66bc3f84dba5fee4 && !this.server.getPlayerList().isOp(this.player.getGameProfile()) && !this.server.isSingleplayerOwner(this.player.getGameProfile())) { this.disconnectAsync(Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Paper - kick event cause & add proper async disconnect -@@ -3330,7 +3332,7 @@ public class ServerGamePacketListenerImpl +@@ -3331,7 +3333,7 @@ public class ServerGamePacketListenerImpl public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) { // Paper start - auto recipe limit if (!org.bukkit.Bukkit.isPrimaryThread()) { diff --git a/divinemc-server/minecraft-patches/features/0060-Leaves-Protocol-Core.patch b/divinemc-server/minecraft-patches/features/0060-Leaves-Protocol-Core.patch index 73a11a2..7520e1a 100644 --- a/divinemc-server/minecraft-patches/features/0060-Leaves-Protocol-Core.patch +++ b/divinemc-server/minecraft-patches/features/0060-Leaves-Protocol-Core.patch @@ -91,10 +91,10 @@ index a7c4fad2b1cb0cbac742a18d37d688bb2663944e..b94243d293e805743453adf7b4fc8d85 bridge.removeChannel(channel); } diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c537d22fd97225c1b6d58bed61add83a20d9be24..75d9d06066c750ac9a176adc021410f1265cd36f 100644 +index d45d23ec160a90cfcff853433862bd7acd25099c..b5d31634cc988af87e5f488d2d6215a31b3077fb 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3678,6 +3678,17 @@ public class ServerGamePacketListenerImpl +@@ -3679,6 +3679,17 @@ public class ServerGamePacketListenerImpl @Override public void handleCustomPayload(ServerboundCustomPayloadPacket packet) { diff --git a/divinemc-server/minecraft-patches/features/0068-Optimize-collections.patch b/divinemc-server/minecraft-patches/features/0068-Optimize-collections.patch index f71519f..463a90a 100644 --- a/divinemc-server/minecraft-patches/features/0068-Optimize-collections.patch +++ b/divinemc-server/minecraft-patches/features/0068-Optimize-collections.patch @@ -4,19 +4,6 @@ Date: Thu, 24 Jul 2025 14:07:47 +0300 Subject: [PATCH] Optimize collections -diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/EntityLookup.java b/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/EntityLookup.java -index 2d24d03bbdb5ee0d862cbfff2219f58afffafe12..b4c982264234925f15cb88b3174711e00b1633db 100644 ---- a/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/EntityLookup.java -+++ b/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/EntityLookup.java -@@ -44,7 +44,7 @@ public abstract class EntityLookup implements LevelEntityGetter { - - public final Level world; - -- protected final SWMRLong2ObjectHashTable regions = new SWMRLong2ObjectHashTable<>(128, 0.5f); -+ protected final it.unimi.dsi.fastutil.longs.Long2ObjectArrayMap regions = new it.unimi.dsi.fastutil.longs.Long2ObjectArrayMap<>(128); // DivineMC - Optimize collections - - protected final LevelCallback worldCallback; - diff --git a/net/minecraft/core/NonNullList.java b/net/minecraft/core/NonNullList.java index 7e31c5c8659d24948fd45a2d6ee7bdeca6027d27..95221434fd8eef388f0308b72af3f93407a6e09c 100644 --- a/net/minecraft/core/NonNullList.java @@ -67,7 +54,7 @@ index b0c5e41fefc7c9adf1a61bd5b52861736657d37e..dfc62772d5617f0dce72b45a1bebf1b2 brain.setMemory(MemoryModuleType.NEAREST_LIVING_ENTITIES, entitiesOfClass); brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES, new NearestVisibleLivingEntities(level, entity, entitiesOfClass)); diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java -index f6b548dbb8b1bd82b5ddc73e2613cdcde059ce74..d5ffa5ef26222e8d111c9e4f15362fa3b73edd1c 100644 +index 66ba223dacefb3531c46b144c4499b2b2285eafe..0b7f9af0c4e43115878769043ebd06a09ccdf059 100644 --- a/net/minecraft/world/level/Level.java +++ b/net/minecraft/world/level/Level.java @@ -253,7 +253,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl diff --git a/gradle.properties b/gradle.properties index 3077600..6ecc8d1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.bxteam.divinemc version=1.21.8-R0.1-SNAPSHOT mcVersion=1.21.8 -purpurRef=5053eb0c5dc9662ffb39ae7c39c6ca08c013d898 +purpurRef=6c88d74021b955d3ed95668182b676afe41c47ac experimental=false #org.gradle.configuration-cache=true