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

22 lines
985 B
Diff

From 27951a88fdddb8ad5f78e9a5616844570e74d9f8 Mon Sep 17 00:00:00 2001
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
index f385db3bb..b49b5e23c 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -490,7 +490,7 @@ public abstract class PlayerList {
}
// return s;
- event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s);
+ if (!gameprofilebanentry.hasExpired()) event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s); // Spigot
} else if (!this.isWhitelisted(gameprofile)) {
// return "You are not white-listed on this server!";
event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig.whitelistMessage); // Spigot
--
2.14.1