Fixed #691 Made sure the light slowly disapears from the world

Thaumic-Tinkerer · Mar 30, 2015 · 55a2fa4 · 55a2fa4
1 parent ecc0ad6
commit 55a2fa4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/src/main/java/thaumic/tinkerer/common/block/BlockNitorGas.java b/src/main/java/thaumic/tinkerer/common/block/BlockNitorGas.java
@@ -52,10 +52,14 @@ public void randomDisplayTick(World par1World, int par2, int par3, int par4, Ran
     @Override
     public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) {
         if (!par1World.isRemote) {
+        	boolean remove=false;
             int dist = par1World.getBlockMetadata(par2, par3, par4) == 1 ? 6 : 1;
             List<EntityPlayer> players = par1World.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(par2 - dist, par3 - dist, par4 - dist, par2 + dist, par3 + dist, par4 + dist));
             if (players.isEmpty())
+            {
                 par1World.setBlockToAir(par2, par3, par4);
+                remove=true;
+            }
             else {
                 boolean has = false;
                 for (EntityPlayer player : players)
@@ -65,8 +69,12 @@ public void updateTick(World par1World, int par2, int par3, int par4, Random par
                     }
 
                 if (!has)
+                {
                     par1World.setBlockToAir(par2, par3, par4);
+                    remove=true;
+                }
             }
+            if(!remove)
             par1World.scheduleBlockUpdate(par2, par3, par4, this, tickRate(par1World));
         }
     }

diff --git a/src/main/java/thaumic/tinkerer/common/block/tile/transvector/TileTransvectorInterface.java b/src/main/java/thaumic/tinkerer/common/block/tile/transvector/TileTransvectorInterface.java
@@ -352,8 +352,9 @@ public int containerContains(Aspect paramAspect) {
 
     @Override
     public boolean isConnectable(ForgeDirection forgeDirection) {
-        TileEntity tile = getTile();
-        return tile instanceof IEssentiaTransport && ((IEssentiaTransport) tile).isConnectable(forgeDirection);
+        //TileEntity tile = getTile();
+        //return tile instanceof IEssentiaTransport && ((IEssentiaTransport) tile).isConnectable(forgeDirection);
+    	return true;
     }
 
     @Override
@@ -377,11 +378,17 @@ public void setSuction(Aspect paramAspect, int paramInt) {
 
     @Override
     public Aspect getSuctionType(ForgeDirection forgeDirection) {
+    	TileEntity tile = getTile();
+        if (tile instanceof IEssentiaTransport)
+            return ((IEssentiaTransport) tile).getSuctionType(forgeDirection);
         return null;
     }
 
     @Override
     public int getSuctionAmount(ForgeDirection forgeDirection) {
+    	TileEntity tile = getTile();
+        if (tile instanceof IEssentiaTransport)
+            return ((IEssentiaTransport) tile).getSuctionAmount(forgeDirection);
         return 0;
     }
 
@@ -399,7 +406,8 @@ public int getMinimumSuction() {
 
     @Override
     public boolean renderExtendedTube() {
-        return false;
+    	TileEntity tile = getTile();
+        return tile instanceof IEssentiaTransport && ((IEssentiaTransport) tile).renderExtendedTube();
     }
 
     @Override

diff --git a/src/main/java/thaumic/tinkerer/common/item/kami/armor/ItemGemLegs.java b/src/main/java/thaumic/tinkerer/common/item/kami/armor/ItemGemLegs.java
@@ -64,7 +64,7 @@ void tickPlayer(EntityPlayer player) {
             player.addPotionEffect(new PotionEffect(Potion.fireResistance.id,
                     202, 10, true));
         ItemBrightNitor.meta = 1;
-        ThaumicTinkerer.registry.getFirstItemFromClass(ItemBrightNitor.class).onUpdate(null, player.worldObj, player, 0, false);
+        ((ItemBrightNitor)ThaumicTinkerer.registry.getFirstItemFromClass(ItemBrightNitor.class)).onUpdate(null, player.worldObj, player, 0, false);
         ItemBrightNitor.meta = 0;
 
         int x = (int) Math.floor(player.posX);