TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-03 19:15:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix passenger check not working on versions below 1.11.2 (#3132)

Browse source
This commit is contained in:
Josh Roy 2020-04-04 11:48:21 -04:00 • committed by GitHub
parent b08d380643
commit 85a5e517c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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