dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed crash.

Browse Source
This commit is contained in:
raoulvdberge
2018-11-17 13:47:34 +01:00
parent 156d01441d
commit 3855309732
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
View File

@@ -22,7 +22,6 @@ import com.raoulvdberge.refinedstorage.api.storage.IStorageCache;
import com.raoulvdberge.refinedstorage.api.storage.IStorageTracker;
import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IStorageExternal;
import com.raoulvdberge.refinedstorage.api.util.Action;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingManager;
import com.raoulvdberge.refinedstorage.apiimpl.energy.Energy;
import com.raoulvdberge.refinedstorage.apiimpl.network.NetworkNodeGraph;
@@ -712,13 +711,31 @@ public class TileController extends TileBase implements ITickable, INetwork, IRe
}
}
// Cannot use API#getNetworkNodeHashCode or API#isNetworkNodeEqual: it will crash with a AbstractMethodError (getPos).
@Override
public boolean equals(Object o) {
return API.instance().isNetworkNodeEqual(this, o);
if (!(o instanceof TileController)) {
return false;
}
if (this == o) {
return true;
}
TileController otherController = (TileController) o;
if (world.provider.getDimension() != otherController.world.provider.getDimension()) {
return false;
}
return pos.equals(otherController.pos);
}
@Override
public int hashCode() {
return API.instance().getNetworkNodeHashCode(this);
int result = pos.hashCode();
result = 31 * result + world.provider.getDimension();
return result;
}
}