Merge remote-tracking branch 'origin/1.20' into 1.21.1
This commit is contained in:
commit
9f11af14b5
|
|
@ -4,8 +4,6 @@ import it.unimi.dsi.fastutil.Hash;
|
||||||
import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet;
|
import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet;
|
||||||
import net.minecraft.world.entity.ai.attributes.AttributeInstance;
|
import net.minecraft.world.entity.ai.attributes.AttributeInstance;
|
||||||
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
public class AttributeInstanceTemplates {
|
public class AttributeInstanceTemplates {
|
||||||
private static final ObjectOpenCustomHashSet<AttributeInstance> INTERNER = new ObjectOpenCustomHashSet<>(new Hash.Strategy<>() {
|
private static final ObjectOpenCustomHashSet<AttributeInstance> INTERNER = new ObjectOpenCustomHashSet<>(new Hash.Strategy<>() {
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -13,7 +11,7 @@ public class AttributeInstanceTemplates {
|
||||||
if (o == null) {
|
if (o == null) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
int h = o.getAttribute().hashCode();
|
int h = System.identityHashCode(o.getAttribute());
|
||||||
h = 31 * h + Double.hashCode(o.getBaseValue());
|
h = 31 * h + Double.hashCode(o.getBaseValue());
|
||||||
h = 31 * h + o.getModifiers().hashCode();
|
h = 31 * h + o.getModifiers().hashCode();
|
||||||
return h;
|
return h;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user