mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-21 11:52:55 +02:00
85 lines
3.6 KiB
Diff
85 lines
3.6 KiB
Diff
|
From 63f4233aa49d41ab53a84ebd6a20d8d10449855f Mon Sep 17 00:00:00 2001
|
||
|
From: Alfie Cleveland <alfeh@me.com>
|
||
|
Date: Fri, 19 Aug 2016 01:52:56 +0100
|
||
|
Subject: [PATCH] Optimise BlockState's hashCode/equals
|
||
|
|
||
|
These are singleton "single instance" objects. We can rely on
|
||
|
object identity checks safely.
|
||
|
|
||
|
Use a simpler optimized hashcode
|
||
|
|
||
|
diff --git a/src/main/java/net/minecraft/server/BlockState.java b/src/main/java/net/minecraft/server/BlockState.java
|
||
|
index d95c0955a9..ea0e0ff4fe 100644
|
||
|
--- a/src/main/java/net/minecraft/server/BlockState.java
|
||
|
+++ b/src/main/java/net/minecraft/server/BlockState.java
|
||
|
@@ -26,23 +26,13 @@ public abstract class BlockState<T extends Comparable<T>> implements IBlockState
|
||
|
}
|
||
|
|
||
|
public boolean equals(Object object) {
|
||
|
- if (this == object) {
|
||
|
- return true;
|
||
|
- } else if (!(object instanceof BlockState)) {
|
||
|
- return false;
|
||
|
- } else {
|
||
|
- BlockState<?> blockstate = (BlockState) object;
|
||
|
-
|
||
|
- return this.a.equals(blockstate.a) && this.b.equals(blockstate.b);
|
||
|
- }
|
||
|
+ return this == object; // Paper - only one instance per configuration
|
||
|
}
|
||
|
|
||
|
+ private static java.util.concurrent.atomic.AtomicInteger hashId = new java.util.concurrent.atomic.AtomicInteger(1);// Paper - only one instance per configuration
|
||
|
+ private final int hashCode = 92821 * hashId.getAndIncrement(); // Paper - only one instance per configuration
|
||
|
public final int hashCode() {
|
||
|
- if (this.c == null) {
|
||
|
- this.c = this.c();
|
||
|
- }
|
||
|
-
|
||
|
- return this.c;
|
||
|
+ return hashCode; // Paper - only one instance per configuration
|
||
|
}
|
||
|
|
||
|
public int c() {
|
||
|
diff --git a/src/main/java/net/minecraft/server/BlockStateBoolean.java b/src/main/java/net/minecraft/server/BlockStateBoolean.java
|
||
|
index 4c1d39d67c..71d2ad9703 100644
|
||
|
--- a/src/main/java/net/minecraft/server/BlockStateBoolean.java
|
||
|
+++ b/src/main/java/net/minecraft/server/BlockStateBoolean.java
|
||
|
@@ -28,7 +28,7 @@ public class BlockStateBoolean extends BlockState<Boolean> {
|
||
|
return obool.toString();
|
||
|
}
|
||
|
|
||
|
- public boolean equals(Object object) {
|
||
|
+ public boolean equals_unused(Object object) { // Paper
|
||
|
if (this == object) {
|
||
|
return true;
|
||
|
} else if (object instanceof BlockStateBoolean && super.equals(object)) {
|
||
|
diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java
|
||
|
index 986b9ccea8..facbf30b4e 100644
|
||
|
--- a/src/main/java/net/minecraft/server/BlockStateEnum.java
|
||
|
+++ b/src/main/java/net/minecraft/server/BlockStateEnum.java
|
||
|
@@ -47,7 +47,7 @@ public class BlockStateEnum<T extends Enum<T> & INamable> extends BlockState<T>
|
||
|
return ((INamable) t0).getName();
|
||
|
}
|
||
|
|
||
|
- public boolean equals(Object object) {
|
||
|
+ public boolean equals_unused(Object object) { // Paper
|
||
|
if (this == object) {
|
||
|
return true;
|
||
|
} else if (object instanceof BlockStateEnum && super.equals(object)) {
|
||
|
diff --git a/src/main/java/net/minecraft/server/BlockStateInteger.java b/src/main/java/net/minecraft/server/BlockStateInteger.java
|
||
|
index 2f12e15e07..613cd0bce2 100644
|
||
|
--- a/src/main/java/net/minecraft/server/BlockStateInteger.java
|
||
|
+++ b/src/main/java/net/minecraft/server/BlockStateInteger.java
|
||
|
@@ -37,7 +37,7 @@ public class BlockStateInteger extends BlockState<Integer> {
|
||
|
return this.a;
|
||
|
}
|
||
|
|
||
|
- public boolean equals(Object object) {
|
||
|
+ public boolean equals_unused(Object object) { // Paper
|
||
|
if (this == object) {
|
||
|
return true;
|
||
|
} else if (object instanceof BlockStateInteger && super.equals(object)) {
|
||
|
--
|
||
|
2.20.1
|
||
|
|