Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:SirSengir/BuildCraft

Browse source
This commit is contained in:
SirSengir 2012-07-15 22:24:51 +02:00
commit 53cc613c9f
2 changed files with 274 additions and 271 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
buildcraft_client/net/minecraft/src/buildcraft/silicon/GuiAssemblyTable.java
View file

@ -134,6 +134,9 @@ public class GuiAssemblyTable extends GuiAdvancedInterface {
if (position != -1) { if (position != -1) {
RecipeSlot slot = (RecipeSlot) slots[position]; RecipeSlot slot = (RecipeSlot) slots[position];
if (slot.recipe == null)
return;
SelectionMessage message = new SelectionMessage(); SelectionMessage message = new SelectionMessage();
if (assemblyTable.isPlanned(slot.recipe)) { if (assemblyTable.isPlanned(slot.recipe)) {

2
common/net/minecraft/src/buildcraft/silicon/TileLaser.java
View file

@ -164,7 +164,7 @@ public class TileLaser extends TileBuildCraft implements IPowerReceptor {
protected void createLaser() { protected void createLaser() {
if (!APIProxy.isClient(worldObj)) if (APIProxy.isServerSide())
return; return;
laser = new EntityEnergyLaser(worldObj, new Position(xCoord, yCoord, zCoord), new Position(xCoord, yCoord, zCoord)); laser = new EntityEnergyLaser(worldObj, new Position(xCoord, yCoord, zCoord), new Position(xCoord, yCoord, zCoord));