mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-30 16:54:55 +02:00
459987d69f
improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From 6f93bb5e5f2bfb8117f9c93f7797e32d704293d4 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 10c82107d4..1380a14274 100644
|
|
--- a/src/main/java/net/minecraft/server/LoginListener.java
|
|
+++ b/src/main/java/net/minecraft/server/LoginListener.java
|
|
@@ -57,7 +57,11 @@ public class LoginListener implements PacketLoginInListener, ITickable {
|
|
}
|
|
// Paper end
|
|
if (this.g == LoginListener.EnumProtocolState.READY_TO_ACCEPT) {
|
|
- this.b();
|
|
+ // Paper start - prevent logins to be processed even though disconnect was called
|
|
+ if (networkManager.isConnected()) {
|
|
+ this.b();
|
|
+ }
|
|
+ // Paper end
|
|
} else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
|
|
EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId());
|
|
|
|
--
|
|
2.19.0
|
|
|