TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-22 08:25:12 +00:00
Code Issues Projects Releases Wiki Activity

Add passenger dismounting for teleports (#3069)

Browse source 
Add passenger dismounting for teleports
This commit is contained in:
Josh Roy 2020-03-31 21:04:44 -04:00 committed by GitHub
parent c007700c59
commit 810689c037
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/ISettings.java
View file

@ -119,6 +119,8 @@ public interface ISettings extends IConf {
boolean isForceDisableTeleportSafety();
boolean isTeleportPassengerDismount();
double getTeleportCooldown();
double getTeleportDelay();

5
Essentials/src/com/earth2me/essentials/Settings.java
View file

@ -157,6 +157,11 @@ public class Settings implements net.ess3.api.ISettings {
return forceDisableTeleportSafety;
}
@Override
public boolean isTeleportPassengerDismount() {
return config.getBoolean("teleport-passenger-dismount", true);
}
@Override
public double getTeleportDelay() {
return config.getDouble("teleport-delay", 0);

10
Essentials/src/com/earth2me/essentials/Teleport.java
View file

@ -10,6 +10,7 @@ import net.ess3.api.events.UserWarpEvent;
import net.ess3.api.events.UserTeleportEvent;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerRespawnEvent;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@ -131,6 +132,15 @@ public class Teleport implements ITeleport {
teleportee.setLastLocation();
if (!teleportee.getBase().getPassengers().isEmpty()) {
if (!ess.getSettings().isTeleportPassengerDismount()) {
throw new Exception(tl("passengerTeleportFail"));
}
for (Entity entity : teleportee.getBase().getPassengers()) {
entity.leaveVehicle();
}
}
if (LocationUtil.isBlockUnsafeForUser(teleportee, loc.getWorld(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())) {
if (ess.getSettings().isTeleportSafetyEnabled()) {
if (ess.getSettings().isForceDisableTeleportSafety()) {

5
Essentials/src/config.yml
View file

@ -78,6 +78,11 @@ teleport-safety: true
# teleport-safety and this option need to be set to true to force teleportation to dangerous locations.
force-disable-teleport-safety: false
# If a player has any passengers, the teleport will fail. Should their passengers be dismounted before they are teleported?
# If this is set to true, Essentials will dismount the player's passengers before teleporting.
# If this is set to false, attempted teleports will be canceled with a warning.
teleport-passenger-dismount: true
# The delay, in seconds, required between /home, /tp, etc.
teleport-cooldown: 0

1
Essentials/src/messages.properties
View file

@ -381,6 +381,7 @@ openingDisposal=\u00a76Opening disposal menu...
orderBalances=\u00a76Ordering balances of\u00a7c {0} \u00a76users, please wait...
oversizedMute=§4You may not mute a player for this period of time.
oversizedTempban=\u00a74You may not ban a player for this period of time.
passengerTeleportFail=\u00a74You cannot be teleported while carrying passengers.
payConfirmToggleOff=\u00a76You will no longer be prompted to confirm payments.
payConfirmToggleOn=\u00a76You will now be prompted to confirm payments.
payMustBePositive=\u00a74Amount to pay must be positive.