From 632529d9b1ee13ca6c03979433b2a2df674aec5a Mon Sep 17 00:00:00 2001
From: CarmJos <KarmunJ@outlook.com>
Date: Sun, 13 Mar 2022 18:39:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scriptitems/command/ScriptItemsCommand.java      | 12 +++++++++---
 .../plugin/scriptitems/manager/ItemsManager.java     |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cc/carm/plugin/scriptitems/command/ScriptItemsCommand.java b/src/main/java/cc/carm/plugin/scriptitems/command/ScriptItemsCommand.java
index 9db9f7e..dbc3dfa 100644
--- a/src/main/java/cc/carm/plugin/scriptitems/command/ScriptItemsCommand.java
+++ b/src/main/java/cc/carm/plugin/scriptitems/command/ScriptItemsCommand.java
@@ -1,5 +1,6 @@
 package cc.carm.plugin.scriptitems.command;
 
+import cc.carm.plugin.scriptitems.Main;
 import cc.carm.plugin.scriptitems.ScriptItemsAPI;
 import cc.carm.plugin.scriptitems.configuration.PluginMessages;
 import cc.carm.plugin.scriptitems.item.ScriptConfiguration;
@@ -63,9 +64,14 @@ public class ScriptItemsCommand implements CommandExecutor, TabCompleter {
                     return true;
                 }
 
-                player.getInventory().setItemInMainHand(settings.applyItem(item.clone()));
-                PluginMessages.APPLIED.send(sender, item.getType().name(), settings.getName());
-
+                player.getInventory().setItemInMainHand(null);
+                ItemStack after = settings.applyItem(item.clone());
+                Main.getInstance().getScheduler().runLater(10L, () -> {
+                    if (player.isOnline()) {
+                        player.getInventory().setItemInMainHand(after);
+                        PluginMessages.APPLIED.send(sender, item.getType().name(), settings.getName());
+                    }
+                });
                 return true;
             } else if (aim.equalsIgnoreCase("give")) {
 
diff --git a/src/main/java/cc/carm/plugin/scriptitems/manager/ItemsManager.java b/src/main/java/cc/carm/plugin/scriptitems/manager/ItemsManager.java
index 6be2372..cbfd403 100644
--- a/src/main/java/cc/carm/plugin/scriptitems/manager/ItemsManager.java
+++ b/src/main/java/cc/carm/plugin/scriptitems/manager/ItemsManager.java
@@ -23,7 +23,7 @@ public class ItemsManager {
 
     private static final String FOLDER_NAME = "items";
 
-    public HashMap<String, ScriptConfiguration> items = new HashMap<>();
+    private HashMap<String, ScriptConfiguration> items = new HashMap<>();
 
     protected NamespacedKey idKey;
     protected NamespacedKey uuidKey;