aboutsummaryrefslogtreecommitdiff
path: root/runtime/src/main/java
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2022-01-15 03:11:33 +0800
committershedaniel <daniel@shedaniel.me>2022-01-15 03:12:36 +0800
commit8fbf230f8e499bf6bf6f17c41c3e739350d28b67 (patch)
treece99244e8a69a7f19aa7fdadccb777f5073786ad /runtime/src/main/java
parent3d20da43ecb63f8c3a29b2a852495cb4cef9da9a (diff)
downloadRoughlyEnoughItems-8fbf230f8e499bf6bf6f17c41c3e739350d28b67.tar.gz
RoughlyEnoughItems-8fbf230f8e499bf6bf6f17c41c3e739350d28b67.tar.bz2
RoughlyEnoughItems-8fbf230f8e499bf6bf6f17c41c3e739350d28b67.zip
Fix #670 and Apotheosis's Deadly Plugin
Diffstat (limited to 'runtime/src/main/java')
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/common/category/CategoryIdentifierImpl.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/category/CategoryIdentifierImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/category/CategoryIdentifierImpl.java
index d2ff9e98c..ac2fb20f8 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/category/CategoryIdentifierImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/category/CategoryIdentifierImpl.java
@@ -55,6 +55,10 @@ public class CategoryIdentifierImpl<D extends Display> implements CategoryIdenti
@Override
public boolean equals(Object obj) {
if (!(obj instanceof CategoryIdentifier<?>)) return false;
+ if (obj instanceof CategoryIdentifierImpl<?>) {
+ return hashCode == obj.hashCode() && location.equals(((CategoryIdentifierImpl<?>) obj).location);
+ }
+
return location.equals(((CategoryIdentifier<?>) obj).getIdentifier());
}