From 10ac3c3067db14f33ab132c33e42aa0af6d4ef27 Mon Sep 17 00:00:00 2001 From: Hubry Date: Sun, 2 Feb 2020 22:51:06 +0100 Subject: [PATCH] Fix empty prisms allowing warped bursts to transfer mana --- .../java/vazkii/botania/common/entity/EntityManaBurst.java | 4 ++++ src/main/java/vazkii/botania/common/item/lens/Lens.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index dac330689..073b4547e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -58,6 +58,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; +import vazkii.botania.common.item.lens.LensWarp; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; @@ -570,6 +571,9 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst { } private void onRecieverImpact(IManaReceiver tile, BlockPos pos) { + if (getPersistentData().getBoolean(LensWarp.TAG_WARPED)) + return; + ILensEffect lens = getLensInstance(); int mana = getMana(); 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 92ea31083..cb35550eb 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 entity.getPersistentData().getBoolean(LensWarp.TAG_WARPED) ? 0 : burst.getMana(); + return burst.getMana(); } }