attempt to fix joestrhq#18 dupe bug

Author: joestr

pom.xml

@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>    
   <groupId>at.joestr</groupId>
   <artifactId>postbox</artifactId>
-  <version>1.2.3</version>
+  <version>1.2.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>PostBox</name>

src/main/java/at/joestr/postbox/PostBoxPlugin.java

@@ -52,6 +52,7 @@
 import org.apache.commons.lang3.tuple.Triple;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
+import org.bukkit.NamespacedKey;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.event.Listener;
@@ -65,6 +66,7 @@ public class PostBoxPlugin extends JavaPlugin implements Listener {
   private static final Logger LOG = Logger.getLogger(PostBoxPlugin.class.getName());
   public static PostBoxPlugin instance = null;
 
+  private NamespacedKey namespacedKey;
   private HashMap<String, TabExecutor> commandMap;
   private Updater updater;
   private LuckPerms luckPermsApi;
@@ -110,6 +112,8 @@ public void onEnable() {
           .getString(CurrentEntries.CONF_UPDATER_CLASSIFIER.toString()),
         Bukkit.getUpdateFolderFile());
 
+    this.namespacedKey = new NamespacedKey(instance, "PostBox_c765a011bcd709a9c8d417be90a7f090");
+
     this.commandMap.put("postbox", new CommandPostBox());
     this.commandMap.put("postbox-open", new CommandPostBoxOpen());
     this.commandMap.put("postbox-openother", new CommandPostBoxOpenOther());
@@ -219,4 +223,8 @@ public ProfileService getProfileService() {
   public ArrayList<Triple<UUID, Inventory, UUID>> getInventoryMappings() {
     return inventoryMappings;
   }
+
+  public NamespacedKey getNamespacedKey() {
+    return namespacedKey;
+  }
 }

src/main/java/at/joestr/postbox/commands/CommandPostBoxOpen.java

@@ -30,6 +30,7 @@
 import at.joestr.postbox.configuration.DatabaseModels.PostBoxModel;
 import at.joestr.postbox.configuration.LocaleHelper;
 import at.joestr.postbox.configuration.MessageHelper;
+import at.joestr.postbox.utils.PostBoxNamespacedKeyValues;
 import at.joestr.postbox.utils.PostBoxUtils;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -50,6 +51,7 @@
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataType;
 
 /**
  * @author joestr
@@ -178,6 +180,11 @@ public void run() {
                     );
 
                     localItemMeta.setLore(loreLines);
+                    localItemMeta.getPersistentDataContainer().set(
+                      PostBoxPlugin.getInstance().getNamespacedKey(),
+                      PersistentDataType.INTEGER,
+                      PostBoxNamespacedKeyValues.IS_POST_BOX_ITEM.ordinal()
+                    );
                   }
 
                   localItemStack.setItemMeta(localItemMeta);

src/main/java/at/joestr/postbox/commands/CommandPostBoxOpenOther.java

@@ -30,6 +30,7 @@
 import at.joestr.postbox.configuration.DatabaseModels.PostBoxModel;
 import at.joestr.postbox.configuration.LocaleHelper;
 import at.joestr.postbox.configuration.MessageHelper;
+import at.joestr.postbox.utils.PostBoxNamespacedKeyValues;
 import at.joestr.postbox.utils.PostBoxUtils;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -52,6 +53,7 @@
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataType;
 
 /**
  * @author joestr
@@ -207,6 +209,11 @@ public boolean onCommand(CommandSender sender, Command command, String string, S
                           );
 
                           localItemMeta.setLore(loreLines);
+                          localItemMeta.getPersistentDataContainer().set(
+                            PostBoxPlugin.getInstance().getNamespacedKey(),
+                            PersistentDataType.INTEGER,
+                            PostBoxNamespacedKeyValues.IS_POST_BOX_ITEM.ordinal()
+                          );
                         }
                         localItemStack.setItemMeta(localItemMeta);
                         inventory.setItem(inventoryItemCount++, localItemStack);

src/main/java/at/joestr/postbox/event/InventoryClickListener.java

@@ -55,7 +55,7 @@ public InventoryClickListener() {
   }
 
   // Highest Priority and ignore cancelled events
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
+  @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = false)
   public void Inventory(InventoryClickEvent event) {
     Player player = (Player) event.getWhoClicked();
     Locale locale = LocaleHelper.resolve(player.getLocale());

src/main/java/at/joestr/postbox/event/InventoryCloseListener.java

@@ -24,21 +24,39 @@
 package at.joestr.postbox.event;
 
 import at.joestr.postbox.PostBoxPlugin;
+import at.joestr.postbox.utils.PostBoxNamespacedKeyValues;
+import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
 
 /**
  * @author joestr
  */
 public class InventoryCloseListener implements Listener {
 
   // Highest Priority and ignore cancelled events
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
+  @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = false)
   public void handle(InventoryCloseEvent event) {
-    PostBoxPlugin.getInstance()
+    boolean wasRemovedFromPostBox = PostBoxPlugin.getInstance()
       .getInventoryMappings()
       .removeIf(mapping -> mapping.getLeft().equals(event.getPlayer().getUniqueId()));
+
+    if (wasRemovedFromPostBox) {
+      Bukkit.getScheduler().runTask(PostBoxPlugin.getInstance(), () -> {
+        for (ItemStack itemStack : event.getPlayer().getInventory().getContents()) {
+          PersistentDataContainer persistentDataContainer = itemStack.getItemMeta().getPersistentDataContainer();
+          if (!persistentDataContainer.isEmpty() && persistentDataContainer.has(PostBoxPlugin.getInstance().getNamespacedKey(), PersistentDataType.INTEGER)) {
+            if (persistentDataContainer.getOrDefault(PostBoxPlugin.getInstance().getNamespacedKey(), PersistentDataType.INTEGER, -1) == PostBoxNamespacedKeyValues.IS_POST_BOX_ITEM.ordinal()) {
+              event.getPlayer().getInventory().remove(itemStack);
+            }
+          }
+        }
+      });
+    }
   }
 }

src/main/java/at/joestr/postbox/utils/PostBoxNamespacedKeyValues.java

@@ -0,0 +1,32 @@
+//
+// MIT License
+//
+// Copyright (c) 2022 Joel Strasser
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+package at.joestr.postbox.utils;
+
+/**
+ *
+ * @author joestr
+ */
+public enum PostBoxNamespacedKeyValues {
+  IS_POST_BOX_ITEM
+}