Allow permanent constructs to be dispelled by shift-right-clicking with any wand

2020-06-06 22:16:39 +01:00
parent 5011246e79
commit 6df0d2dc6e
1 changed files with 16 additions and 0 deletions
@@ -1,6 +1,7 @@
 package electroblob.wizardry.entity.construct;

 import electroblob.wizardry.Wizardry;
+import electroblob.wizardry.item.ISpellCastingItem;
 import electroblob.wizardry.registry.WizardrySounds;
 import electroblob.wizardry.util.AllyDesignationSystem;
 import electroblob.wizardry.util.WizardryUtilities;
@@ -8,8 +9,12 @@ import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.IEntityOwnable;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.SoundCategory;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData;
 import net.minecraftforge.fml.relauncher.Side;
@@ -70,6 +75,17 @@ public abstract class EntityMagicConstruct extends Entity implements IEntityOwna

 	}

+	@Override
+	public EnumActionResult applyPlayerInteraction(EntityPlayer player, Vec3d vec, EnumHand hand){
+
+		if(lifetime == -1 && getCaster() == player && player.isSneaking() && player.getHeldItem(hand).getItem() instanceof ISpellCastingItem){
+			this.despawn();
+			return EnumActionResult.SUCCESS;
+		}
+
+		return super.applyPlayerInteraction(player, vec, hand);
+	}
+
 	/**
 	 * Defaults to just setDead() in EntityMagicConstruct, but is provided to allow subclasses to override this e.g.
 	 * bubble uses it to dismount the entity inside it and play the 'pop' sound before calling super(). You should