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

23 lines
980 B
Diff
Raw Normal View History

2016-03-01 11:23:45 +11:00
From fc1275c9257b95dda24800955fdf1ebeffbaadac 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
2016-03-01 08:33:06 +11:00
index eb9375d..9f0842c 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
2016-03-01 08:33:06 +11:00
@@ -463,7 +463,7 @@ public abstract class PlayerList {
2014-04-16 11:14:49 +10:00
}
// return s;
- event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s);
2014-07-09 10:23:19 +10:00
+ if (!gameprofilebanentry.hasExpired()) event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s); // Spigot
2014-04-16 11:14:49 +10:00
} else if (!this.isWhitelisted(gameprofile)) {
// return "You are not white-listed on this server!";
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
--
2016-03-01 08:33:06 +11:00
2.5.0
2014-04-16 11:14:49 +10:00