-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Do not place player if the server is full
- Loading branch information
1 parent
ba3dfc1
commit e5d3573
Showing
1 changed file
with
33 additions
and
0 deletions.
There are no files selected for viewing
33 changes: 33 additions & 0 deletions
33
patches/server/0078-Do-not-place-player-if-the-server-is-full.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Dreeam <[email protected]> | ||
| Date: Mon, 24 Jun 2024 10:49:04 +0800 | ||
| Subject: [PATCH] Do not place player if the server is full | ||
|
|
||
| Fix https://github.com/PaperMC/Paper/issues/10668 | ||
|
|
||
| diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java | ||
| index 180b50c9c23c6934d3e99500a25635df32f7169c..0a0146c0898ace3048c965200b4a08c9db4b7b69 100644 | ||
| --- a/src/main/java/net/minecraft/server/players/PlayerList.java | ||
| +++ b/src/main/java/net/minecraft/server/players/PlayerList.java | ||
| @@ -78,6 +78,7 @@ import net.minecraft.server.level.ClientInformation; | ||
| import net.minecraft.server.level.ServerLevel; | ||
| import net.minecraft.server.level.ServerPlayer; | ||
| import net.minecraft.server.network.CommonListenerCookie; | ||
| +import net.minecraft.server.network.ServerCommonPacketListenerImpl; | ||
| import net.minecraft.server.network.ServerGamePacketListenerImpl; | ||
| import net.minecraft.server.network.ServerLoginPacketListenerImpl; | ||
| import net.minecraft.sounds.SoundEvents; | ||
| @@ -281,6 +282,13 @@ public abstract class PlayerList { | ||
| return; | ||
| } | ||
| // Gale end - MultiPaper - do not place player in world if kicked before being spawned in | ||
| + // Leaf start - Do not place player if the server is full - copied from canPlayerLogin | ||
| + if (this.players.size() >= this.maxPlayers && !(player.getBukkitEntity().hasPermission("purpur.joinfullserver") || this.canBypassPlayerLimit(gameprofile))) { // Purpur | ||
| + connection.disconnect(io.papermc.paper.adventure.PaperAdventure.asVanilla(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(org.spigotmc.SpigotConfig.serverFullMessage))); | ||
| + //playerconnection.disconnect(io.papermc.paper.adventure.PaperAdventure.asVanilla(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(org.spigotmc.SpigotConfig.serverFullMessage)), org.bukkit.event.player.PlayerKickEvent.Cause.TIMEOUT); | ||
| + return; | ||
| + } | ||
| + // Leaf end - Do not place player if the server is full - copied from canPlayerLogin | ||
|
|
||
| Location loc = ev.getSpawnLocation(); | ||
| worldserver1 = ((CraftWorld) loc.getWorld()).getHandle(); |