2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2019-08-15 02:32:25 +00:00
|
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
|
|
|
Date: Tue, 13 Aug 2019 06:35:17 -0700
|
|
|
|
|
Subject: [PATCH] Fix MC-158900
|
|
|
|
|
|
|
|
|
|
The problem was we were checking isExpired() on the entry, but if it
|
|
|
|
|
was expired at that point, then it would be null.
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
2020-11-19 15:15:16 +00:00
|
|
|
index a6aae6740c62f269e46db4a082fd983190deb290..1d4bb2004d606ef7bf9fba3474f057b04b3354b5 100644
|
2019-08-15 02:32:25 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
2020-10-01 13:16:32 +00:00
|
|
|
@@ -534,8 +534,10 @@ public abstract class PlayerList {
|
2019-08-15 02:32:25 +00:00
|
|
|
Player player = entity.getBukkitEntity();
|
|
|
|
|
PlayerLoginEvent event = new PlayerLoginEvent(player, hostname, ((java.net.InetSocketAddress) socketaddress).getAddress(), ((java.net.InetSocketAddress) loginlistener.networkManager.getRawAddress()).getAddress());
|
|
|
|
|
|
|
|
|
|
- if (getProfileBans().isBanned(gameprofile) && !getProfileBans().get(gameprofile).hasExpired()) {
|
|
|
|
|
- GameProfileBanEntry gameprofilebanentry = (GameProfileBanEntry) this.k.get(gameprofile);
|
|
|
|
|
+ // Paper start - Fix MC-158900
|
|
|
|
|
+ GameProfileBanEntry gameprofilebanentry;
|
|
|
|
|
+ if (getProfileBans().isBanned(gameprofile) && (gameprofilebanentry = getProfileBans().get(gameprofile)) != null) {
|
|
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
|
|
chatmessage = new ChatMessage("multiplayer.disconnect.banned.reason", new Object[]{gameprofilebanentry.getReason()});
|
|
|
|
|
if (gameprofilebanentry.getExpires() != null) {
|
