Release 1.4.3 (#25)

* Version 1.4.3 * Remove sync chunk loading when twerking #24
BentoBoxWorld · Jul 17, 2021 · de62795 · de62795
1 parent 8bce29e
commit de62795
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -54,7 +54,7 @@
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>
         <!-- This allows to change between versions and snapshots. -->
-        <build.version>1.4.2</build.version>
+        <build.version>1.4.3</build.version>
         <build.number>-LOCAL</build.number>
     </properties>
 

diff --git a/src/main/java/world/bentobox/twerk/listeners/TreeGrowListener.java b/src/main/java/world/bentobox/twerk/listeners/TreeGrowListener.java
@@ -7,6 +7,7 @@
 import java.util.stream.Collectors;
 
 import org.bukkit.Bukkit;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Particle;
 import org.bukkit.Tag;
@@ -31,7 +32,7 @@ public class TreeGrowListener implements Listener {
     private TwerkingForTrees addon;
     private Map<Island, Integer> twerkCount;
     private Set<Island> isTwerking;
-    private Map<Block, Island> plantedTrees;
+    private Map<Location, Island> plantedTrees;
 
     public TreeGrowListener(@NonNull TwerkingForTrees addon) {
         this.addon = addon;
@@ -46,7 +47,8 @@ protected void runChecker() {
         Bukkit.getScheduler().runTaskTimer(addon.getPlugin(), () -> {
             isTwerking = twerkCount.entrySet().stream().filter(e -> e.getValue() > addon.getSettings().getMinimumTwerks()).map(Map.Entry::getKey).collect(Collectors.toSet());
             twerkCount.clear();
-            plantedTrees.keySet().removeIf(k -> !Tag.SAPLINGS.isTagged(k.getType()));
+            // Clear plantedTrees if no one on island is twerking
+            plantedTrees.values().removeIf(i -> !isTwerking.contains(i));
         }
         , 0L, 40L);
         // Every 20 seconds
@@ -56,7 +58,7 @@ protected void runChecker() {
         .stream()
         .filter(e -> isTwerking.contains(e.getValue()))
         .map(Map.Entry::getKey)
-        .forEach(b -> Util.getChunkAtAsync(b.getLocation()).thenRun(() -> growTree(b)))
+        .forEach(b -> Util.getChunkAtAsync(b).thenRun(() -> growTree(b.getBlock())))
         , 10L, 400L);
     }
 
@@ -119,7 +121,7 @@ private void getNearbySaplings(Player player, Island i) {
                 for (int z = player.getLocation().getBlockZ() - range ; z <= player.getLocation().getBlockZ() + range; z++) {
                     Block block = player.getWorld().getBlockAt(x, y, z);
                     if (Tag.SAPLINGS.isTagged(block.getType())) {
-                        plantedTrees.put(block, i);
+                        plantedTrees.put(block.getLocation(), i);
                     }
                 }
             }