From 8a72ebca8925959bce8809e690f0fb4772ce8c8e Mon Sep 17 00:00:00 2001
From: fscan <flo@chilicode.com>
Date: Wed, 1 Aug 2018 00:17:10 +0200
Subject: [PATCH] check if actually added before removing (#3639)

Fixes #3634
---
 src/main/java/appeng/parts/AEBasePart.java       |  2 +-
 .../java/appeng/parts/misc/PartToggleBus.java    | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java
index dcd162ab0..51f6841a9 100644
--- a/src/main/java/appeng/parts/AEBasePart.java
+++ b/src/main/java/appeng/parts/AEBasePart.java
@@ -120,7 +120,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
 	@Override
 	public void securityBreak()
 	{
-		if( this.getItemStack().getCount() > 0 )
+		if( this.getItemStack().getCount() > 0 && this.getGridNode() != null )
 		{
 			final List<ItemStack> items = new ArrayList<>();
 			items.add( this.is.copy() );
diff --git a/src/main/java/appeng/parts/misc/PartToggleBus.java b/src/main/java/appeng/parts/misc/PartToggleBus.java
index 19efef642..128031bf5 100644
--- a/src/main/java/appeng/parts/misc/PartToggleBus.java
+++ b/src/main/java/appeng/parts/misc/PartToggleBus.java
@@ -19,9 +19,7 @@
 package appeng.parts.misc;
 
 
-import java.util.ArrayList;
 import java.util.EnumSet;
-import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -48,7 +46,6 @@ import appeng.items.parts.PartModels;
 import appeng.me.helpers.AENetworkProxy;
 import appeng.parts.PartBasicState;
 import appeng.parts.PartModel;
-import appeng.util.Platform;
 
 
 public class PartToggleBus extends PartBasicState
@@ -105,19 +102,6 @@ public class PartToggleBus extends PartBasicState
 		return AECableType.GLASS;
 	}
 
-	@Override
-	public void securityBreak()
-	{
-		if( this.getItemStack().getCount() > 0 )
-		{
-			final List<ItemStack> items = new ArrayList<>();
-			items.add( this.getItemStack().copy() );
-			this.getHost().removePart( this.getSide(), false );
-			Platform.spawnDrops( this.getTile().getWorld(), this.getTile().getPos(), items );
-			this.getItemStack().setCount( 0 );
-		}
-	}
-
 	@Override
 	public void getBoxes( final IPartCollisionHelper bch )
 	{