From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland 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/BlockStateBoolean.java b/src/main/java/net/minecraft/server/BlockStateBoolean.java index 8df150f4cabb3dd98cb66c9d1af7fae035a6a6fe..4ca8db630434915de4eaeac6c4ecd60714d7f5d9 100644 --- a/src/main/java/net/minecraft/server/BlockStateBoolean.java +++ b/src/main/java/net/minecraft/server/BlockStateBoolean.java @@ -30,8 +30,7 @@ public class BlockStateBoolean extends IBlockState { return obool.toString(); } - @Override - 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 8162c11d14b8e88c2b572f9ddf6b7a15977047f8..8dc620b22bb904aa6a82e2127aa9da861986525c 100644 --- a/src/main/java/net/minecraft/server/BlockStateEnum.java +++ b/src/main/java/net/minecraft/server/BlockStateEnum.java @@ -49,8 +49,7 @@ public class BlockStateEnum & INamable> extends IBlockState return ((INamable) t0).getName(); } - @Override - 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 5bd7a236b948666ca31e53cb3a8aa0dc147e274b..36b84446e96faefad3b783f73df74e0f3bce8255 100644 --- a/src/main/java/net/minecraft/server/BlockStateInteger.java +++ b/src/main/java/net/minecraft/server/BlockStateInteger.java @@ -38,8 +38,7 @@ public class BlockStateInteger extends IBlockState { return this.a; } - @Override - 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)) { diff --git a/src/main/java/net/minecraft/server/IBlockState.java b/src/main/java/net/minecraft/server/IBlockState.java index d63a4e4916ed5f5d901be0f4dd2c13cf66239055..6550b55067db31dbbc903fe17a13849383651c5a 100644 --- a/src/main/java/net/minecraft/server/IBlockState.java +++ b/src/main/java/net/minecraft/server/IBlockState.java @@ -59,23 +59,17 @@ public abstract class IBlockState> { } public boolean equals(Object object) { - if (this == object) { - return true; - } else if (!(object instanceof IBlockState)) { - return false; - } else { - IBlockState iblockstate = (IBlockState) object; - - return this.a.equals(iblockstate.a) && this.b.equals(iblockstate.b); - } + return this == object; // Paper - only one instance per configuration } + private static final 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.b(); } - return this.c; + return this.hashCode; // Paper - only one instance per configuration } public int b() {