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

23 lines
983 B
Diff
Raw Normal View History

2014-04-17 19:47:40 +00:00
From 201a50c0093ef26e019636b70eaffc71da547e56 Mon Sep 17 00:00:00 2001
2014-04-16 01:14:49 +00: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
2014-04-17 19:47:40 +00:00
index 8be8e9c..49837b4 100644
2014-04-16 01:14:49 +00:00
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -362,7 +362,7 @@ public abstract class PlayerList {
}
// return s;
- event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s);
+ if (!gameprofilebanentry.e()) event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s); // Spigot
} else if (!this.isWhitelisted(gameprofile)) {
// return "You are not white-listed on this server!";
2014-04-17 19:47:40 +00:00
event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig.whitelistMessage); // Spigot
2014-04-16 01:14:49 +00:00
--
2014-04-17 19:47:40 +00:00
1.8.5.2.msysgit.0
2014-04-16 01:14:49 +00:00