From 64b9fdd4607aa8ed61f25a01beae533bc3733685 Mon Sep 17 00:00:00 2001 From: SirSengir Date: Sun, 27 May 2012 09:45:02 +0200 Subject: [PATCH 1/8] Fixed compile error. --- .../src/buildcraft/transport/PipeTransportSolids.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/net/minecraft/src/buildcraft/transport/PipeTransportSolids.java b/common/net/minecraft/src/buildcraft/transport/PipeTransportSolids.java index 740fa5ef..3b4521b6 100644 --- a/common/net/minecraft/src/buildcraft/transport/PipeTransportSolids.java +++ b/common/net/minecraft/src/buildcraft/transport/PipeTransportSolids.java @@ -84,9 +84,8 @@ public abstract class PipeTransportSolids extends PipeTransport { if (APIProxy.isServerSide()) if (item.synchroTracker.markTimeIfDelay(worldObj, 6 * BuildCraftCore.updateFactor)) - CoreProxy.sendToPlayers(createItemPacket(item, orientation), - xCoord, yCoord, zCoord, 50, - mod_BuildCraftTransport.instance); + CoreProxy.sendToPlayers(createItemPacket(item, orientation), container.worldObj, + xCoord, yCoord, zCoord, 50, mod_BuildCraftTransport.instance); if (travelingEntities.size() > BuildCraftTransport.groupItemsTrigger) { groupEntities(); From 7e00bd6a7ff147590776cb4c0a84e9fe9fb09e5f Mon Sep 17 00:00:00 2001 From: Krapht Date: Sat, 26 May 2012 17:49:26 +0200 Subject: [PATCH 2/8] Add NPE protection --- .../src/buildcraft/transport/pipes/PipePowerWood.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipePowerWood.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipePowerWood.java index c56d2960..ed3373b0 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipePowerWood.java @@ -66,6 +66,11 @@ public class PipePowerWood extends Pipe implements IPowerReceptor { TileEntity tile = container.getTile(o); if (tile instanceof TileGenericPipe) { + if (((TileGenericPipe) tile).pipe == null) { + System.out.println("PipePowerWood.pipe was null, this used to cause a NPE crash)"); + continue; //Null pointer protection + } + PipeTransportPower pow = (PipeTransportPower) ((TileGenericPipe) tile).pipe.transport; float energyToRemove = 0; From 5a307cd0fe524d0222040882acc1a737627d40bb Mon Sep 17 00:00:00 2001 From: psxlover Date: Sat, 26 May 2012 20:43:59 +0300 Subject: [PATCH 3/8] Revert "Used getEntitiesWithinAABB instead of getting all the players of the world for sendToPlayers." This reverts commit 93cd7fe74e8eefc75bffd1f6c50c465527758016. --- .../net/minecraft/src/buildcraft/core/CoreProxy.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/buildcraft_server/net/minecraft/src/buildcraft/core/CoreProxy.java b/buildcraft_server/net/minecraft/src/buildcraft/core/CoreProxy.java index a91985c7..65e85aa2 100644 --- a/buildcraft_server/net/minecraft/src/buildcraft/core/CoreProxy.java +++ b/buildcraft_server/net/minecraft/src/buildcraft/core/CoreProxy.java @@ -10,9 +10,7 @@ package net.minecraft.src.buildcraft.core; import java.io.File; -import java.util.List; -import net.minecraft.src.AxisAlignedBB; import net.minecraft.src.Block; import net.minecraft.src.EntityItem; import net.minecraft.src.EntityPlayer; @@ -55,9 +53,13 @@ public class CoreProxy { public static void sendToPlayers(Packet packet, World w, int x, int y, int z, int maxDistance, NetworkMod mod) { if (packet != null) { - List players = w.getEntitiesWithinAABB(EntityPlayerMP.class, AxisAlignedBB.getBoundingBoxFromPool(x - maxDistance, y - maxDistance, z - maxDistance, x + maxDistance, y + maxDistance, z + maxDistance)); - for (EntityPlayerMP player: players) { - player.playerNetServerHandler.sendPacket(packet); + for (int j = 0; j < w.playerEntities.size(); j++) { + EntityPlayerMP player = (EntityPlayerMP)w.playerEntities.get(j); + + if (Math.abs(player.posX - x) <= maxDistance + && Math.abs(player.posY - y) <= maxDistance + && Math.abs(player.posZ - z) <= maxDistance) + player.playerNetServerHandler.sendPacket(packet); } } } From 82fd2f651baf4d2ca6f4c2eba8d4cd52209fa6a3 Mon Sep 17 00:00:00 2001 From: psxlover Date: Sat, 26 May 2012 20:54:03 +0300 Subject: [PATCH 4/8] NPE in Refinery GUI https://github.com/SirSengir/BuildCraft/issues/10 --- .../buildcraft/factory/ContainerRefinery.java | 56 ++++++++++--------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/common/net/minecraft/src/buildcraft/factory/ContainerRefinery.java b/common/net/minecraft/src/buildcraft/factory/ContainerRefinery.java index 5072b826..71909172 100644 --- a/common/net/minecraft/src/buildcraft/factory/ContainerRefinery.java +++ b/common/net/minecraft/src/buildcraft/factory/ContainerRefinery.java @@ -1,12 +1,11 @@ -/** +/** * Copyright (c) SpaceToad, 2011 * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ - package net.minecraft.src.buildcraft.factory; import net.minecraft.src.EntityPlayer; @@ -22,22 +21,23 @@ import net.minecraft.src.buildcraft.core.network.PacketPayload; import net.minecraft.src.buildcraft.core.network.PacketUpdate; public class ContainerRefinery extends BuildCraftContainer { - + TileRefinery refinery; - + public ContainerRefinery(InventoryPlayer inventory, TileRefinery refinery) { - super (3); + super(3); for (int l = 0; l < 3; l++) { for (int k1 = 0; k1 < 9; k1++) { addSlot(new Slot(inventory, k1 + l * 9 + 9, 8 + k1 * 18, - 123 + l * 18)); + 123 + l * 18)); } } - for (int i1 = 0; i1 < 9; i1++) + for (int i1 = 0; i1 < 9; i1++) { addSlot(new Slot(inventory, i1, 8 + i1 * 18, 181)); - + } + this.refinery = refinery; } @@ -45,27 +45,29 @@ public class ContainerRefinery extends BuildCraftContainer { public boolean canInteractWith(EntityPlayer entityplayer) { return refinery.isUseableByPlayer(entityplayer); } - + /* SETTING AND GETTING FILTERS */ /** * @param slot - * @param liquidId - * @param liquidMeta (for future use) + * @ param liquidId + param liquidMeta (for future use) */ public void setFilter(int slot, int liquidId, int liquidMeta) { - + refinery.setFilter(slot, liquidId); - - PacketPayload payload = new PacketPayload(3, 0, 0); - payload.intPayload[0] = slot; - payload.intPayload[1] = liquidId; - payload.intPayload[2] = liquidMeta; - CoreProxy.sendToServer(new PacketUpdate(PacketIds.REFINERY_FILTER_SET, refinery.xCoord, refinery.yCoord, refinery.zCoord, payload).getPacket()); + + if (APIProxy.isRemote()) { + PacketPayload payload = new PacketPayload(3, 0, 0); + payload.intPayload[0] = slot; + payload.intPayload[1] = liquidId; + payload.intPayload[2] = liquidMeta; + CoreProxy.sendToServer(new PacketUpdate(PacketIds.REFINERY_FILTER_SET, refinery.xCoord, refinery.yCoord, refinery.zCoord, payload).getPacket()); + } } - + public ItemStack getFilter(int slot) { int liquidId = refinery.getFilter(slot); - if(liquidId > 0) + if (liquidId > 0) return new ItemStack(liquidId, 0, 0); else return null; @@ -79,9 +81,9 @@ public class ContainerRefinery extends BuildCraftContainer { @Override public void updateCraftingResults() { - super.updateCraftingResults(); - for(int i = 0; i < crafters.size(); i++) - refinery.sendGUINetworkData(this, (ICrafting)crafters.get(i)); - } - + super.updateCraftingResults(); + for (int i = 0; i < crafters.size(); i++) { + refinery.sendGUINetworkData(this, (ICrafting) crafters.get(i)); + } + } } From 7836986f043aecb6b420413a05183b0392cb3ca6 Mon Sep 17 00:00:00 2001 From: psxlover Date: Sat, 26 May 2012 22:42:40 +0300 Subject: [PATCH 5/8] Fix a localization issue. --- .../buildcraft/factory/GuiAutoCrafting.java | 2 +- common/lang/buildcraft/de_DE.properties | 2 +- common/lang/buildcraft/en_US.properties | 2 +- common/lang/buildcraft/ru_RU.properties | 2 +- common/lang/buildcraft/sv_SE.properties | 100 +++++++++--------- 5 files changed, 54 insertions(+), 54 deletions(-) diff --git a/buildcraft_client/net/minecraft/src/buildcraft/factory/GuiAutoCrafting.java b/buildcraft_client/net/minecraft/src/buildcraft/factory/GuiAutoCrafting.java index 084d65b8..0950289d 100644 --- a/buildcraft_client/net/minecraft/src/buildcraft/factory/GuiAutoCrafting.java +++ b/buildcraft_client/net/minecraft/src/buildcraft/factory/GuiAutoCrafting.java @@ -32,7 +32,7 @@ public class GuiAutoCrafting extends GuiBuildCraft { @Override protected void drawGuiContainerForegroundLayer() { - String title = StringUtil.localize("tile.autoWorkBenchBlock"); + String title = StringUtil.localize("tile.autoWorkbenchBlock"); fontRenderer.drawString(title, getCenteredOffset(title), 6, 0x404040); fontRenderer.drawString(StringUtil.localize("gui.inventory"), 8, (ySize - 96) + 2, 0x404040); } diff --git a/common/lang/buildcraft/de_DE.properties b/common/lang/buildcraft/de_DE.properties index bc928a39..e39859d4 100644 --- a/common/lang/buildcraft/de_DE.properties +++ b/common/lang/buildcraft/de_DE.properties @@ -62,7 +62,7 @@ item.PipeItemsStripes=Gestreiftes Rohr item.PipeStructureCobblestone=Strukturrohr tile.miningWellBlock=Minenschacht tile.plainPipeBlock=Minenrohr -tile.autoWorkBenchBlock=Automatische Werkbank +tile.autoWorkbenchBlock=Automatische Werkbank tile.machineBlock=Steinbruch tile.markerBlock=Markstein tile.fillerBlock=F\u00fcller diff --git a/common/lang/buildcraft/en_US.properties b/common/lang/buildcraft/en_US.properties index 4460c498..3e9c748d 100644 --- a/common/lang/buildcraft/en_US.properties +++ b/common/lang/buildcraft/en_US.properties @@ -61,7 +61,7 @@ item.PipeItemsStripes=Stripes Transport Pipe item.PipeStructureCobblestone=Cobblestone Structure Pipe tile.miningWellBlock=Mining Well tile.plainPipeBlock=Mining Pipe -tile.autoWorkBenchBlock=Autocrafting Table +tile.autoWorkbenchBlock=Autocrafting Table tile.machineBlock=Quarry tile.markerBlock=Land Mark tile.fillerBlock=Filler diff --git a/common/lang/buildcraft/ru_RU.properties b/common/lang/buildcraft/ru_RU.properties index 2ce1c55a..61630808 100644 --- a/common/lang/buildcraft/ru_RU.properties +++ b/common/lang/buildcraft/ru_RU.properties @@ -62,7 +62,7 @@ item.PipeItemsStripes=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043e\u0447\u04 item.PipeStructureCobblestone=\u0417\u0430\u043f\u043e\u043b\u043d\u0435\u043d\u043d\u0430\u044f \u0442\u0440\u0443\u0431\u0430 tile.miningWellBlock=\u0411\u0443\u0440\u043e\u0432\u0430\u044f \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 tile.plainPipeBlock=\u0428\u0430\u0445\u0442\u0435\u0440\u0441\u043a\u0430\u044f \u0442\u0440\u0443\u0431\u0430 -tile.autoWorkBenchBlock=\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0439 \u0432\u0435\u0440\u0441\u0442\u0430\u043a +tile.autoWorkbenchBlock=\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0439 \u0432\u0435\u0440\u0441\u0442\u0430\u043a tile.machineBlock=\u041a\u0430\u0440\u044c\u0435\u0440 tile.markerBlock=\u041c\u0435\u0442\u043a\u0430 tile.pumpBlock=\u041f\u043e\u043c\u043f\u0430 diff --git a/common/lang/buildcraft/sv_SE.properties b/common/lang/buildcraft/sv_SE.properties index e6f280df..b072469f 100644 --- a/common/lang/buildcraft/sv_SE.properties +++ b/common/lang/buildcraft/sv_SE.properties @@ -5,66 +5,66 @@ gui.building.resources=Byggmaterial gui.del=Radera gui.filling.resources=Fyllningsmaterial gui.inventory=Inventarie -gui.lock=Lås -gui.needed=Behövd -gui.unlock=Lås upp -item.bucketFuel=Bränslehink +gui.lock=L\u00c3\u00a5s +gui.needed=Beh\u00c3\u00b6vd +gui.unlock=L\u00c3\u00a5s upp +item.bucketFuel=Br\u00c3\u00a4nslehink item.bucketOil=Olje Hink -item.woodenGearItem=Träkugghjul +item.woodenGearItem=Tr\u00c3\u00a4kugghjul item.stoneGearItem=Stenkugghjul -item.ironGearItem=Järnkugghjul +item.ironGearItem=J\u00c3\u00a4rnkugghjul item.goldGearItem=Guldkugghjul item.diamondGearItem=Diamantkugghjul item.templateItem=Mall item.wrenchItem=Skiftnyckel -item.fuel=Bränsle -item.pipeWaterproof=Rörvattentätning +item.fuel=Br\u00c3\u00a4nsle +item.pipeWaterproof=R\u00c3\u00b6rvattent\u00c3\u00a4tning item.pipeGate.0=Grind -item.pipeGate.1=Järn OCH Grind -item.pipeGate.2=Järn ELLER Grind +item.pipeGate.1=J\u00c3\u00a4rn OCH Grind +item.pipeGate.2=J\u00c3\u00a4rn ELLER Grind item.pipeGate.3=Guld OCH Grind item.pipeGate.4=Guld ELLER Grind item.pipeGate.5=Diamant OCH Grind item.pipeGate.6=Diamant ELLER Grind -item.pipeGateAutarchic.0=Primär Grind -item.pipeGateAutarchic.1=Primär Järn OCH Grind -item.pipeGateAutarchic.2=Primär Järn ELLER Grind -item.pipeGateAutarchic.3=Primär Guld OCH Grind -item.pipeGateAutarchic.4=Primär Guld ELLER Grind -item.pipeGateAutarchic.5=Primär Diamant OCH Grind -item.pipeGateAutarchic.6=Primär Diamant ELLER Grind -item.redPipeWire=Röd Rörledning -item.bluePipeWire=Blå Rörledning -item.greenPipeWire=Grön Rörledning -item.yellowPipeWire=Gul Rörledning -item.redstoneChipset.0=Rödsten Chipset -item.redstoneChipset.1=Rödsten Järn Chipset -item.redstoneChipset.2=Rödsten Guld Chipset -item.redstoneChipset.3=Rödsten Diamant Chipset +item.pipeGateAutarchic.0=Prim\u00c3\u00a4r Grind +item.pipeGateAutarchic.1=Prim\u00c3\u00a4r J\u00c3\u00a4rn OCH Grind +item.pipeGateAutarchic.2=Prim\u00c3\u00a4r J\u00c3\u00a4rn ELLER Grind +item.pipeGateAutarchic.3=Prim\u00c3\u00a4r Guld OCH Grind +item.pipeGateAutarchic.4=Prim\u00c3\u00a4r Guld ELLER Grind +item.pipeGateAutarchic.5=Prim\u00c3\u00a4r Diamant OCH Grind +item.pipeGateAutarchic.6=Prim\u00c3\u00a4r Diamant ELLER Grind +item.redPipeWire=R\u00c3\u00b6d R\u00c3\u00b6rledning +item.bluePipeWire=Bl\u00c3\u00a5 R\u00c3\u00b6rledning +item.greenPipeWire=Gr\u00c3\u00b6n R\u00c3\u00b6rledning +item.yellowPipeWire=Gul R\u00c3\u00b6rledning +item.redstoneChipset.0=R\u00c3\u00b6dsten Chipset +item.redstoneChipset.1=R\u00c3\u00b6dsten J\u00c3\u00a4rn Chipset +item.redstoneChipset.2=R\u00c3\u00b6dsten Guld Chipset +item.redstoneChipset.3=R\u00c3\u00b6dsten Diamant Chipset item.redstoneChipset.4=Pulserande Chipset item.blueprintItem=Ritning -item.PipeItemsWood=Trä Transport Rör -item.PipeItemsCobblestone=Kullersten Transport Rör -item.PipeItemsStone=Sten Transport Rör -item.PipeItemsIron=Järn Transport Rör -item.PipeItemsGold=Guld Transport Rör -item.PipeItemsDiamond=Diamant Transport Rör -item.PipeItemsObsidian=Obsidian Transport Rör -item.PipeLiquidsWood=Vattentätt Trä Rör -item.PipeLiquidsCobblestone=Vattentätt Kullerstens Rör -item.PipeLiquidsStone=Vattentätt Sten Rör -item.PipeLiquidsIron=Vattentätt Järn Rör -item.PipeLiquidsGold=Vattentätt Guld Rör -item.PipePowerWood=Konduktivt Trä Rör -item.PipePowerStone=Konduktivt Sten Rör -item.PipePowerGold=Konduktivt Guld Rör -item.PipeItemsStripes=Randigt Transport Rör -item.PipeStructureCobblestone=Kullerstens Struktur Rör +item.PipeItemsWood=Tr\u00c3\u00a4 Transport R\u00c3\u00b6r +item.PipeItemsCobblestone=Kullersten Transport R\u00c3\u00b6r +item.PipeItemsStone=Sten Transport R\u00c3\u00b6r +item.PipeItemsIron=J\u00c3\u00a4rn Transport R\u00c3\u00b6r +item.PipeItemsGold=Guld Transport R\u00c3\u00b6r +item.PipeItemsDiamond=Diamant Transport R\u00c3\u00b6r +item.PipeItemsObsidian=Obsidian Transport R\u00c3\u00b6r +item.PipeLiquidsWood=Vattent\u00c3\u00a4tt Tr\u00c3\u00a4 R\u00c3\u00b6r +item.PipeLiquidsCobblestone=Vattent\u00c3\u00a4tt Kullerstens R\u00c3\u00b6r +item.PipeLiquidsStone=Vattent\u00c3\u00a4tt Sten R\u00c3\u00b6r +item.PipeLiquidsIron=Vattent\u00c3\u00a4tt J\u00c3\u00a4rn R\u00c3\u00b6r +item.PipeLiquidsGold=Vattent\u00c3\u00a4tt Guld R\u00c3\u00b6r +item.PipePowerWood=Konduktivt Tr\u00c3\u00a4 R\u00c3\u00b6r +item.PipePowerStone=Konduktivt Sten R\u00c3\u00b6r +item.PipePowerGold=Konduktivt Guld R\u00c3\u00b6r +item.PipeItemsStripes=Randigt Transport R\u00c3\u00b6r +item.PipeStructureCobblestone=Kullerstens Struktur R\u00c3\u00b6r tile.miningWellBlock=Gruv Borr -tile.plainPipeBlock=Gruv Rör -tile.autoWorkBenchBlock=Automatiskt Arbetsbänk +tile.plainPipeBlock=Gruv R\u00c3\u00b6r +tile.autoWorkbenchBlock=Automatiskt Arbetsb\u00c3\u00a4nk tile.machineBlock=Stenbrott -tile.markerBlock=Land Märke +tile.markerBlock=Land M\u00c3\u00a4rke tile.fillerBlock=Fyllare tile.builderBlock=Byggare tile.architectBlock=Architektbord @@ -73,10 +73,10 @@ tile.tankBlock=Tank tile.refineryBlock=Raffinaderi tile.libraryBlock=Ritnings Bibliotek tile.laserBlock=Laser -tile.assemblyTableBlock=Monterings Bänk -tile.pathMarkerBlock=Väg Markör +tile.assemblyTableBlock=Monterings B\u00c3\u00a4nk +tile.pathMarkerBlock=V\u00c3\u00a4g Mark\u00c3\u00b6r tile.blockHopper=Hopper tile.pumpBlock=Pump -tile.engineWood=Rödsten Motor -tile.engineStone=Ång Motor -tile.engineIron=Förbrännings Motor \ No newline at end of file +tile.engineWood=R\u00c3\u00b6dsten Motor +tile.engineStone=\u00c3\u0085ng Motor +tile.engineIron=F\u00c3\u00b6rbr\u00c3\u00a4nnings Motor \ No newline at end of file From 6ccc3c9e36b5c95dc56cc4082548215dde89a533 Mon Sep 17 00:00:00 2001 From: psxlover Date: Sat, 26 May 2012 22:44:51 +0300 Subject: [PATCH 6/8] Removed some compilation warnings. --- common/net/minecraft/src/BuildCraftCore.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/net/minecraft/src/BuildCraftCore.java b/common/net/minecraft/src/BuildCraftCore.java index b3fdebe7..b2633c5c 100644 --- a/common/net/minecraft/src/BuildCraftCore.java +++ b/common/net/minecraft/src/BuildCraftCore.java @@ -198,7 +198,7 @@ public class BuildCraftCore { try { PowerFramework.currentFramework = (PowerFramework) Class .forName(prefix + "buildcraft.energy.PneumaticPowerFramework") - .getConstructor(null).newInstance(null); + .getConstructor().newInstance(); } catch (Throwable e) { e.printStackTrace(); } @@ -209,8 +209,8 @@ public class BuildCraftCore { className = className.replace("net.minecraft.src.", ""); PowerFramework.currentFramework = (PowerFramework) Class - .forName(prefix + className).getConstructor(null) - .newInstance(null); + .forName(prefix + className).getConstructor() + .newInstance(); } catch (Throwable e) { e.printStackTrace(); PowerFramework.currentFramework = new RedstonePowerFramework(); From 37cac720e69ce77b154074d75d536c0dbdac3345 Mon Sep 17 00:00:00 2001 From: psxlover Date: Sun, 27 May 2012 01:36:01 +0300 Subject: [PATCH 7/8] Fixed filler respawning striped tape after it gets destroyed. --- .../net/minecraft/src/buildcraft/builders/TileFiller.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/net/minecraft/src/buildcraft/builders/TileFiller.java b/common/net/minecraft/src/buildcraft/builders/TileFiller.java index dc80fc85..d7e97334 100644 --- a/common/net/minecraft/src/buildcraft/builders/TileFiller.java +++ b/common/net/minecraft/src/buildcraft/builders/TileFiller.java @@ -73,6 +73,9 @@ public class TileFiller extends TileBuildCraft implements ISpecialInventory, IPo ((TileMarker) a).removeFromWorld(); } + if (!APIProxy.isClient(worldObj) && box.isInitialized()) { + box.createLasers(worldObj, LaserKind.Stripes); + } sendNetworkUpdate(); } } @@ -84,10 +87,6 @@ public class TileFiller extends TileBuildCraft implements ISpecialInventory, IPo public void updateEntity () { super.updateEntity(); - if (box.isInitialized()) { - box.createLasers(worldObj, LaserKind.Stripes); - } - if (done) { if (lastMode == Mode.Loop) { done = false; From 50a4fa1ea0f96a1351831ca0d41e2ad29a696614 Mon Sep 17 00:00:00 2001 From: psxlover Date: Sun, 27 May 2012 01:56:33 +0300 Subject: [PATCH 8/8] A exception that was already being caught. --- .../minecraft/src/buildcraft/transport/TileGenericPipe.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java b/common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java index a57cdb5a..dcf63ef8 100644 --- a/common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java +++ b/common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java @@ -85,7 +85,11 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, if(nbttagcompound.hasKey("owner")) owner = nbttagcompound.getString("owner"); - pipe = BlockGenericPipe.createPipe(nbttagcompound.getInteger("pipeId")); + int key = nbttagcompound.getInteger("pipeId"); + if (key > 0) { + pipe = BlockGenericPipe.createPipe(key); + } + if (pipe != null) { pipe.setTile(this); pipe.readFromNBT(nbttagcompound);