Merge pull request #18 from demkom58/1.17-update

1.17 update
demkom58 · Jun 26, 2021 · 6b5f804 · 6b5f804
2 parents 403a75e + 3500cb1
commit 6b5f804
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 pluginGroup = com.demkom58.divinedrop
 pluginDesc = Awesome removal of items from the ground
-pluginVersion = 2.7.2
+pluginVersion = 2.7.3
 url = https://www.spigotmc.org/members/98068/
diff --git a/src/main/java/com/demkom58/divinedrop/drop/ItemHandler.java b/src/main/java/com/demkom58/divinedrop/drop/ItemHandler.java
@@ -15,9 +15,11 @@
 import org.bukkit.metadata.MetadataValue;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
 
 public class ItemHandler {
 
@@ -30,6 +32,11 @@ public class ItemHandler {
 
     private final DivineTimer itemTickTimer;
 
+    private List<Item> toRemove = new ArrayList<>();
+    private List<Item> shadow = new ArrayList<>();
+    private final ReentrantLock lockRemove = new ReentrantLock();
+    private final ReentrantLock lockShadowing = new ReentrantLock();
+
     public ItemHandler(@NotNull final DivineDrop plugin,
                        @NotNull final VersionManager versionManager,
                        @NotNull final ConfigData data) {
@@ -40,7 +47,19 @@ public ItemHandler(@NotNull final DivineDrop plugin,
         this.registry = new ItemRegistry(plugin, data, this);
 
         final Set<Item> timedItems = registry.getTimedItems();
-        this.itemTickTimer = new DivineTimer(plugin, () -> timedItems.forEach(this::itemTick));
+        this.itemTickTimer = new DivineTimer(plugin, () -> {
+            timedItems.forEach(this::itemTick);
+            Bukkit.getScheduler().runTask(plugin, () -> {
+                lockRemove.lock();
+                List<Item> items = toRemove;
+                this.toRemove = shadow;
+                this.shadow = items;
+                lockRemove.unlock();
+
+                items.forEach(Item::remove);
+                items.clear();
+            });
+        });
     }
 
     public void reload() {
@@ -116,7 +135,10 @@ public void tickTimer(@NotNull final Item item,
     public void updateTimedItem(@NotNull final Item item,
                                 @NotNull final DataContainer container) {
         if (container.getTimer() <= 0) {
-            item.remove();
+            lockShadowing.lock();
+            toRemove.add(item);
+            lockShadowing.unlock();
+
             registry.getTimedItems().remove(item);
         }