From 40ed431ee2786762688df073d8d3e82059dec40c Mon Sep 17 00:00:00 2001
From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com>
Date: Fri, 10 Apr 2020 16:01:18 +0100
Subject: [PATCH] Fix crash when throwing stuff with greater telekinesis via
 commands

---
 .../java/electroblob/wizardry/spell/GreaterTelekinesis.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/electroblob/wizardry/spell/GreaterTelekinesis.java b/src/main/java/electroblob/wizardry/spell/GreaterTelekinesis.java
index b5f90f81..1bc1e45b 100644
--- a/src/main/java/electroblob/wizardry/spell/GreaterTelekinesis.java
+++ b/src/main/java/electroblob/wizardry/spell/GreaterTelekinesis.java
@@ -18,6 +18,7 @@ import net.minecraft.item.EnumAction;
 import net.minecraft.network.play.server.SPacketEntityVelocity;
 import net.minecraft.tileentity.TileEntityDispenser;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.SoundEvent;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
@@ -86,7 +87,8 @@ public class GreaterTelekinesis extends SpellRay {
 				
 				Vec3d look = caster.getLookVec().scale(getProperty(THROW_VELOCITY).floatValue() * modifiers.get(WizardryItems.range_upgrade));
 				target.addVelocity(look.x, look.y, look.z);
-				if(caster instanceof EntityPlayer) caster.swingArm(caster.getActiveHand());
+				// No IntelliJ, it's not always false, that's not how polymorphism works
+				if(caster instanceof EntityPlayer) caster.swingArm(caster.getActiveHand() == null ? EnumHand.MAIN_HAND : caster.getActiveHand());
 				
 			}else{