2018-08-26 12:00:00 +10:00
|
|
|
From 74a17e5e4757eba24006a14d9709310d0e80210e Mon Sep 17 00:00:00 2001
|
2014-04-16 11:14:49 +10:00
|
|
|
From: md_5 <git@md-5.net>
|
|
|
|
Date: Wed, 16 Apr 2014 11:14:38 +1000
|
|
|
|
Subject: [PATCH] Correct Ban Expiration
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
2018-08-26 12:00:00 +10:00
|
|
|
index 778b3bd85..06e5c83f5 100644
|
2014-04-16 11:14:49 +10:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
2018-03-30 08:44:10 +11:00
|
|
|
@@ -490,7 +490,7 @@ public abstract class PlayerList {
|
2014-04-16 11:14:49 +10:00
|
|
|
}
|
|
|
|
|
2018-07-15 10:00:00 +10:00
|
|
|
// return chatmessage;
|
|
|
|
- event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(chatmessage));
|
|
|
|
+ if (!gameprofilebanentry.hasExpired()) event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(chatmessage)); // Spigot
|
2014-04-16 11:14:49 +10:00
|
|
|
} else if (!this.isWhitelisted(gameprofile)) {
|
2018-07-15 10:00:00 +10:00
|
|
|
chatmessage = new ChatMessage("multiplayer.disconnect.not_whitelisted", new Object[0]);
|
2014-04-17 20:47:40 +01:00
|
|
|
event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig.whitelistMessage); // Spigot
|
2014-04-16 11:14:49 +10:00
|
|
|
--
|
2018-07-15 10:00:00 +10:00
|
|
|
2.17.1
|
2014-04-16 11:14:49 +10:00
|
|
|
|