mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 19:56:52 +01:00
19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
23 lines
980 B
Diff
23 lines
980 B
Diff
From 3118ca054fa2eaabfb66662704bc60f62950efc7 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 1d3d00f..c9ef1d6 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
|
@@ -354,7 +354,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.1.0
|
|
|