more cleanups and tweaks

DenizenScript · Jan 31, 2022 · 4e0a653 · 4e0a653
1 parent 6869399
commit 4e0a653
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 73 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java b/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java
@@ -48,13 +48,13 @@ public void setRiptide(Entity entity, boolean state) {
         Debug.echoError("Riptide control not available on this server version.");
     }
 
-    public void setCarriedItem(Enderman entity, ItemStack item) {
-        entity.setCarriedMaterial(item.getData());
+    public int getBodyArrows(Entity entity) {
+        return ((LivingEntity) entity).getArrowsInBody();
     }
 
-    public abstract int getBodyArrows(Entity entity);
-
-    public abstract void setBodyArrows(Entity entity, int numArrows);
+    public void setBodyArrows(Entity entity, int numArrows) {
+        ((LivingEntity) entity).setArrowsInBody(numArrows);
+    }
 
     public abstract double getArrowDamage(Entity arrow);
 

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/midi/NoteBlockReceiver.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/midi/NoteBlockReceiver.java
@@ -11,7 +11,6 @@
 import org.bukkit.Sound;
 
 import javax.sound.midi.*;
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -30,14 +29,14 @@ public class NoteBlockReceiver implements Receiver, MetaEventListener {
     public Sequencer sequencer;
     public boolean closing = false;
 
-    public NoteBlockReceiver(List<EntityTag> entities, String _Key) throws InvalidMidiDataException, IOException {
+    public NoteBlockReceiver(List<EntityTag> entities, String _Key) {
         this.entities = entities;
         this.location = null;
         this.channelPatches = Maps.newHashMap();
         this.key = _Key;
     }
 
-    public NoteBlockReceiver(LocationTag location, String _Key) throws InvalidMidiDataException, IOException {
+    public NoteBlockReceiver(LocationTag location, String _Key) {
         this.entities = null;
         this.location = location;
         this.channelPatches = Maps.newHashMap();
@@ -150,17 +149,22 @@ public void close() {
         }
         closing = true;
         Bukkit.getScheduler().scheduleSyncDelayedTask(Denizen.getInstance(), () -> {
-            MidiUtil.receivers.remove(key);
-            if (sequencer != null) {
-                sequencer.close();
-                sequencer = null;
+            try {
+                MidiUtil.receivers.remove(key);
+                if (sequencer != null) {
+                    sequencer.close();
+                    sequencer = null;
+                }
+                channelPatches.clear();
+                channelPatches = null;
+                entities = null;
+                location = null;
+                if (onFinish != null) {
+                    onFinish.run();
+                }
             }
-            channelPatches.clear();
-            channelPatches = null;
-            entities = null;
-            location = null;
-            if (onFinish != null) {
-                onFinish.run();
+            catch (Throwable ex) {
+                Debug.echoError(ex);
             }
         }, 1);
     }

diff --git a/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/helpers/EntityHelperImpl.java b/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/helpers/EntityHelperImpl.java
@@ -159,11 +159,6 @@ public void setArrowDamage(Entity arrow, double damage) {
         ((Arrow) arrow).setDamage(damage);
     }
 
-    @Override
-    public void setCarriedItem(Enderman entity, ItemStack item) {
-        entity.setCarriedBlock(Bukkit.createBlockData(item.getType()));
-    }
-
     @Override
     public void setRiptide(Entity entity, boolean state) {
         ((CraftLivingEntity) entity).getHandle().q(state ? 0 : 1);

diff --git a/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/helpers/EntityHelperImpl.java b/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/helpers/EntityHelperImpl.java
@@ -158,11 +158,6 @@ public void setArrowDamage(Entity arrow, double damage) {
         ((Arrow) arrow).setDamage(damage);
     }
 
-    @Override
-    public void setCarriedItem(Enderman entity, ItemStack item) {
-        entity.setCarriedBlock(Bukkit.createBlockData(item.getType()));
-    }
-
     @Override
     public void setRiptide(Entity entity, boolean state) {
         ((CraftLivingEntity) entity).getHandle().r(state ? 0 : 1);

diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/EntityHelperImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/EntityHelperImpl.java
@@ -158,26 +158,11 @@ public void setArrowDamage(Entity arrow, double damage) {
         ((Arrow) arrow).setDamage(damage);
     }
 
-    @Override
-    public void setCarriedItem(Enderman entity, ItemStack item) {
-        entity.setCarriedBlock(Bukkit.createBlockData(item.getType()));
-    }
-
     @Override
     public void setRiptide(Entity entity, boolean state) {
         ((CraftLivingEntity) entity).getHandle().r(state ? 0 : 1);
     }
 
-    @Override
-    public int getBodyArrows(Entity entity) {
-        return ((CraftLivingEntity) entity).getHandle().getArrowCount();
-    }
-
-    @Override
-    public void setBodyArrows(Entity entity, int numArrows) {
-        ((CraftLivingEntity) entity).getHandle().setArrowCount(numArrows);
-    }
-
     @Override
     public Entity getFishHook(PlayerFishEvent event) {
         return event.getHook();

diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/helpers/EntityHelperImpl.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/helpers/EntityHelperImpl.java
@@ -196,26 +196,11 @@ public void setArrowDamage(Entity arrow, double damage) {
         ((Arrow) arrow).setDamage(damage);
     }
 
-    @Override
-    public void setCarriedItem(Enderman entity, ItemStack item) {
-        entity.setCarriedBlock(Bukkit.createBlockData(item.getType()));
-    }
-
     @Override
     public void setRiptide(Entity entity, boolean state) {
         ((CraftLivingEntity) entity).getHandle().startAutoSpinAttack(state ? 0 : 1);
     }
 
-    @Override
-    public int getBodyArrows(Entity entity) {
-        return ((CraftLivingEntity) entity).getHandle().getArrowCount();
-    }
-
-    @Override
-    public void setBodyArrows(Entity entity, int numArrows) {
-        ((CraftLivingEntity) entity).getHandle().setArrowCount(numArrows);
-    }
-
     @Override
     public Entity getFishHook(PlayerFishEvent event) {
         return event.getHook();

diff --git a/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/EntityHelperImpl.java b/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/EntityHelperImpl.java
@@ -196,26 +196,11 @@ public void setArrowDamage(Entity arrow, double damage) {
         ((Arrow) arrow).setDamage(damage);
     }
 
-    @Override
-    public void setCarriedItem(Enderman entity, ItemStack item) {
-        entity.setCarriedBlock(Bukkit.createBlockData(item.getType()));
-    }
-
     @Override
     public void setRiptide(Entity entity, boolean state) {
         ((CraftLivingEntity) entity).getHandle().startAutoSpinAttack(state ? 0 : 1);
     }
 
-    @Override
-    public int getBodyArrows(Entity entity) {
-        return ((CraftLivingEntity) entity).getHandle().getArrowCount();
-    }
-
-    @Override
-    public void setBodyArrows(Entity entity, int numArrows) {
-        ((CraftLivingEntity) entity).getHandle().setArrowCount(numArrows);
-    }
-
     @Override
     public Entity getFishHook(PlayerFishEvent event) {
         return event.getHook();