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

Merge pull request #435 from thatsIch/hotfix-260

Browse Source 
HotFix, potentially fixes #260 through catching a null node
This commit is contained in:
thatsIch
2014-11-15 12:48:35 +01:00
parent beddc9db50 0f541484de
commit c56c351ef8
1 changed files with 59 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/misc/PartStorageBus.java
+15 -13
View File
@@ -18,6 +18,7 @@
package appeng.parts.misc; package appeng.parts.misc;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@@ -29,6 +30,13 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import buildcraft.api.transport.IPipeConnection;
import buildcraft.api.transport.IPipeTile.PipeType;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.config.AccessRestriction; import appeng.api.config.AccessRestriction;
import appeng.api.config.FuzzyMode; import appeng.api.config.FuzzyMode;
@@ -78,16 +86,13 @@ import appeng.transformer.annotations.integration.Method;
import appeng.util.Platform; import appeng.util.Platform;
import appeng.util.prioitylist.FuzzyPriorityList; import appeng.util.prioitylist.FuzzyPriorityList;
import appeng.util.prioitylist.PrecisePriorityList; import appeng.util.prioitylist.PrecisePriorityList;
import buildcraft.api.transport.IPipeConnection;
import buildcraft.api.transport.IPipeTile.PipeType;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@Interface( iname = "BC", iface = "buildcraft.api.transport.IPipeConnection" ) @Interface( iname = "BC", iface = "buildcraft.api.transport.IPipeConnection" )
public class PartStorageBus extends PartUpgradeable implements IGridTickable, ICellContainer, IMEMonitorHandlerReceiver<IAEItemStack>, IPipeConnection, public class PartStorageBus
IPriorityHost extends PartUpgradeable
implements IGridTickable, ICellContainer, IMEMonitorHandlerReceiver<IAEItemStack>, IPipeConnection, IPriorityHost
{ {
int priority = 0; int priority = 0;
final BaseActionSource mySrc; final BaseActionSource mySrc;
@@ -372,7 +377,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
achievement = ( IInterfaceHost ) part; achievement = ( IInterfaceHost ) part;
} }
if ( achievement != null ) if ( achievement != null && achievement.getActionableNode() != null )
{ {
Platform.addStat( achievement.getActionableNode().getPlayerID(), Achievements.Recursive.getAchievement() ); Platform.addStat( achievement.getActionableNode().getPlayerID(), Achievements.Recursive.getAchievement() );
// Platform.addStat( getActionableNode().getPlayerID(), Achievements.Recursive.getAchievement() ); // Platform.addStat( getActionableNode().getPlayerID(), Achievements.Recursive.getAchievement() );
@@ -401,8 +406,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
public void renderStatic( int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer ) public void renderStatic( int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer )
{ {
renderCache = rh.useSimplifiedRendering( x, y, z, this, renderCache ); renderCache = rh.useSimplifiedRendering( x, y, z, this, renderCache );
rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), is.getIconIndex(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() );
is.getIconIndex(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() );
rh.setBounds( 3, 3, 15, 13, 13, 16 ); rh.setBounds( 3, 3, 15, 13, 13, 16 );
rh.renderBlock( x, y, z, renderer ); rh.renderBlock( x, y, z, renderer );
@@ -494,8 +498,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
@Override @Override
public void blinkCell( int slot ) public void blinkCell( int slot )
{ {}
}
@Override @Override
public void postChange( IBaseMonitor<IAEItemStack> monitor, Iterable<IAEItemStack> change, BaseActionSource source ) public void postChange( IBaseMonitor<IAEItemStack> monitor, Iterable<IAEItemStack> change, BaseActionSource source )
@@ -529,5 +532,4 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
{ {
// nope! // nope!
} }
} }