Merge pull request #765 from ArikSquad/fix/view-events

fix: view events

Author: ItzKatze

type.generic/src/main/java/net/swofty/type/generic/gui/v2/event/ActionInventoryClose.java

@@ -15,6 +15,9 @@ public void onPlayerInventoryClose(InventoryCloseEvent event) {
         HypixelPlayer player = (HypixelPlayer) event.getPlayer();
         ViewNavigator.find(player).ifPresent(navigator -> {
             ViewSession<?> session = navigator.getCurrentSession();
+            if (session == null) {
+                return;
+            }
             if (event.getInventory() != session.inventory() || session.isSuppressCloseEvent()) {
                 session.setSuppressCloseEvent(false);
                 return;
@@ -23,4 +26,4 @@ public void onPlayerInventoryClose(InventoryCloseEvent event) {
         });
     }
 
-}
+}

type.generic/src/main/java/net/swofty/type/generic/gui/v2/event/ActionInventoryOpen.java

@@ -7,16 +7,23 @@
 import net.swofty.type.generic.event.HypixelEventClass;
 import net.swofty.type.generic.gui.v2.ViewNavigator;
 import net.swofty.type.generic.user.HypixelPlayer;
+import org.tinylog.Logger;
 
 public class ActionInventoryOpen implements HypixelEventClass {
 
     @HypixelEvent(node = EventNodes.INVENTORY, requireDataLoaded = false)
     public void onPlayerInventoryOpen(InventoryOpenEvent event) {
         MinecraftServer.getSchedulerManager().scheduleNextTick(() -> {
             HypixelPlayer player = (HypixelPlayer) event.getPlayer();
-            ViewNavigator.find(player).ifPresent(navigator -> navigator.getCurrentSession().onOpenEvent(event));
+            ViewNavigator.find(player).ifPresent(navigator -> {
+                if (navigator.getCurrentSession() == null) {
+                    Logger.warn("Current session is null for player {} when opening inventory, this should not happen.", player.getUsername());
+                    return;
+                }
+                navigator.getCurrentSession().onOpenEvent(event);
+            });
         });
 
     }
 
-}
+}

type.generic/src/main/java/net/swofty/type/generic/gui/v2/event/ActionInventoryPostClick.java

@@ -12,7 +12,12 @@ public class ActionInventoryPostClick implements HypixelEventClass {
     @HypixelEvent(node = EventNodes.INVENTORY, requireDataLoaded = false)
     public void onInventoryPostClick(InventoryClickEvent event) {
         HypixelPlayer player = (HypixelPlayer) event.getPlayer();
-        ViewNavigator.find(player).ifPresent(navigator -> navigator.getCurrentSession().onPostClickEvent(event));
+        ViewNavigator.find(player).ifPresent(navigator -> {
+            if (navigator.getCurrentSession() == null) {
+                return;
+            }
+            navigator.getCurrentSession().onPostClickEvent(event);
+        });
     }
 
-}
+}

type.generic/src/main/java/net/swofty/type/generic/gui/v2/event/ActionInventoryPreClick.java

@@ -13,8 +13,11 @@ public class ActionInventoryPreClick implements HypixelEventClass {
     public void onActionPlayerInventoryPreClick(InventoryPreClickEvent event) {
         HypixelPlayer player = (HypixelPlayer) event.getPlayer();
         ViewNavigator.find(player).ifPresent(navigator -> {
+            if (navigator.getCurrentSession() == null) {
+                return;
+            }
             navigator.getCurrentSession().onPreClickEvent(event);
         });
     }
 
-}
+}