From b263c92c130cfe2b9ec7ce65f50735d2539ff2d6 Mon Sep 17 00:00:00 2001 From: BONNe Date: Sat, 1 Oct 2022 01:50:32 +0300 Subject: [PATCH] Use Spigot only events. (#2029) I missed that EntityMoveEvent is only Paper. Interesting why Spigot does not have such... Fixes #2028 --- .../teleports/EntityTeleportListener.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/world/bentobox/bentobox/listeners/teleports/EntityTeleportListener.java b/src/main/java/world/bentobox/bentobox/listeners/teleports/EntityTeleportListener.java index 6461065ec..f03ade703 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/teleports/EntityTeleportListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/teleports/EntityTeleportListener.java @@ -18,12 +18,12 @@ 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.entity.EntityPortalExitEvent; import org.bukkit.util.Vector; import org.eclipse.jdt.annotation.NonNull; import java.util.UUID; -import io.papermc.paper.event.entity.EntityMoveEvent; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.lists.Flags; import world.bentobox.bentobox.util.Util; @@ -170,20 +170,16 @@ public class EntityTeleportListener extends AbstractTeleportListener implements * @param event entity move event */ @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onEntityExitPortal(EntityMoveEvent event) + public void onEntityExitPortal(EntityPortalExitEvent event) { if (!this.inPortal.contains(event.getEntity().getUniqueId())) { return; } - if (!event.getTo().getBlock().getType().equals(Material.NETHER_PORTAL)) - { - // Player exits nether portal. - this.inPortal.remove(event.getEntity().getUniqueId()); - this.inTeleport.remove(event.getEntity().getUniqueId()); - this.teleportOrigin.remove(event.getEntity().getUniqueId()); - } + this.inPortal.remove(event.getEntity().getUniqueId()); + this.inTeleport.remove(event.getEntity().getUniqueId()); + this.teleportOrigin.remove(event.getEntity().getUniqueId()); }