Fixed collision boxes and fixed ignored events triggering other redux…

… block events.
Quiddity-Modding · Feb 8, 2015 · 7dca4af · 7dca4af
1 parent 9711d29
commit 7dca4af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/main/java/mods/quiddity/redux/ReduxBlock.java b/src/main/java/mods/quiddity/redux/ReduxBlock.java
@@ -93,7 +93,7 @@ public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState sta
 
     @Override
     public boolean isCollidable() {
-        return reduxBlock.getCollisionBoxes() != null && reduxBlock.getCollisionBoxes().isEmpty();
+        return reduxBlock.getCollisionBoxes() == null || !reduxBlock.getCollisionBoxes().isEmpty();
     }
 
     @Override

diff --git a/src/main/java/mods/quiddity/redux/ReduxCommandBlockTileEntity.java b/src/main/java/mods/quiddity/redux/ReduxCommandBlockTileEntity.java
@@ -218,8 +218,7 @@ public void receiveEvent(Event event) {
                     playerTrigger = chunkWatchEvent.player;
                 } else if (event instanceof BlockEvent) {
                     BlockEvent blockEvent = (BlockEvent) event;
-                    if (triggerScript.blockHasToBeTheCause() && blockEvent.pos != ReduxCommandBlockTileEntity.this.pos
-                            && !(worldObj.getTileEntity(blockEvent.pos) instanceof ReduxCommandBlockTileEntity)) {
+                    if (triggerScript.blockHasToBeTheCause() && blockEvent.pos != ReduxCommandBlockTileEntity.this.pos) {
                         return;
                     }
 
@@ -244,7 +243,6 @@ public void receiveEvent(Event event) {
                     reduxVariables.put("chunk_x", String.valueOf(explosionEvent.world.getChunkFromBlockCoords(new BlockPos(explosionEvent.explosion.getPosition())).getChunkCoordIntPair().chunkXPos));
                     reduxVariables.put("chunk_z", String.valueOf(explosionEvent.world.getChunkFromBlockCoords(new BlockPos(explosionEvent.explosion.getPosition())).getChunkCoordIntPair().chunkZPos));
                 }
-
                 reduxVariables.put("event_name", triggerScript.getTriggerEvent().name());
             } else if (event == null && lastEventArgs != null && lastEventArgs.length > 0) {
                 if (triggerScript.getTriggerEvent() == Trigger.TriggerEvent.OnEntityCollide) {