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:
867794b2 Make setPersistent also control player saving

CraftBukkit Changes:
02518f92 Make setPersistent also control player saving
This commit is contained in:
Shane Freeder
2018-10-03 20:19:35 +01:00
parent 26153def87
commit 2dcae290df
14 changed files with 104 additions and 104 deletions

View File

@@ -1,14 +1,14 @@
From ad10744ac7a24fc5cb4e4341bc748f5183f3690b Mon Sep 17 00:00:00 2001
From 356f0298ced084a1e8fb2509ffaef28601ded966 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 3 Jul 2017 18:11:10 -0500
Subject: [PATCH] ProfileWhitelistVerifyEvent
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 2f2f301383..304cae655d 100644
index de549d20..6bdeb2cc 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -543,9 +543,9 @@ public abstract class PlayerList {
@@ -544,9 +544,9 @@ public abstract class PlayerList {
// return chatmessage;
if (!gameprofilebanentry.hasExpired()) event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(chatmessage)); // Spigot
@@ -20,7 +20,7 @@ index 2f2f301383..304cae655d 100644
} else if (getIPBans().isBanned(socketaddress) && !getIPBans().get(socketaddress).hasExpired()) {
IpBanEntry ipbanentry = this.l.get(socketaddress);
@@ -1171,9 +1171,25 @@ public abstract class PlayerList {
@@ -1172,9 +1172,25 @@ public abstract class PlayerList {
this.server.getCommandDispatcher().a(entityplayer);
}