minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-10-04 01:51:58 +02:00
Code Issues Releases Wiki Activity

Add the ability to disable teleport safety. Requested by a few people - teleport safety isn't always a good thing for some servers. Request is cancelled if not safe.

Browse Source
This commit is contained in:
Joshua Popoff
2013-12-12 22:03:15 -08:00
committed by Chris Ward
parent 5b212c3ffd
commit c56afbbb5c
25 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Essentials/src/com/earth2me/essentials/Teleport.java
View File

@@ -7,6 +7,7 @@ import java.util.Calendar;
import java.util.GregorianCalendar;
import net.ess3.api.IEssentials;
import net.ess3.api.IUser;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerRespawnEvent;
@@ -96,7 +97,15 @@ public class Teleport implements net.ess3.api.ITeleport
{
cancel(false);
teleportee.setLastLocation();
teleportee.getBase().teleport(LocationUtil.getSafeDestination(teleportee, target.getLocation()), cause);
Location safeDestination = LocationUtil.getSafeDestination(teleportee, target.getLocation());
if (ess.getSettings().isTeleportSafetyEnabled() || (target.getLocation().getBlockX() == safeDestination.getBlockX() && target.getLocation().getBlockY() == safeDestination.getBlockY() && target.getLocation().getBlockZ() == safeDestination.getBlockZ()))
{
teleportee.getBase().teleport(safeDestination, cause);
}
else
{
throw new Exception(_("unsafeTeleportDestination"));
}
}
//The teleportPlayer function is used when you want to normally teleportPlayer someone to a location or player.