Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cancel teleport on damage and death.

Browse Source
This commit is contained in:
Olof Larsson 2014-08-16 10:18:27 +02:00
parent 7fc9b09279
commit d1b6388c33
1 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/com/massivecraft/massivecore/teleport/EngineScheduledTeleport.java
View File

@ -3,8 +3,12 @@ package com.massivecraft.massivecore.teleport;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
@ -85,17 +89,13 @@ public class EngineScheduledTeleport extends EngineAbstract
} }
// -------------------------------------------- // // -------------------------------------------- //
// LISTENER // LISTENER: CANCEL TELEPORT
// -------------------------------------------- // // -------------------------------------------- //
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void cancelTeleport(Player player)
public void onPlayerMoved(PlayerMoveEvent event)
{ {
// If the player moved from one block to another ... // If there there is a ScheduledTeleport ...
if (MUtil.isSameBlock(event.getFrom(), event.getTo())) return; ScheduledTeleport scheduledTeleport = teleporteeIdToScheduledTeleport.get(IdUtil.getId(player));
// ... and there is a ScheduledTeleport ...
ScheduledTeleport scheduledTeleport = teleporteeIdToScheduledTeleport.get(IdUtil.getId(event.getPlayer()));
if (scheduledTeleport == null) return; if (scheduledTeleport == null) return;
// ... unschedule it ... // ... unschedule it ...
@ -105,4 +105,38 @@ public class EngineScheduledTeleport extends EngineAbstract
Mixin.msgOne(scheduledTeleport.getTeleporteeId(), "<rose>Cancelled <i>teleport to <h>"+scheduledTeleport.getDestinationDesc()+"<i>."); Mixin.msgOne(scheduledTeleport.getTeleporteeId(), "<rose>Cancelled <i>teleport to <h>"+scheduledTeleport.getDestinationDesc()+"<i>.");
} }
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void cancelTeleport(PlayerMoveEvent event)
{
// If the player moved from one block to another ...
if (MUtil.isSameBlock(event.getFrom(), event.getTo())) return;
// ... cancel teleport!
this.cancelTeleport(event.getPlayer());
}
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void cancelTeleport(EntityDamageEvent event)
{
// If an entity takes damage ...
Entity entity = event.getEntity();
// ... and that entity is a player ...
if(!(entity instanceof Player)) return;
Player player = (Player)entity;
// ... cancel teleport!
this.cancelTeleport(player);
}
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void cancelTeleport(PlayerDeathEvent event)
{
// If a player dies ...
Player player = event.getEntity();
// ... cancel teleport!
this.cancelTeleport(player);
}
} }