Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-09-20 19:11:13 +02:00
Code Issues Projects Releases Wiki Activity

Force eject players from vehicles if the get too far.

Browse Source 
Fixes WORLDGUARD-3936.
This commit is contained in:
wizjany 2019-04-17 21:24:10 -04:00
parent ef2783f30a
commit c3675a10a2
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardVehicleListener.java
View File

@ -20,6 +20,7 @@
package com.sk89q.worldguard.bukkit.listener; package com.sk89q.worldguard.bukkit.listener;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldguard.LocalPlayer; import com.sk89q.worldguard.LocalPlayer;
import com.sk89q.worldguard.WorldGuard; import com.sk89q.worldguard.WorldGuard;
import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
@ -62,8 +63,8 @@ public void registerEvents() {
public void onVehicleMove(VehicleMoveEvent event) { public void onVehicleMove(VehicleMoveEvent event) {
Vehicle vehicle = event.getVehicle(); Vehicle vehicle = event.getVehicle();
if (vehicle.getPassengers().isEmpty()) return; if (vehicle.getPassengers().isEmpty()) return;
List<LocalPlayer> playerPassengers = List<Player> playerPassengers = vehicle.getPassengers().stream()
vehicle.getPassengers().stream().filter(ent -> ent instanceof Player).map(ent -> plugin.wrapPlayer((Player) ent)).collect(Collectors.toList()); .filter(ent -> ent instanceof Player).map(ent -> (Player) ent).collect(Collectors.toList());
if (playerPassengers.isEmpty()) { if (playerPassengers.isEmpty()) {
return; return;
} }
@ -74,11 +75,17 @@ public void onVehicleMove(VehicleMoveEvent event) {
if (wcfg.useRegions) { if (wcfg.useRegions) {
// Did we move a block? // Did we move a block?
if (Locations.isDifferentBlock(BukkitAdapter.adapt(event.getFrom()), BukkitAdapter.adapt(event.getTo()))) { if (Locations.isDifferentBlock(BukkitAdapter.adapt(event.getFrom()), BukkitAdapter.adapt(event.getTo()))) {
for (LocalPlayer player : playerPassengers) { for (Player player : playerPassengers) {
if (null != WorldGuard.getInstance().getPlatform().getSessionManager().get(player) LocalPlayer localPlayer = plugin.wrapPlayer(player);
.testMoveTo(player, BukkitAdapter.adapt(event.getTo()), MoveType.RIDE)) { Location lastValid;
if ((lastValid = WorldGuard.getInstance().getPlatform().getSessionManager().get(localPlayer)
.testMoveTo(localPlayer, BukkitAdapter.adapt(event.getTo()), MoveType.RIDE)) != null) {
vehicle.setVelocity(new Vector(0, 0, 0)); vehicle.setVelocity(new Vector(0, 0, 0));
vehicle.teleport(event.getFrom()); vehicle.teleport(event.getFrom());
if (Locations.isDifferentBlock(lastValid, BukkitAdapter.adapt(event.getFrom()))) {
Vector dir = player.getLocation().getDirection();
player.teleport(BukkitAdapter.adapt(lastValid).setDirection(dir));
}
return; return;
} }
} }