Upstream
/
bentobox
mirror of https://github.com/BentoBoxWorld/BentoBox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Revert "WIP prevent repeated teleports in portals"" 

This reverts commit e0e1f2878c.
This commit is contained in:
tastybento 2021-06-27 16:53:08 -07:00
parent e0e1f2878c
commit 17d9271369
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/world/bentobox/bentobox/listeners/PortalTeleportationListener.java
View File

@ -20,8 +20,8 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityPortalEnterEvent;
import org.bukkit.event.entity.EntityPortalEvent;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerPortalEvent;
import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.bukkit.util.Vector;
import org.eclipse.jdt.annotation.NonNull;
@ -50,11 +50,17 @@ public class PortalTeleportationListener implements Listener {
inPortal = new HashSet<>();
}
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onPlayerTeleport(PlayerTeleportEvent e) {
// Remove player from inPortal after a teleport
inPortal.remove(e.getPlayer().getUniqueId());
public void onPlayerMove(PlayerMoveEvent e) {
if (inPortal.removeIf(u -> u.equals(e.getPlayer().getUniqueId())
&& e.getTo().getBlockX() != e.getFrom().getBlockX()
&& e.getTo().getBlockZ() != e.getFrom().getBlockZ()
&& !e.getPlayer().getLocation().getBlock().getType().equals(Material.NETHER_PORTAL)
&& !e.getPlayer().getLocation().getBlock().getType().equals(Material.NETHER_PORTAL))) {
plugin.logDebug(e.getTo().getBlockX() + "!=" + e.getFrom().getBlockX() + " " + e.getTo().getBlockZ() + "!=" + e.getFrom().getBlockZ());
plugin.logDebug(e.getPlayer().getName() + " removed from inPortal " + e.getPlayer().getLocation().getBlock().getType());
}
}
/**
@ -70,21 +76,18 @@ public class PortalTeleportationListener implements Listener {
Material type = e.getLocation().getBlock().getType();
UUID uuid = entity.getUniqueId();
if (inPortal.contains(uuid) || !plugin.getIWM().inWorld(Util.getWorld(e.getLocation().getWorld()))) {
plugin.logDebug(e.getEntity().getName() + " is inPortal");
return;
}
if (!Bukkit.getAllowNether() && type.equals(Material.NETHER_PORTAL)) {
plugin.logDebug(e.getEntity().getName() + " is added to inPortal");
inPortal.add(uuid);
// Schedule a time
Bukkit.getScheduler().runTaskLater(plugin, () -> {
// Check again if still in portal
if (entity.getLocation().getBlock().getType().equals(Material.NETHER_PORTAL)) {
PlayerPortalEvent en = new PlayerPortalEvent((Player)entity, e.getLocation(), null, TeleportCause.NETHER_PORTAL, 0, false, 0);
if (!this.onIslandPortal(en)) {
// Failed
inPortal.remove(uuid);
}
} else {
inPortal.remove(uuid);
onIslandPortal(en);
}
}, 40);
return;
@ -132,6 +135,7 @@ public class PortalTeleportationListener implements Listener {
/**
* Handles nether or end portals
* @param e - event
* @return true if portal happened, false if not
*/
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public boolean onIslandPortal(PlayerPortalEvent e) {
@ -198,7 +202,6 @@ public class PortalTeleportationListener implements Listener {
&& e.getIsland().filter(i -> !hasPartnerIsland(i, env)).map(i -> {
// No nether island present so paste the default one
e.setCancelled(true);
inPortal.remove(e.getEntity().getUniqueId());
pasteNewIsland((Player)e.getEntity(), e.getTo(), i, env);
return true;
}).orElse(false)) {
@ -207,7 +210,6 @@ public class PortalTeleportationListener implements Listener {
}
if (e.getCanCreatePortal()) {
// Let the server teleport
inPortal.remove(e.getEntity().getUniqueId());
return true;
}
if (env.equals(Environment.THE_END)) {
@ -232,7 +234,6 @@ public class PortalTeleportationListener implements Listener {
.location(e.getTo())
.portal()
.thenRun(() -> {
inPortal.remove(e.getEntity().getUniqueId());
e.getEntity().setVelocity(new Vector(0,0,0));
e.getEntity().setFallDistance(0);
})
@ -361,7 +362,6 @@ public class PortalTeleportationListener implements Listener {
e.setTo(e.getFrom().toVector().toLocation(overWorld));
// Find distance from edge of island's protection
plugin.getIslands().getIslandAt(e.getFrom()).ifPresent(i -> setSeachRadius(e, i));
inPortal.remove(e.getEntity().getUniqueId());
return;
}
// Custom portals
@ -374,7 +374,6 @@ public class PortalTeleportationListener implements Listener {
.entity(e.getEntity())
.location(to)
.portal()
.thenRun(() -> inPortal.remove(e.getEntity().getUniqueId()))
.build();
}
@ -412,7 +411,7 @@ public class PortalTeleportationListener implements Listener {
// From standard nether or end
else if (e.getEntity() instanceof Player){
e.setCancelled(true);
plugin.getIslands().homeTeleportAsync(overWorld, (Player)e.getEntity()).thenAccept(b -> inPortal.remove(e.getEntity().getUniqueId()));
plugin.getIslands().homeTeleportAsync(overWorld, (Player)e.getEntity());
}
}