testserver/CraftBukkit-Patches/0107-Correct-Ban-Expiration...

23 lines
980 B
Diff
Raw Normal View History

2015-02-26 10:40:16 +00:00
From 4af6734fb4e81c5b8729fd3df41970c723d011bc 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
2015-02-26 10:40:16 +00:00
index c942db1..6b93aa9 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -385,7 +385,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
--
2014-11-28 01:17:45 +00:00
2.1.0