23 lines
980 B
Diff
23 lines
980 B
Diff
|
From 713765b93a1ef90c5149c3768fb9fb2e74bb260a 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 e2d3ccd..4b8835d 100644
|
||
|
|
--- 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.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
|
||
|
|
--
|
||
|
|
1.9.1
|
||
|
|
|