2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
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/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
2021-07-07 08:52:40 +02:00
|
|
|
index 7dd874c6aa1268665d4a64dfc41013c304991273..993f31b9106b5e20c62bfd405daa9fe55046840f 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
2021-07-07 08:52:40 +02:00
|
|
|
@@ -607,8 +607,10 @@ public abstract class PlayerList {
|
2021-06-11 14:02:28 +02:00
|
|
|
Player player = entity.getBukkitEntity();
|
|
|
|
PlayerLoginEvent event = new PlayerLoginEvent(player, hostname, ((java.net.InetSocketAddress) socketaddress).getAddress(), ((java.net.InetSocketAddress) loginlistener.connection.getRawAddress()).getAddress());
|
|
|
|
|
2021-06-13 16:14:18 +02:00
|
|
|
- if (this.getBans().isBanned(gameprofile) && !this.getBans().get(gameprofile).hasExpired()) {
|
2021-06-11 14:02:28 +02:00
|
|
|
- UserBanListEntry gameprofilebanentry = (UserBanListEntry) this.bans.get(gameprofile);
|
|
|
|
+ // Paper start - Fix MC-158900
|
|
|
|
+ UserBanListEntry gameprofilebanentry;
|
|
|
|
+ if (getBans().isBanned(gameprofile) && (gameprofilebanentry = getBans().get(gameprofile)) != null) {
|
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
chatmessage = new TranslatableComponent("multiplayer.disconnect.banned.reason", new Object[]{gameprofilebanentry.getReason()});
|
|
|
|
if (gameprofilebanentry.getExpires() != null) {
|