From b7162823e8a10d76b113a0d8642e2f864bc8aa1e Mon Sep 17 00:00:00 2001 From: RoboMWM Date: Sun, 2 Oct 2016 01:59:30 -0700 Subject: [PATCH] Allow portal rescue feature to work regardless if claims are enabled in the world Seems like this check was intended for the "portalCreationRequiresPermission," so when he threw in the portal trap check, he didn't account for this check possibly breaking in worlds where claims aren't enabled. --- src/me/ryanhamshire/GriefPrevention/GriefPrevention.java | 6 +++--- src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java index b4c5029..14e78b3 100644 --- a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java +++ b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java @@ -3658,8 +3658,8 @@ public class GriefPrevention extends JavaPlugin //Cancel existing rescue task if (portalReturnTaskMap.containsKey(player.getUniqueId())) - portalReturnTaskMap.get(player.getUniqueId()).cancel(); - - portalReturnTaskMap.put(player.getUniqueId(), task); + portalReturnTaskMap.put(player.getUniqueId(), task).cancel(); + else + portalReturnTaskMap.put(player.getUniqueId(), task); } } diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java index 7f35173..18406fa 100644 --- a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java @@ -974,14 +974,14 @@ class PlayerEventHandler implements Listener //if the player isn't going anywhere, take no action if(event.getTo() == null || event.getTo().getWorld() == null) return; - //don't track in worlds where claims are not enabled - if(!GriefPrevention.instance.claimsEnabledForWorld(event.getTo().getWorld())) return; - Player player = event.getPlayer(); if(event.getCause() == TeleportCause.NETHER_PORTAL) { //FEATURE: when players get trapped in a nether portal, send them back through to the other side instance.startRescueTask(player); + + //don't track in worlds where claims are not enabled + if(!GriefPrevention.instance.claimsEnabledForWorld(event.getTo().getWorld())) return; //FEATURE: if the player teleporting doesn't have permission to build a nether portal and none already exists at the destination, cancel the teleportation if(GriefPrevention.instance.config_claims_portalsRequirePermission)