Merge remote-tracking branch 'master/master'

AzisabaNetwork · Aug 5, 2024 · 8f3066e · 8f3066e
2 parents e612525 + b206bb2
commit 8f3066e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/net/azisaba/leoncsaddon/CustomProjectileSizeListener.java b/src/main/java/net/azisaba/leoncsaddon/CustomProjectileSizeListener.java
@@ -15,7 +15,7 @@
 import java.lang.reflect.Field;
 
 public class CustomProjectileSizeListener implements Listener {
-
+/*
     @EventHandler
     public void onShoot(WeaponShootEvent e){
         WeaponConfigData data = LeonCSAddon.INSTANCE.getWeaponConfig().getWeaponConfigData(e.getWeaponTitle());
@@ -33,5 +33,5 @@ public void onShoot(WeaponShootEvent e){
             }
         }
     }
-
+*/
 }
diff --git a/src/main/java/net/azisaba/leoncsaddon/WeaponShootLimitListener.java b/src/main/java/net/azisaba/leoncsaddon/WeaponShootLimitListener.java
@@ -26,6 +26,9 @@ public void onPreShoot(WeaponPrepareShootEvent e){
                     if(otherData != null && otherData.isMain){
                         if(data.requirements != null && otherData.type != null && Collections.disjoint(data.requirements, otherData.type)){
                             e.setCancelled(true);
+                        }else {
+                            e.setCancelled(false);
+                            return;
                         }
                     }
                 }