优化代码

0XPYEX0 · Dec 21, 2022 · 95cbb33 · 95cbb33
1 parent 23558f7
commit 95cbb33
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/src/main/java/me/xpyex/plugin/xplib/bukkit/inventory/HandleMenu.java b/src/main/java/me/xpyex/plugin/xplib/bukkit/inventory/HandleMenu.java
@@ -14,6 +14,8 @@
 public class HandleMenu implements Listener {
     @EventHandler
     public void onClick(InventoryClickEvent event) {
+        if (!(event.getWhoClicked() instanceof Player)) return;
+
         Player whoClicked = (Player) event.getWhoClicked();
         Menu menu = Menu.getOpeningMenu(whoClicked);
         if (menu == null) {

diff --git a/src/main/java/me/xpyex/plugin/xplib/bukkit/inventory/InvSetter.java b/src/main/java/me/xpyex/plugin/xplib/bukkit/inventory/InvSetter.java
@@ -5,7 +5,6 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 
 public class InvSetter {
@@ -14,7 +13,7 @@ public class InvSetter {
     private final String[] pattern;
     private final Inventory inv;
 
-    public InvSetter(InventoryHolder who, String title, String... pattern) {
+    public InvSetter(String title, String... pattern) {
         if (pattern.length > 6) {
             throw new IllegalArgumentException("超出GUI最大限度");
         }
@@ -24,7 +23,7 @@ public InvSetter(InventoryHolder who, String title, String... pattern) {
             }
         }
         this.pattern = pattern;
-        inv = Bukkit.createInventory(who, pattern.length * 9, title);
+        inv = Bukkit.createInventory(null, pattern.length * 9, title);
     }
 
     public InvSetter setSign(String sign, ItemStack item) {

diff --git a/src/main/java/me/xpyex/plugin/xplib/bukkit/inventory/Menu.java b/src/main/java/me/xpyex/plugin/xplib/bukkit/inventory/Menu.java
@@ -19,6 +19,7 @@ public class Menu {
 
     public Menu(Player player) {
         this.player = player;
+        //
     }
 
     public Menu setPage(int page, InvSetter setter) {
@@ -33,7 +34,7 @@ public Menu setPage(int page, String title, int size) {
                 pattern.add("         ");
             }
         }
-        setters.put(page, new InvSetter(player, title, pattern.toArray(new String[0])).setSign(" ", Material.AIR));
+        setters.put(page, new InvSetter(title, pattern.toArray(new String[0])).setSign(" ", Material.AIR));
         return this;
     }
 

diff --git a/src/main/java/me/xpyex/plugin/xplib/bukkit/util/version/VersionUtil.java b/src/main/java/me/xpyex/plugin/xplib/bukkit/util/version/VersionUtil.java
@@ -6,6 +6,7 @@
 
 public class VersionUtil {
     private static final int MAIN_VERSION = Integer.parseInt(Bukkit.getBukkitVersion().split("\\.")[1]);
+    public static final Version VERSION = new Version(XPLib.getInstance().getDescription().getVersion());
 
     public static int getMainVersion() {
         return MAIN_VERSION;
@@ -18,7 +19,12 @@ public static String getServerVersion() {
     }
 
     public static boolean requireXPLib(Version version) {
-        return version.equals(new Version(XPLib.getInstance().getDescription().getVersion()));
+        return version.equals(VERSION);
+        //
+    }
+
+    public static Version getXPLibVersion() {
+        return VERSION;
         //
     }
 }