Merge pull request #2771 from BentoBoxWorld/develop

Release 3.10.1

Author: tastybento

pom.xml

@@ -75,7 +75,7 @@
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>3.10.0</build.version>
+        <build.version>3.10.1</build.version>
         <sonar.organization>bentobox-world</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <server.jars>${project.basedir}/lib</server.jars>

src/main/java/world/bentobox/bentobox/listeners/teleports/AbstractTeleportListener.java

@@ -8,12 +8,12 @@
 
 
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -27,6 +27,7 @@
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.util.ExpiringSet;
 import world.bentobox.bentobox.util.Util;
 
 
@@ -42,8 +43,8 @@ public abstract class AbstractTeleportListener
     AbstractTeleportListener(@NonNull BentoBox bentoBox)
     {
         this.plugin = bentoBox;
-        this.inPortal = new HashSet<>();
-        this.inTeleport = new HashSet<>();
+        this.inPortal = new ExpiringSet<UUID>(10, TimeUnit.SECONDS);
+        this.inTeleport = new ExpiringSet<UUID>(10, TimeUnit.SECONDS);
         this.teleportOrigin = new HashMap<>();
     }
 
@@ -378,7 +379,7 @@ protected boolean isPastingMissingIslands(World overWorld)
     /**
      * Set of entities that currently is inside portal.
      */
-    protected final Set<UUID> inPortal;
+    protected final ExpiringSet<UUID> inPortal;
 
     /**
      * Map that links entities origin of teleportation. Used for respawning.

src/main/java/world/bentobox/bentobox/listeners/teleports/EntityTeleportListener.java

@@ -48,7 +48,6 @@ public EntityTeleportListener(@NonNull BentoBox bentoBox)
         super(bentoBox);
     }
 
-
     /**
      * This listener checks entity portal events and triggers appropriate methods to transfer
      * entities to the correct location in other dimension.
@@ -121,13 +120,10 @@ public void onEntityEnterPortal(EntityPortalEnterEvent event)
         Entity entity = event.getEntity();
         Material type = event.getLocation().getBlock().getType();
         UUID uuid = entity.getUniqueId();
-
-        if (this.inPortal.contains(uuid))
-        {
-            // Already in process.
+        if (entity.getPortalCooldown() > 0) {
             return;
         }
-
+        
         World fromWorld = event.getLocation().getWorld();
         World overWorld = Util.getWorld(fromWorld);
 
@@ -142,8 +138,6 @@ public void onEntityEnterPortal(EntityPortalEnterEvent event)
             // Teleportation is disabled. Cancel processing.
             return;
         }
-
-        this.inPortal.add(uuid);
         // Add original world for respawning.
         this.teleportOrigin.put(uuid, fromWorld);
 
@@ -176,12 +170,6 @@ public void onEntityEnterPortal(EntityPortalEnterEvent event)
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onEntityExitPortal(EntityPortalExitEvent event)
     {
-        if (!this.inPortal.contains(event.getEntity().getUniqueId()))
-        {
-            return;
-        }
-
-        this.inPortal.remove(event.getEntity().getUniqueId());
         this.inTeleport.remove(event.getEntity().getUniqueId());
         this.teleportOrigin.remove(event.getEntity().getUniqueId());
     }