Lately fetch update job initiator (#163)

Author: DevNatan

bukkit-api/src/main/java/me/saiintbrisson/minecraft/BukkitViewComponentFactory.java

@@ -14,7 +14,6 @@
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -155,15 +154,8 @@ public Object createItem(@Nullable Object stack) {
             updateJob.cancel();
         }
 
-        final PlatformViewFrame<?, ?, ?> vf = findViewFrame(view);
-        if (vf == null)
-            throw new IllegalStateException(
-                    "Cannot schedule view update because there's no initiator to do this");
-
         view.setUpdateJob(
-                (updateJob =
-                        new BukkitViewUpdateJobImpl(
-                                (Plugin) vf.getOwner(), view, delayInTicks, intervalInTicks)));
+                (updateJob = new BukkitViewUpdateJobImpl(view, delayInTicks, intervalInTicks)));
         return updateJob;
     }
 

bukkit-api/src/main/java/me/saiintbrisson/minecraft/BukkitViewUpdateJobImpl.java

@@ -8,7 +8,6 @@
 /** Object used to store information about the state of a View's update interval. */
 final class BukkitViewUpdateJobImpl implements ViewUpdateJob, Runnable {
 
-    private final Plugin plugin;
     private final VirtualView view;
 
     @Getter private final long delay;
@@ -18,9 +17,7 @@ final class BukkitViewUpdateJobImpl implements ViewUpdateJob, Runnable {
     private boolean interrupted;
     private boolean started;
 
-    public BukkitViewUpdateJobImpl(
-            @NotNull Plugin plugin, @NotNull VirtualView view, long delay, long interval) {
-        this.plugin = plugin;
+    public BukkitViewUpdateJobImpl(@NotNull VirtualView view, long delay, long interval) {
         this.view = view;
         this.delay = delay;
         this.interval = interval;
@@ -39,7 +36,14 @@ public void start() {
             throw new IllegalStateException("Cannot start a interrupted view update job");
         if (task != null) throw new IllegalStateException("View update job already started");
 
+        final PlatformViewFrame<?, ?, ?> initiator = findViewFrame();
+        if (initiator == null)
+            throw new IllegalStateException(
+                    "Cannot schedule view update because there's no initiator to do this");
+
+        final Plugin plugin = (Plugin) initiator.getOwner();
         task = plugin.getServer().getScheduler().runTaskTimer(plugin, this, delay, interval);
+
         started = true;
     }
 
@@ -76,7 +80,11 @@ public void cancel() {
         started = false;
     }
 
-    void interrupt() {
-        this.interrupted = !interrupted;
+    private PlatformViewFrame<?, ?, ?> findViewFrame() {
+        if (view instanceof AbstractView) return ((AbstractView) view).getViewFrame();
+        if (view instanceof ViewContext) return ((ViewContext) view).getRoot().getViewFrame();
+
+        throw new IllegalArgumentException(
+                "Unable to find view frame on: " + view.getClass().getName());
     }
 }