Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add work-around for nonsensical teleport events from Spigot. #152

Closed
wants to merge 2 commits into from
Closed

Add work-around for nonsensical teleport events from Spigot. #152

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f8923f
Add work-around for nonsensical teleport events from Spigot.
totemo Aug 9, 2019
d685a2c
Fix missed player reference. Clarity for cause checks.
totemo Aug 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 34 additions & 2 deletions src/main/java/com/wimbli/WorldBorder/WBListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
package com.wimbli.WorldBorder;

import java.util.List;

import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.bukkit.event.player.PlayerPortalEvent;
import org.bukkit.event.world.ChunkLoadEvent;
import org.bukkit.event.world.ChunkUnloadEvent;
import org.bukkit.metadata.FixedMetadataValue;
import org.bukkit.metadata.MetadataValue;
import org.bukkit.Location;
import org.bukkit.entity.Player;


public class WBListener implements Listener
{
final static String PORTAL_EVENT_META = "WorldBorder-portal";

@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onPlayerTeleport(PlayerTeleportEvent event)
{
Expand All @@ -23,10 +32,33 @@ public void onPlayerTeleport(PlayerTeleportEvent event)
if (Config.Debug())
Config.log("Teleport cause: " + event.getCause().toString());

Location newLoc = BorderCheckTask.checkPlayer(event.getPlayer(), event.getTo(), true, true);
// Ignore nonsensical teleport events.
// https://hub.spigotmc.org/jira/browse/SPIGOT-5252
Player player = event.getPlayer();
TeleportCause cause = event.getCause();
if (cause == TeleportCause.NETHER_PORTAL || cause == TeleportCause.END_PORTAL) {
// Store event details of the original correct event. TeleportCause.UNKNOWN comes after.
player.setMetadata(PORTAL_EVENT_META, new FixedMetadataValue(WorldBorder.plugin, event));
Bukkit.getScheduler().runTaskLater(WorldBorder.plugin, () -> {
player.removeMetadata(PORTAL_EVENT_META, WorldBorder.plugin);
//WorldBorder.plugin.getLogger().info("Removed " + player.getName() + " portal meta.");
}, 0);
} else if (cause == TeleportCause.UNKNOWN) {
List<MetadataValue> metas = player.getMetadata(PORTAL_EVENT_META);
if (metas != null && !metas.isEmpty()) {
PlayerTeleportEvent savedEvent = (PlayerTeleportEvent) metas.get(0).value();
if (savedEvent.getFrom().getWorld().equals(event.getFrom().getWorld())) {
//WorldBorder.plugin.getLogger().info("Ignoring nonsensical teleport by " + player.getName() +
// " in " + savedEvent.getFrom().getWorld().getName() + ".");
return;
}
}
}

Location newLoc = BorderCheckTask.checkPlayer(player, event.getTo(), true, true);
if (newLoc != null)
{
if(event.getCause() == PlayerTeleportEvent.TeleportCause.ENDER_PEARL && Config.getDenyEnderpearl())
if(cause == PlayerTeleportEvent.TeleportCause.ENDER_PEARL && Config.getDenyEnderpearl())
{
event.setCancelled(true);
return;
Expand Down