Fix fishes event for pre-1.13 versions

Yay for arbitrary API changes breaking things
DenizenScript · Oct 10, 2018 · 8f423cb · 8f423cb
1 parent b29edc2
commit 8f423cb
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 1 deletion.
diff --git a/nmshandler/src/main/java/net/aufdemrand/denizen/nms/interfaces/EntityHelper.java b/nmshandler/src/main/java/net/aufdemrand/denizen/nms/interfaces/EntityHelper.java
@@ -10,13 +10,16 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.Vector;
 
 import java.util.UUID;
 
 public interface EntityHelper {
 
+    Entity getFishHook(PlayerFishEvent event);
+
     void forceInteraction(Player player, Location location);
 
     Entity getEntity(World world, UUID uuid);

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerFishesScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerFishesScriptEvent.java
@@ -2,6 +2,7 @@
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.events.BukkitScriptEvent;
+import net.aufdemrand.denizen.nms.NMSHandler;
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dItem;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
@@ -138,7 +139,7 @@ public void onPlayerFishes(PlayerFishEvent event) {
         if (dEntity.isNPC(event.getPlayer())) {
             return;
         }
-        Entity hookEntity = event.getHook();
+        Entity hookEntity = NMSHandler.getInstance().getEntityHelper().getFishHook(event);
         dEntity.rememberEntity(hookEntity);
         hook = new dEntity(hookEntity);
         state = new Element(event.getState().toString());

diff --git a/v1_10_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_10_R1.java b/v1_10_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_10_R1.java
@@ -19,6 +19,7 @@
 import org.bukkit.entity.*;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.entity.EntityTargetEvent;
+import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
@@ -36,6 +37,11 @@ public class EntityHelper_v1_10_R1 implements EntityHelper {
         General Entity Methods
      */
 
+    @Override
+    public Entity getFishHook(PlayerFishEvent event) {
+        return event.getHook();
+    }
+
     @Override
     public void forceInteraction(Player player, Location location) {
         CraftPlayer craftPlayer = (CraftPlayer) player;

diff --git a/v1_11_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_11_R1.java b/v1_11_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_11_R1.java
@@ -19,6 +19,7 @@
 import org.bukkit.entity.*;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.entity.EntityTargetEvent;
+import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
@@ -36,6 +37,11 @@ public class EntityHelper_v1_11_R1 implements EntityHelper {
         General Entity Methods
      */
 
+    @Override
+    public Entity getFishHook(PlayerFishEvent event) {
+        return event.getHook();
+    }
+
     @Override
     public void forceInteraction(Player player, Location location) {
         CraftPlayer craftPlayer = (CraftPlayer) player;

diff --git a/v1_12_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_12_R1.java b/v1_12_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_12_R1.java
@@ -22,6 +22,7 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityTargetEvent;
+import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
@@ -41,6 +42,11 @@ public class EntityHelper_v1_12_R1 implements EntityHelper {
         General Entity Methods
      */
 
+    @Override
+    public Entity getFishHook(PlayerFishEvent event) {
+        return event.getHook();
+    }
+
     @Override
     public void forceInteraction(Player player, Location location) {
         CraftPlayer craftPlayer = (CraftPlayer) player;

diff --git a/v1_13_R2/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_13_R2.java b/v1_13_R2/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_13_R2.java
@@ -23,6 +23,7 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityTargetEvent;
+import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
@@ -42,6 +43,11 @@ public class EntityHelper_v1_13_R2 implements EntityHelper {
         General Entity Methods
      */
 
+    @Override
+    public Entity getFishHook(PlayerFishEvent event) {
+        return event.getHook();
+    }
+
     @Override
     public void forceInteraction(Player player, Location location) {
         CraftPlayer craftPlayer = (CraftPlayer) player;

diff --git a/v1_8_R3/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_8_R3.java b/v1_8_R3/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_8_R3.java
@@ -20,6 +20,7 @@
 import org.bukkit.entity.*;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.entity.EntityTargetEvent;
+import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
@@ -37,6 +38,11 @@ public class EntityHelper_v1_8_R3 implements EntityHelper {
         General Entity Methods
      */
 
+    @Override
+    public Entity getFishHook(PlayerFishEvent event) {
+        return event.getHook();
+    }
+
     @Override
     public void forceInteraction(Player player, Location location) {
         CraftPlayer craftPlayer = (CraftPlayer) player;

diff --git a/v1_9_R2/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_9_R2.java b/v1_9_R2/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_9_R2.java
@@ -19,6 +19,7 @@
 import org.bukkit.entity.*;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.entity.EntityTargetEvent;
+import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
@@ -36,6 +37,11 @@ public class EntityHelper_v1_9_R2 implements EntityHelper {
         General Entity Methods
      */
 
+    @Override
+    public Entity getFishHook(PlayerFishEvent event) {
+        return event.getHook();
+    }
+
     @Override
     public void forceInteraction(Player player, Location location) {
         CraftPlayer craftPlayer = (CraftPlayer) player;