fix shoot command bug with script arg and no shooter input

DenizenScript · Feb 12, 2021 · f7d997b · f7d997b
1 parent ea2fe09
commit f7d997b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java
@@ -25,6 +25,7 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Projectile;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.ProjectileHitEvent;
@@ -235,8 +236,10 @@ public void execute(final ScriptEntry scriptEntry) {
                 entity.spawnAt(originLocation);
             }
             entityList.addObject(entity);
-            if (entity.isProjectile() && (shooter != null || originEntity != null)) {
-                entity.setShooter(shooter != null ? shooter : originEntity);
+            if (entity.isProjectile()) {
+                if (shooter != null || originEntity != null) {
+                    entity.setShooter(shooter != null ? shooter : originEntity);
+                }
                 if (script != null) {
                     arrows.put(entity.getUUID(), null);
                 }
@@ -362,7 +365,7 @@ else if (lastLocation != null && lastVelocity != null && !(lastEntity.getBukkitE
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void projectileHit(ProjectileHitEvent event) {
         if (!arrows.containsKey(event.getEntity().getUniqueId())) {
             return;