From cec10471fb9cc2f90153789cec2987633da8c88d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 18 Jan 2016 12:15:56 -0600 Subject: [PATCH] Fix two multiblock crashes, closes #48 --- .../botania/client/core/handler/MultiblockRenderHandler.java | 2 +- .../java/vazkii/botania/client/core/proxy/ClientProxy.java | 3 --- src/main/java/vazkii/botania/common/item/ItemSextant.java | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index b4384a73d..df5f30c45 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -86,7 +86,7 @@ public final class MultiblockRenderHandler { public static void setMultiblock(MultiblockSet set) { currentMultiblock = set; anchor = null; - angle = EnumFacing.DOWN; + angle = EnumFacing.SOUTH; Minecraft mc = Minecraft.getMinecraft(); if(mc.theWorld != null) diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 10ae747af..021feaa71 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -395,9 +395,6 @@ public class ClientProxy extends CommonProxy { if((int) Math.floor(MathHelper.pointDistancePlane(xp, zp, x, z)) == (iradius - 1)) mb.addComponent(new AnyComponent(new BlockPos(xp - x, 1, zp - z), block.getDefaultState())); - - if((int) Math.floor(MathHelper.pointDistancePlane(xp, zp, x, z)) == iradius - 1) - mb.addComponent(new AnyComponent(new BlockPos(xp - x, 1, zp - z), block.getDefaultState())); } MultiblockRenderHandler.setMultiblock(mb.makeSet()); diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index 2e06cff7e..764208d33 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -171,11 +171,10 @@ public class ItemSextant extends ItemMod { @Override public Map createRotations() { Map ret = new EnumMap<>(EnumFacing.class); - for (EnumFacing e : EnumFacing.HORIZONTALS) { + for (EnumFacing e : EnumFacing.VALUES) { ret.put(e, this); } return ret; - // return new Multiblock[] { this }; todo 1.8 verify, this was only the first direction } }