Merge branch 'master' into copilot/suggest-use-q-to-unload-weapon

Author: Lorenzo0111

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>me.zombie_striker</groupId>
     <artifactId>QualityArmory</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
     <name>QualityArmory</name>
 
     <properties>
@@ -75,13 +75,13 @@
         <dependency>
             <groupId>com.github.cryptomorin</groupId>
             <artifactId>XSeries</artifactId>
-            <version>13.5.1</version>
+            <version>13.6.0</version>
         </dependency>
 
         <dependency>
             <groupId>de.tr7zw</groupId>
             <artifactId>item-nbt-api</artifactId>
-            <version>2.15.3</version>
+            <version>2.15.5</version>
         </dependency>
 
         <!-- WorldGuard Wrapper -->

src/main/java/me/zombie_striker/qg/QAMain.java

@@ -169,6 +169,7 @@ public class QAMain extends JavaPlugin {
     public static boolean preventHiddenPlayers = true;
     public static boolean anticheatFix = false;
     public static boolean preventGunsInHoppers = true;
+    public static int hitDistance = 5;
 
     public static String S_NOPERM = "&c You do not have permission to do that.";
 
@@ -868,6 +869,7 @@ public void reloadVals() {
 
         allowGunHitEntities = (boolean) a("allowGunHitEntities", true);
         preventHiddenPlayers = (boolean) a("preventHiddenPlayers", true);
+        hitDistance = (int) a("hitDistance", hitDistance);
 
         preventGunsInHoppers = (boolean) a("preventGunsInHoppers", true);
 

src/main/java/me/zombie_striker/qg/guns/Gun.java

@@ -912,7 +912,11 @@ private boolean onClick(final Player player, ItemStack usedItem, boolean fire) {
                     if (GunUtil.rapidfireshooters.containsKey(player.getUniqueId()))
                         GunUtil.rapidfireshooters.remove(player.getUniqueId()).cancel();
 
-                    player.playSound(player.getLocation(), WeaponSounds.OUT_OF_AMMO_CLICK.getSoundName(), 1f, 1f);
+                    try {
+                        player.getWorld().playSound(player.getLocation(), WeaponSounds.OUT_OF_AMMO_CLICK.getSoundName(), 1f, 1f);
+                    } catch (Exception | Error ignored) {
+                        player.playSound(player.getLocation(), WeaponSounds.OUT_OF_AMMO_CLICK.getSoundName(), 1f, 1f);
+                    }
 
                     if (QAMain.enableReloadWhenOutOfAmmo) {
                         if (offhand) {

src/main/java/me/zombie_striker/qg/listener/QAListener.java

@@ -77,7 +77,7 @@ public void onHit(EntityDamageByEntityEvent e) {
 					if (g == null || !d.getLocation().getWorld().equals(e.getEntity().getLocation().getWorld())) return;
 
 					double distance = d.getLocation().distance(e.getEntity().getLocation());
-					if (distance > 5) return;
+					if (distance >= QAMain.hitDistance) return;
 
 					ignoreClick.add(d.getUniqueId());
 

src/main/resources/changelog.txt

@@ -1,3 +1,8 @@
+2.1.1
+  - 1.21.11 support
+  - Made out of ammo sound public
+  - Fixed direct entities hit
+
 2.1.0
   - 1.21.10 support
   - Added new fully customizable menu

wiki/config/main.md

@@ -97,4 +97,5 @@ Below you can find a list of all the options that you can configure and their ex
 * **enable_lore_gun-bullets**: `false` - If `true`, displays the bullet amount in the item's lore text. This will make the gun go "up and down" when shooting.
 * **weaponSwitchDelay**: `0` - The delay in seconds before a player can fire after switching weapon. A value of `0` means no delay.
 * **DefaultResourcepack**: Defines the resource pack URLs. Refer to [ResourcePack Configuration](resourcepack.md) for more information.
-* **restoreOffHand**: `false` - If `true`, restores the off-hand item after iron sights are unaimed.
+* **restoreOffHand**: `false` - If `true`, restores the off-hand item after iron sights are unaimed.
+* **hitDistance**: `5` - The maximum distance (in blocks) at which a gun can register melee hits on entities when using the gun to hit directly.