From b3770a069ae0246b934bea0cbde58fff14467218 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 24 Dec 2019 11:16:59 -0600 Subject: [PATCH] Fix #2877, replacement of #2962 --- src/main/java/vazkii/botania/common/item/lens/Lens.java | 2 +- .../java/vazkii/botania/common/item/lens/LensWarp.java | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/lens/Lens.java b/src/main/java/vazkii/botania/common/item/lens/Lens.java index cb35550eb..92ea31083 100644 --- a/src/main/java/vazkii/botania/common/item/lens/Lens.java +++ b/src/main/java/vazkii/botania/common/item/lens/Lens.java @@ -37,7 +37,7 @@ public class Lens { public void onControlledSpreaderPulse(ItemStack stack, IManaSpreader spreader, boolean redstone) {} public int getManaToTransfer(IManaBurst burst, ThrowableEntity entity, ItemStack stack, IManaReceiver receiver) { - return burst.getMana(); + return entity.getPersistentData().getBoolean(LensWarp.TAG_WARPED) ? 0 : burst.getMana(); } } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java index 2cb972898..7f2d62eae 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java @@ -24,7 +24,7 @@ import vazkii.botania.common.block.ModBlocks; public class LensWarp extends Lens { - private static final String TAG_WARPED = "botania:warped"; + public static final String TAG_WARPED = "botania:warped"; @Override public boolean collideBurst(IManaBurst burst, ThrowableEntity entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { @@ -48,10 +48,4 @@ public class LensWarp extends Lens { } return dead; } - - @Override - public int getManaToTransfer(IManaBurst burst, ThrowableEntity entity, ItemStack stack, IManaReceiver receiver) { - return entity.getPersistentData().getBoolean(TAG_WARPED) ? 0 : burst.getMana(); - } - }