1.16.1 prep
This commit is contained in:
@@ -8,20 +8,20 @@ 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
|
||||
diff --git a/src/main/java/net/minecraft/server/IBlockState.java b/src/main/java/net/minecraft/server/IBlockState.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockState.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockState.java
|
||||
@@ -0,0 +0,0 @@ public abstract class BlockState<T extends Comparable<T>> implements IBlockState
|
||||
--- a/src/main/java/net/minecraft/server/IBlockState.java
|
||||
+++ b/src/main/java/net/minecraft/server/IBlockState.java
|
||||
@@ -0,0 +0,0 @@ public abstract class IBlockState<T extends Comparable<T>>
|
||||
}
|
||||
|
||||
public boolean equals(Object object) {
|
||||
- if (this == object) {
|
||||
- return true;
|
||||
- } else if (!(object instanceof BlockState)) {
|
||||
- } else if (!(object instanceof IBlockState)) {
|
||||
- return false;
|
||||
- } else {
|
||||
- BlockState<?> blockstate = (BlockState) object;
|
||||
- IBlockState<?> blockstate = (IBlockState) object;
|
||||
-
|
||||
- return this.a.equals(blockstate.a) && this.b.equals(blockstate.b);
|
||||
- }
|
||||
@@ -44,7 +44,7 @@ diff --git a/src/main/java/net/minecraft/server/BlockStateBoolean.java b/src/mai
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockStateBoolean.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockStateBoolean.java
|
||||
@@ -0,0 +0,0 @@ public class BlockStateBoolean extends BlockState<Boolean> {
|
||||
@@ -0,0 +0,0 @@ public class BlockStateBoolean extends IBlockState<Boolean> {
|
||||
return obool.toString();
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/j
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockStateEnum.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockStateEnum.java
|
||||
@@ -0,0 +0,0 @@ public class BlockStateEnum<T extends Enum<T> & INamable> extends BlockState<T>
|
||||
@@ -0,0 +0,0 @@ public class BlockStateEnum<T extends Enum<T> & INamable> extends IBlockState<T>
|
||||
return ((INamable) t0).getName();
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ diff --git a/src/main/java/net/minecraft/server/BlockStateInteger.java b/src/mai
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockStateInteger.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockStateInteger.java
|
||||
@@ -0,0 +0,0 @@ public class BlockStateInteger extends BlockState<Integer> {
|
||||
@@ -0,0 +0,0 @@ public class BlockStateInteger extends IBlockState<Integer> {
|
||||
return this.a;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user