Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
28 Zeilen
1.1 KiB
Diff
28 Zeilen
1.1 KiB
Diff
From 71c74c8488e21b1da841fb5211b7eaa09b25c693 Mon Sep 17 00:00:00 2001
|
|
From: killme <killme-git@ibts.me>
|
|
Date: Sun, 12 Nov 2017 19:40:01 +0100
|
|
Subject: [PATCH] Prevent logins from being processed when the player has
|
|
disconnected
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
|
|
index 398f67f4b6..fe912e0eb1 100644
|
|
--- a/src/main/java/net/minecraft/server/LoginListener.java
|
|
+++ b/src/main/java/net/minecraft/server/LoginListener.java
|
|
@@ -56,7 +56,11 @@ public class LoginListener implements PacketLoginInListener {
|
|
}
|
|
// Paper end
|
|
if (this.g == LoginListener.EnumProtocolState.READY_TO_ACCEPT) {
|
|
- this.c();
|
|
+ // Paper start - prevent logins to be processed even though disconnect was called
|
|
+ if (networkManager.isConnected()) {
|
|
+ this.c();
|
|
+ }
|
|
+ // Paper end
|
|
} else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
|
|
EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId());
|
|
|
|
--
|
|
2.21.0
|
|
|