From ccb944fb3038c0322d7c48f05ea480bd6f64ab57 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Fri, 13 Jan 2023 16:51:54 -0500
Subject: [PATCH] v2.0.0: stopped using xbow ability while buff is already
 present

---
 .../items/weapon/melee/Crossbow.java                      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Crossbow.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Crossbow.java
index d1c84ec57..c8c01e473 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Crossbow.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Crossbow.java
@@ -22,10 +22,13 @@
 package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee;
 
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
+import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
+import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
 
 public class Crossbow extends MeleeWeapon {
 	
@@ -47,6 +50,11 @@ public class Crossbow extends MeleeWeapon {
 
 	@Override
 	protected void duelistAbility(Hero hero, Integer target) {
+		if (hero.buff(ChargedShot.class) != null){
+			GLog.w(Messages.get(this, "ability_cant_use"));
+			return;
+		}
+
 		beforeAbilityUsed(hero);
 		Buff.affect(hero, ChargedShot.class);
 		hero.sprite.operate(hero.pos);