aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0794-Force-close-world-loading-screen.patch
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2023-06-08 21:29:58 -0700
committerGitHub <[email protected]>2023-06-08 21:29:58 -0700
commit82c64790f43239051625385e3e72b26fe17626e1 (patch)
tree69567a33f5307dc8dd09e2d44c1e91b47214667e /patches/server/0794-Force-close-world-loading-screen.patch
parente829a9d8f3a52a4803eaaa96a046c4a4876a262a (diff)
downloadPaper-82c64790f43239051625385e3e72b26fe17626e1.tar.gz
Paper-82c64790f43239051625385e3e72b26fe17626e1.zip
Add back Anti-Xray patch (#9283)
Diffstat (limited to 'patches/server/0794-Force-close-world-loading-screen.patch')
-rw-r--r--patches/server/0794-Force-close-world-loading-screen.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/patches/server/0794-Force-close-world-loading-screen.patch b/patches/server/0794-Force-close-world-loading-screen.patch
deleted file mode 100644
index 5d929f416f..0000000000
--- a/patches/server/0794-Force-close-world-loading-screen.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <[email protected]>
-Date: Wed, 2 Mar 2022 09:45:56 +0100
-Subject: [PATCH] Force close world loading screen
-
-Dead players would be stuck in the world loading screen and other players may
-miss messages and similar sent in the join event if chunk loading is slow.
-Paper already circumvents falling through the world before chunks are loaded,
-so we do not need that. The client only needs the chunk it is currently in to
-be loaded to close the loading screen, so we just send an empty one.
-
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 42e7b41526f7cf31f33a58f18e851cd435472921..3d6b84e307f3222bb96270d149abddb7024c83da 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -396,6 +396,16 @@ public abstract class PlayerList {
-
- // Paper start - move vehicle into method so it can be called above - short circuit around that code
- onPlayerJoinFinish(player, worldserver1, s1);
-+ // Paper start - Send empty chunk, so players aren't stuck in the world loading screen with our chunk system not sending chunks when dead
-+ if (player.isDeadOrDying()) {
-+ net.minecraft.core.Holder<net.minecraft.world.level.biome.Biome> plains = worldserver1.registryAccess().registryOrThrow(net.minecraft.core.registries.Registries.BIOME)
-+ .getHolderOrThrow(net.minecraft.world.level.biome.Biomes.PLAINS);
-+ player.connection.send(new net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket(
-+ new net.minecraft.world.level.chunk.EmptyLevelChunk(worldserver1, player.chunkPosition(), plains),
-+ worldserver1.getLightEngine(), null, null)
-+ );
-+ }
-+ // Paper end
- }
- private void mountSavedVehicle(ServerPlayer player, ServerLevel worldserver1, CompoundTag nbttagcompound) {
- // Paper end