From 400e629c170eb69f43bce9a0928230fd77770664 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 3 Apr 2015 16:46:38 +0100 Subject: [PATCH] Allow removal of cursors while editing in the Ring of Loki. Also fix it not working past the 4.5 block range in normal survival. --- .../botania/common/item/relic/ItemLokiRing.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index d7009fb77..6be678c8b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -68,7 +68,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat ItemStack heldItemStack = player.getCurrentEquippedItem(); ChunkCoordinates originCoords = getOriginPos(lokiRing); - MovingObjectPosition lookPos = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 4.5F); + MovingObjectPosition lookPos = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10F); if(heldItemStack == null && event.action == Action.RIGHT_CLICK_BLOCK && player.isSneaking()) { if(originCoords.posY == -1 && lookPos != null) { @@ -80,11 +80,18 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat else { List cursors = getCursorList(lokiRing); addCursor : { + int relX = lookPos.blockX - originCoords.posX; + int relY = lookPos.blockY - originCoords.posY; + int relZ = lookPos.blockZ - originCoords.posZ; + for(ChunkCoordinates cursor : cursors) - if(cursor.posX == lookPos.blockX && cursor.posY == lookPos.blockY && cursor.posZ == lookPos.blockZ) + if(cursor.posX == relX && cursor.posY == relY && cursor.posZ == relZ) { + cursors.remove(cursor); + setCursorList(lokiRing, cursors); break addCursor; + } - addCursor(lokiRing, lookPos.blockX - originCoords.posX, lookPos.blockY - originCoords.posY, lookPos.blockZ - originCoords.posZ); + addCursor(lokiRing, relX, relY, relZ); } } }