spigot/CraftBukkit-Patches/0079-Correct-Ban-Expiration.patch

23 lines
1.1 KiB
Diff
Raw Normal View History

2018-11-14 14:20:34 +11:00
From fbd68f8ac2c0772b6ac98e43d1cf519caf1af6b8 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-10-23 06:00:00 +11:00
index 2e0a16744..336b194ef 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-10-23 06:00:00 +11:00
@@ -491,7 +491,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-11-14 14:20:34 +11:00
2.19.1
2014-04-16 11:14:49 +10:00