mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 12:11:47 +01:00
8ed2992da9
Portion of diff was dropped in the mappings update commit. Also remove the option to remove invalid statistics. The server will automatically do this now as of... 1.13?, our option wasn't even doing anything.
30 lines
1.4 KiB
Diff
30 lines
1.4 KiB
Diff
From 82e0fec9fd1526ee71c3ff93a7f13729452a45f8 Mon Sep 17 00:00:00 2001
|
|
From: Brokkonaut <hannos17@gmx.de>
|
|
Date: Fri, 20 Oct 2017 04:33:45 +0200
|
|
Subject: [PATCH] Replace HashSet with fastutil's ObjectOpenHashSet in
|
|
HashTreeSet
|
|
|
|
HashSet sometimes uses compareTo() instead of equals() and this breaks the comparison of net.minecraft.server.NextTickListEntry (the only place where HashTreeSet is used).
|
|
|
|
In this cases duplicate entries could be added to the HashSet of HashTreeSet, because NextTickListEntry.compareTo() does not return 0, even if NextTickListEntry.equals() returns true.
|
|
|
|
ObjectOpenHashSet never uses compareTo(), so the inconsistencies of NextTickListEntry cause no problems.
|
|
|
|
Fixes https://github.com/PaperMC/Paper/issues/588
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java b/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
|
|
index 80a5c29f3..cd864c404 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
|
|
@@ -8,7 +8,7 @@ import java.util.TreeSet;
|
|
|
|
public class HashTreeSet<V> implements Set<V> {
|
|
|
|
- private HashSet<V> hash = new HashSet<V>();
|
|
+ private Set<V> hash = new it.unimi.dsi.fastutil.objects.ObjectOpenHashSet<V>(); //Paper - Replace java.util.HashSet with ObjectOpenHashSet
|
|
private TreeSet<V> tree = new TreeSet<V>();
|
|
|
|
public HashTreeSet() {
|
|
--
|
|
2.20.0
|
|
|