From ff70e6d53dad40bc77000497f27175114027e060 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sun, 5 Jun 2016 12:55:27 +0200 Subject: [PATCH] Made equals proper --- .../mod/misc/LaserRelayConnectionHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java index 244b601f8..65507572f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java @@ -188,8 +188,8 @@ public class LaserRelayConnectionHandler{ public boolean equals(Object obj){ if(obj instanceof ConnectionPair){ ConnectionPair pair = (ConnectionPair)obj; - if(this.firstRelay != null && this.firstRelay.equals(pair.firstRelay)){ - if(this.secondRelay != null && this.secondRelay.equals(pair.secondRelay)){ + if(this.firstRelay == pair.firstRelay || (this.firstRelay != null && this.firstRelay.equals(pair.firstRelay))){ + if(this.secondRelay == pair.secondRelay && (this.secondRelay != null && this.secondRelay.equals(pair.secondRelay))){ return true; } }