From 40bac681901593ad8d43f2a8921c6c6c3e3f0c0d Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 23 Feb 2017 20:01:07 -0800 Subject: [PATCH] Break early if activation crystal isn't bound Fixes annoying and usually false "not configured correctly" message. https://redd.it/5vte95 (cherry picked from commit 32668f7) --- .../bloodmagic/block/BlockRitualController.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java index 8f6f1492..3d5efaf9 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java @@ -5,6 +5,8 @@ import java.util.List; import javax.annotation.Nullable; +import WayofTime.bloodmagic.api.iface.IBindable; +import com.google.common.base.Strings; import WayofTime.bloodmagic.block.base.BlockEnum; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -64,10 +66,13 @@ public class BlockRitualController extends BlockEnum imple { if (heldItem.getItem() == ModItems.ACTIVATION_CRYSTAL) { + IBindable bindable = (IBindable) heldItem.getItem(); + if (Strings.isNullOrEmpty(bindable.getOwnerName(heldItem))) + return false; + String key = RitualHelper.getValidRitual(world, pos); EnumFacing direction = RitualHelper.getDirectionOfRitual(world, pos, key); - // TODO: Give a message stating that this ritual is not a valid - // ritual. + // TODO: Give a message stating that this ritual is not a valid ritual. if (!key.isEmpty() && direction != null && RitualHelper.checkValidRitual(world, pos, key, direction)) { if (((TileMasterRitualStone) tile).activateRitual(heldItem, player, RitualRegistry.getRitualForId(key)))