aboutsummaryrefslogtreecommitdiff
path: root/src/Java/miscutil/core/handler
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-03-20 13:41:05 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-03-20 13:41:05 +1000
commit19894ecb9d0a8bcb5fec9117ec705b4c93ccdcb3 (patch)
tree2cffa17d80f5f479c782e26a09f4162909636bee /src/Java/miscutil/core/handler
parent7a41bde88f8c2164d1bc5b23bc695ea7bb5e9cda (diff)
downloadGT5-Unofficial-19894ecb9d0a8bcb5fec9117ec705b4c93ccdcb3.tar.gz
GT5-Unofficial-19894ecb9d0a8bcb5fec9117ec705b4c93ccdcb3.tar.bz2
GT5-Unofficial-19894ecb9d0a8bcb5fec9117ec705b4c93ccdcb3.zip
Added an extra instanceof check in the XEventHandler class just incase the meta tile entity is actually a pipe. (Oversight at my behalf)
Cleaned up some of te Player Caching code, so it's not loaded twice every time it's needed (6am logic loops are the cause) Will add a new build when I've finalised everything.
Diffstat (limited to 'src/Java/miscutil/core/handler')
-rw-r--r--src/Java/miscutil/core/handler/XEventHandler.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Java/miscutil/core/handler/XEventHandler.java b/src/Java/miscutil/core/handler/XEventHandler.java
index 3742f29e47..806296d594 100644
--- a/src/Java/miscutil/core/handler/XEventHandler.java
+++ b/src/Java/miscutil/core/handler/XEventHandler.java
@@ -1,6 +1,7 @@
package miscutil.core.handler;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.metatileentity.BaseMetaPipeEntity;
import gregtech.api.metatileentity.BaseMetaTileEntity;
import gregtech.api.metatileentity.BaseTileEntity;
import miscutil.core.util.Utils;
@@ -17,7 +18,7 @@ public class XEventHandler {
EntityPlayer playerInternal = event.getPlayer();
try{
- if (entity instanceof BaseTileEntity){
+ if (entity instanceof BaseTileEntity && !(entity instanceof BaseMetaPipeEntity)){
IMetaTileEntity X = ((BaseMetaTileEntity)entity).getMetaTileEntity();
if (X instanceof GregtechMetaSafeBlockBase){