Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Less processing of whitelist

Browse source
This commit is contained in:
Ellpeck 2016-05-11 20:59:38 +02:00
parent a8717e6191
commit 58e5af0814
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java
View file

@ -2,6 +2,7 @@ package de.ellpeck.actuallyadditions.mod.tile;
import de.ellpeck.actuallyadditions.mod.misc.LaserRelayConnectionHandler; import de.ellpeck.actuallyadditions.mod.misc.LaserRelayConnectionHandler;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay.TileEntityLaserRelayItem; import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay.TileEntityLaserRelayItem;
import de.ellpeck.actuallyadditions.mod.util.PosUtil;
import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import de.ellpeck.actuallyadditions.mod.util.WorldUtil;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
@ -89,7 +90,14 @@ public class TileEntityItemViewer extends TileEntityInventoryBase{
} }
private boolean isWhitelisted(SpecificItemHandlerInfo handler, ItemStack stack){ private boolean isWhitelisted(SpecificItemHandlerInfo handler, ItemStack stack){
return handler.relayInQuestion.isWhitelisted(stack) && this.getConnectedRelay().isWhitelisted(stack); boolean whitelisted = handler.relayInQuestion.isWhitelisted(stack);
TileEntityLaserRelayItem connected = this.getConnectedRelay();
if(!PosUtil.areSamePos(handler.relayInQuestion.getPos(), connected.getPos())){
return whitelisted && connected.isWhitelisted(stack);
}
else{
return whitelisted;
}
} }
@Override @Override