SPIGOT-7589 Fix NullPointerException when bans expire

By: Doc <nachito94@msn.com>
This commit is contained in:
CraftBukkit/Spigot
2024-02-22 19:55:53 +11:00
parent 64cd2b148a
commit 95d69a6375
2 changed files with 15 additions and 16 deletions

View File

@@ -1,11 +1,6 @@
--- a/net/minecraft/server/players/JsonList.java
+++ b/net/minecraft/server/players/JsonList.java
@@ -1,3 +1,4 @@
+// mc-dev import
package net.minecraft.server.players;
import com.google.common.collect.Lists;
@@ -54,7 +55,7 @@
@@ -54,7 +54,7 @@
@Nullable
public V get(K k0) {
this.removeExpired();
@@ -14,6 +9,14 @@
}
public void remove(K k0) {
@@ -85,6 +85,7 @@
}
protected boolean contains(K k0) {
+ this.removeExpired(); // CraftBukkit - SPIGOT-7589: Consistently remove expired entries to mirror .get(...)
return this.map.containsKey(this.getKeyForUser(k0));
}
@@ -93,7 +94,7 @@
Iterator iterator = this.map.values().iterator();