From 58e5af08149204bd873620331605f60e630e382a Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Wed, 11 May 2016 20:59:38 +0200
Subject: [PATCH] Less processing of whitelist

---
 .../mod/tile/TileEntityItemViewer.java                 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java
index 92c0f933c..e691caca0 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java
@@ -2,6 +2,7 @@ package de.ellpeck.actuallyadditions.mod.tile;
 
 import de.ellpeck.actuallyadditions.mod.misc.LaserRelayConnectionHandler;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay.TileEntityLaserRelayItem;
+import de.ellpeck.actuallyadditions.mod.util.PosUtil;
 import de.ellpeck.actuallyadditions.mod.util.WorldUtil;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -89,7 +90,14 @@ public class TileEntityItemViewer extends TileEntityInventoryBase{
     }
 
     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