Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ebaca20 Added getHostname to AsyncPlayerPreLoginEvent (#6656)
PaperMC/Paper@0c64d40 Updated Upstream (Bukkit/CraftBukkit) (#7323)
PaperMC/Paper@6663747 Some block state hunks were in the wrong patch (#7308)
PaperMC/Paper@78999b5 Remove redundant getRemoteAddress that can cause an NPE (#7331)
This commit is contained in:
BillyGalbreath
2022-01-13 22:06:23 -06:00
parent 9723e945ab
commit cb1a6366bf
18 changed files with 52 additions and 52 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow player join full server by permission
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 63e8397d6eff95ed81ab5d7cdb69495e188d931b..c29955b6fb2127c6abf6b7b1cd69082f45bceee7 100644
index d6413977a87613a88a155630fa3be9ee9a99d47e..d23d178ff161b8f3d645b7776295bdb0808d12a5 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -762,7 +762,7 @@ public abstract class PlayerList {
@@ -766,7 +766,7 @@ public abstract class PlayerList {
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, PaperAdventure.asAdventure(chatmessage)); // Paper - Adventure
} else {
// return this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameprofile) ? new ChatMessage("multiplayer.disconnect.server_full") : null;