Fixed weapon charging being able to shoot projectiles (#198).

Mirsario · Sep 7, 2023 · 228c478 · 228c478
1 parent 1f0d9e6
commit 228c478
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/Common/Charging/ItemPowerAttacks.cs b/Common/Charging/ItemPowerAttacks.cs
@@ -96,6 +96,8 @@ public override void Load()
 				*/
 			});
 		};
+
+		On_Player.ItemCheck_OwnerOnlyCode += PlayertemCheckOwnerOnlyCodeDetour;
 	}
 
 	public override void HoldItem(Item item, Player player)
@@ -201,4 +203,13 @@ bool ICanDoMeleeDamage.CanDoMeleeDamage(Item item, Player player)
 
 	bool? ICanTurnDuringItemUse.CanTurnDuringItemUse(Item item, Player player)
 		=> IsCharging ? true : null;
+
+	private static void PlayertemCheckOwnerOnlyCodeDetour(On_Player.orig_ItemCheck_OwnerOnlyCode orig, Player player, ref Player.ItemCheckContext context, Item sItem, int weaponDamage, Microsoft.Xna.Framework.Rectangle heldItemFrame)
+	{
+		if (player.HeldItem is { IsAir: false } item && item.TryGetGlobalItem(out ItemPowerAttacks powerAttacks) && powerAttacks.IsCharging) {
+			return;
+		}
+
+		orig(player, ref context, sItem, weaponDamage, heldItemFrame);
+	}
 }