fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Alerting a non Alertable tile no longer crashes.

Browse Source 
Planes can no longer pick up Item Entities without power.
This commit is contained in:
AlgorithmX2
2014-02-14 00:25:49 -06:00
parent 7f99e281f0
commit 8808ca63c3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
me/cache/TickManagerCache.java
Vendored
+3 -1
View File
@@ -107,7 +107,9 @@ public class TickManagerCache implements ITickManager
{ {
TickTracker tt = alertable.get( node ); TickTracker tt = alertable.get( node );
if ( tt == null ) if ( tt == null )
throw new RuntimeException( "Invalid Alertted device, this node is not marked as alertable, or part of this grid." ); return false;
// throw new RuntimeException(
// "Invalid Alertted device, this node is not marked as alertable, or part of this grid." );
// set to awake, this is for sanity. // set to awake, this is for sanity.
sleeping.remove( node ); sleeping.remove( node );
parts/automation/PartAnnihilationPlane.java
+1 -1
View File
@@ -350,7 +350,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
break; break;
} }
if ( capture && Platform.isServer() ) if ( capture && Platform.isServer() && proxy.isActive() )
{ {
IAEItemStack stack = AEItemStack.create( ((EntityItem) entity).getEntityItem() ); IAEItemStack stack = AEItemStack.create( ((EntityItem) entity).getEntityItem() );
if ( stack != null ) if ( stack != null )