From f7124cb7e6f6007429948f956837d7eb985c0733 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 16 May 2015 16:59:36 +0100 Subject: [PATCH] fixed syncing things, and bug with last commit --- src/main/java/techreborn/api/recipe/RecipeCrafter.java | 7 ++++--- src/main/java/techreborn/util/ItemUtils.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/techreborn/api/recipe/RecipeCrafter.java b/src/main/java/techreborn/api/recipe/RecipeCrafter.java index bf2cceec4..32ff3987c 100644 --- a/src/main/java/techreborn/api/recipe/RecipeCrafter.java +++ b/src/main/java/techreborn/api/recipe/RecipeCrafter.java @@ -85,9 +85,6 @@ public class RecipeCrafter { * Call this on the tile tick */ public void updateEntity() { - /*if (parentTile.getWorldObj().isRemote) { - return; - }*/ if (currentRecipe == null) { for (IBaseRecipeType recipe : RecipeHanderer.getRecipeClassFromName(recipeName)) { boolean isFullRecipe = false; @@ -160,6 +157,10 @@ public class RecipeCrafter { } public void fitStack(ItemStack stack, int slot) { + //Don't do this on the client. + if (parentTile.getWorldObj().isRemote) { + return; + } if (stack == null) { return; } diff --git a/src/main/java/techreborn/util/ItemUtils.java b/src/main/java/techreborn/util/ItemUtils.java index 6a04dc436..7f5985d86 100644 --- a/src/main/java/techreborn/util/ItemUtils.java +++ b/src/main/java/techreborn/util/ItemUtils.java @@ -117,7 +117,7 @@ public class ItemUtils { ArrayList list = new ArrayList(); for (int oreID : OreDictionary.getOreIDs(stack)){ for(ItemStack ore : OreDictionary.getOres(OreDictionary.getOreName(oreID))){ - ItemStack newOre = stack; + ItemStack newOre = ore; newOre.stackSize = stack.stackSize; list.add(newOre); }