Merge pull request #31 from beholderface/main

Make special casting things cast from the off hand if it is empty and the main hand is not
miyucomics · Nov 5, 2024 · 409c4c0 · 409c4c0
2 parents 0ce699e + d3bafa8
commit 409c4c0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/miyucomics/hexical/utils/CastingUtils.kt b/src/main/java/miyucomics/hexical/utils/CastingUtils.kt
@@ -72,7 +72,12 @@ object CastingUtils {
 
 	@JvmStatic
 	fun castSpecial(world: ServerWorld, user: ServerPlayerEntity, hex: List<Iota>, source: SpecializedSource, finale: Boolean): CastingHarness {
-		val harness = IXplatAbstractions.INSTANCE.getHarness(user, Hand.MAIN_HAND)
+		val hand = if(!user.getStackInHand(Hand.MAIN_HAND).isEmpty && user.getStackInHand(Hand.OFF_HAND).isEmpty){
+			Hand.OFF_HAND
+		} else {
+			Hand.MAIN_HAND
+		}
+		val harness = IXplatAbstractions.INSTANCE.getHarness(user, hand)
 		(harness.ctx as CastingContextMinterface).setSpecializedSource(source)
 		(harness.ctx as CastingContextMinterface).setFinale(finale)
 		harness.stack = mutableListOf()