2023-03-10 05:56:39 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
|
|
Date: Thu, 9 Mar 2023 20:50:15 -0800
|
|
|
|
Subject: [PATCH] Max pending logins
|
|
|
|
|
|
|
|
Should help the floodgates on launch
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
|
2023-12-31 01:32:01 +01:00
|
|
|
index 5834d5e10c0b9892f29977666e7b168a9463a3d9..5bac302f6aab2c61cba87ea3e32a260eeb0284b4 100644
|
2023-03-10 05:56:39 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
|
2023-12-17 00:32:48 +01:00
|
|
|
@@ -89,7 +89,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
|
2023-03-10 05:56:39 +01:00
|
|
|
if (this.server.getPlayerList().pushPendingJoin(name, uniqueId, this.connection)) {
|
|
|
|
// Folia end - region threading - rewrite login process
|
2023-09-26 22:20:12 +02:00
|
|
|
this.verifyLoginAndFinishConnectionSetup((GameProfile) Objects.requireNonNull(this.authenticatedProfile));
|
|
|
|
- } // Folia - region threading - rewrite login process
|
|
|
|
+ } else { --this.tick; } // Folia - region threading - rewrite login process // Folia - max concurrent logins
|
|
|
|
}
|
2023-03-10 05:56:39 +01:00
|
|
|
|
2023-09-26 22:20:12 +02:00
|
|
|
if (this.state == ServerLoginPacketListenerImpl.State.WAITING_FOR_DUPE_DISCONNECT && !this.isPlayerAlreadyInWorld((GameProfile) Objects.requireNonNull(this.authenticatedProfile))) {
|
2023-03-10 05:56:39 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
2023-12-31 01:32:01 +01:00
|
|
|
index 184057aae74e8918bf05ab03429cb0419ae9ba06..eb797313a13b5a805f834b2e9f08989e381f0761 100644
|
2023-03-10 05:56:39 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
2023-12-17 00:32:48 +01:00
|
|
|
@@ -171,6 +171,17 @@ public abstract class PlayerList {
|
2023-03-10 05:56:39 +01:00
|
|
|
conflictingId = this.connectionById.get(byId);
|
|
|
|
|
|
|
|
if (conflictingName == null && conflictingId == null) {
|
2023-03-19 22:58:52 +01:00
|
|
|
+ // Folia start - max concurrent login
|
2023-03-10 05:56:39 +01:00
|
|
|
+ int loggedInCount = 0;
|
|
|
|
+ for (Connection value : this.connectionById.values()) {
|
2023-09-26 22:20:12 +02:00
|
|
|
+ if (value.getPacketListener() instanceof ServerGamePacketListenerImpl) {
|
2023-03-10 05:56:39 +01:00
|
|
|
+ ++loggedInCount;
|
|
|
|
+ }
|
|
|
|
+ }
|
2023-03-19 22:58:52 +01:00
|
|
|
+ if ((this.connectionById.size() - loggedInCount) >= io.papermc.paper.configuration.GlobalConfiguration.get().misc.maxJoinsPerTick) {
|
2023-03-10 05:56:39 +01:00
|
|
|
+ return false;
|
|
|
|
+ }
|
2023-03-19 22:58:52 +01:00
|
|
|
+ // Folia end - max concurrent login
|
2023-03-10 05:56:39 +01:00
|
|
|
this.connectionByName.put(userName, conn);
|
|
|
|
this.connectionById.put(byId, conn);
|
|
|
|
}
|