diff --git a/patches/server/0006-Bump-Dependencies.patch b/patches/server/0006-Bump-Dependencies.patch index ef999c27a..9d2cde710 100644 --- a/patches/server/0006-Bump-Dependencies.patch +++ b/patches/server/0006-Bump-Dependencies.patch @@ -44,7 +44,7 @@ index d8b27e3f2fa1ede41125ec27e129b1e1ad42caa7..9211713c5b09e2d715aec5b2187ef0f2 - runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0") - runtimeOnly("com.mysql:mysql-connector-j:8.0.33") + implementation("net.fabricmc:mapping-io:0.4.2") // Paper - needed to read mappings for stacktrace deobfuscation -+ runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1") ++ runtimeOnly("org.xerial:sqlite-jdbc:3.43.0.0") + runtimeOnly("com.mysql:mysql-connector-j:8.1.0") runtimeOnly("com.lmax:disruptor:3.4.4") // Paper // Paper start - Use Velocity cipher diff --git a/patches/server/0011-Implement-ChunkSending.patch b/patches/server/0011-Implement-ChunkSending.patch index 43a4764d0..fb436c9ae 100644 --- a/patches/server/0011-Implement-ChunkSending.patch +++ b/patches/server/0011-Implement-ChunkSending.patch @@ -7,10 +7,10 @@ Original: someaddons/chunksending Copyright (C) 2023 someaddons diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java -index e2202389a2c4133a183cca59c4e909fc419379ab..ccb7ff8832d3673a46d0a285f09d57d12bc0203a 100644 +index e2202389a2c4133a183cca59c4e909fc419379ab..b3e731c122b315d28ae51d32b798f818e270c7ff 100644 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java -@@ -398,9 +398,11 @@ public class ChunkHolder { +@@ -398,9 +398,12 @@ public class ChunkHolder { // Paper end - rewrite chunk system private void broadcast(List players, Packet packet) { @@ -18,9 +18,10 @@ index e2202389a2c4133a183cca59c4e909fc419379ab..ccb7ff8832d3673a46d0a285f09d57d1 - entityplayer.connection.send(packet); - }); + // Plazma start -+ for (ServerPlayer player : players) -+ if (this.chunkMap.level.plazmaLevelConfiguration().chunkSending.enabled && !player.attachToPending(pos, packet)) -+ player.connection.send(packet); ++ for (ServerPlayer player : players) { ++ if (this.chunkMap.level.plazmaLevelConfiguration().chunkSending.enabled && player.attachToPending(pos, packet)) continue; ++ player.connection.send(packet); ++ } + // Plazma end }