From be0518f2bfee22e3fd5cc2055d9898f46aa0b144 Mon Sep 17 00:00:00 2001
From: Rseifert <rseifert.phone@gmail.com>
Date: Fri, 18 Jan 2013 22:47:33 -0500
Subject: [PATCH] Fixed a SMP crash issue with sound for belts

Not sure if you guys are even bug testing on SMP but you need too every
so often. SMP lan, and SMP Dedicated are two diffrent server types. The
SMP lan can get away with something like playing sound. However, doing
anything client related on SMP Dedicated will cause a crash. Make sure
in the code anything client releated is only done on the client reguard
less of how small.

Also who every changed the rejector to use the paper item and display
the item name above it good job. Its a nice feature and better than the
GUI I  had, however if there isn't a way alread we need to work in a way
to have several item on a rejector. Which we can either do with the
detector, another block, or the rejector itself.

On another note i turned down the AMP pull a little to make belt lines
easier to feed.
---
 .../client/render/RenderCrate.java            | 70 +++++++++----------
 .../machine/TileEntityAssemblyNetwork.java    |  2 +-
 .../machine/belt/TileEntityConveyorBelt.java  |  4 +-
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/minecraft/assemblyline/client/render/RenderCrate.java b/src/minecraft/assemblyline/client/render/RenderCrate.java
index 6587999d..4e6cfa66 100644
--- a/src/minecraft/assemblyline/client/render/RenderCrate.java
+++ b/src/minecraft/assemblyline/client/render/RenderCrate.java
@@ -1,35 +1,35 @@
-package assemblyline.client.render;
-
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.world.IBlockAccess;
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-
-public class RenderCrate implements ISimpleBlockRenderingHandler
-{
-
-	@Override
-	public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer)
-	{
-		
-	}
-
-	@Override
-	public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer)
-	{
-		return false;
-	}
-
-	@Override
-	public boolean shouldRender3DInInventory()
-	{
-		return false;
-	}
-
-	@Override
-	public int getRenderId()
-	{
-		return 0;
-	}
-
-}
+package assemblyline.client.render;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.world.IBlockAccess;
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+
+public class RenderCrate implements ISimpleBlockRenderingHandler
+{
+
+	@Override
+	public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer)
+	{
+		
+	}
+
+	@Override
+	public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer)
+	{
+		return false;
+	}
+
+	@Override
+	public boolean shouldRender3DInInventory()
+	{
+		return false;
+	}
+
+	@Override
+	public int getRenderId()
+	{
+		return 0;
+	}
+
+}
diff --git a/src/minecraft/assemblyline/common/machine/TileEntityAssemblyNetwork.java b/src/minecraft/assemblyline/common/machine/TileEntityAssemblyNetwork.java
index ac5c5dbc..2fd0ec6e 100644
--- a/src/minecraft/assemblyline/common/machine/TileEntityAssemblyNetwork.java
+++ b/src/minecraft/assemblyline/common/machine/TileEntityAssemblyNetwork.java
@@ -110,7 +110,7 @@ public abstract class TileEntityAssemblyNetwork extends TileEntityElectricityRec
 
 	protected ElectricityPack getRequest()
 	{
-		return new ElectricityPack(15, this.getVoltage());
+		return new ElectricityPack(10, this.getVoltage());
 	}
 
 	protected int getMaxTransferRange()
diff --git a/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java b/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java
index 68f3d4b7..95db6ad2 100644
--- a/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java
+++ b/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java
@@ -118,9 +118,9 @@ public class TileEntityConveyorBelt extends TileEntityAssemblyNetwork implements
 			PacketManager.sendPacketToClients(this.getDescriptionPacket());
 		}
 
-		if (this.isRunning())
+		if (this.isRunning()&& this.worldObj.isRemote)
 		{
-			if (this.ticks % (10) == 0) //sound is 0.5 seconds long (20 ticks/second)
+			if (this.ticks % (10) == 0 ) //sound is 0.5 seconds long (20 ticks/second)
 				Minecraft.getMinecraft().sndManager.playSound("assemblyline.conveyor", this.xCoord, this.yCoord, this.zCoord, 0.125f, 0.3f);
 			
 			this.wheelRotation += 40;