EpicKnarvik97/Stargate
EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 7 Pull Requests Projects 1 Releases 27 Wiki Activity

Fixes some rotation problems for teleported passengers

Browse Source
This commit is contained in:
Kristian Knarvik 2022-01-27 21:35:04 +01:00
parent bddf8c55d5
commit 1e06e0e01d
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/net/knarcraft/stargate/portal/teleporter/VehicleTeleporter.java
View File

@ -165,7 +165,7 @@ public class VehicleTeleporter extends EntityTeleporter {
private void teleportLivingVehicle(Location exit, List<Entity> passengers, Portal origin) { private void teleportLivingVehicle(Location exit, List<Entity> passengers, Portal origin) {
teleportingVehicle.eject(); teleportingVehicle.eject();
teleportingVehicle.teleport(exit); teleportingVehicle.teleport(exit);
handleVehiclePassengers(passengers, teleportingVehicle, 2, origin); handleVehiclePassengers(passengers, teleportingVehicle, 2, origin, exit.getDirection());
} }
/** /**
@ -194,19 +194,20 @@ public class VehicleTeleporter extends EntityTeleporter {
teleportingVehicle.remove(); teleportingVehicle.remove();
//Set rotation, add passengers and restore velocity //Set rotation, add passengers and restore velocity
newVehicle.setRotation(exit.getYaw(), exit.getPitch()); newVehicle.setRotation(exit.getYaw(), exit.getPitch());
handleVehiclePassengers(passengers, newVehicle, 1, origin); handleVehiclePassengers(passengers, newVehicle, 1, origin, exit.getDirection());
scheduler.scheduleSyncDelayedTask(Stargate.getInstance(), () -> newVehicle.setVelocity(newVelocity), 1); scheduler.scheduleSyncDelayedTask(Stargate.getInstance(), () -> newVehicle.setVelocity(newVelocity), 1);
} }
/** /**
* Ejects, teleports and adds all passengers to the target vehicle * Ejects, teleports and adds all passengers to the target vehicle
* *
* @param passengers <p>The passengers to handle</p> * @param passengers <p>The passengers to handle</p>
* @param vehicle <p>The vehicle the passengers should be put into</p> * @param vehicle <p>The vehicle the passengers should be put into</p>
* @param delay <p>The amount of milliseconds to wait before adding the vehicle passengers</p> * @param delay <p>The amount of milliseconds to wait before adding the vehicle passengers</p>
* @param origin <p>The portal the vehicle teleported from</p> * @param origin <p>The portal the vehicle teleported from</p>
* @param exitRotation <p>The rotation of any passengers exiting the stargate</p>
*/ */
private void handleVehiclePassengers(List<Entity> passengers, Vehicle vehicle, long delay, Portal origin) { private void handleVehiclePassengers(List<Entity> passengers, Vehicle vehicle, long delay, Portal origin, Vector exitRotation) {
for (Entity passenger : passengers) { for (Entity passenger : passengers) {
passenger.eject(); passenger.eject();
scheduler.scheduleSyncDelayedTask(Stargate.getInstance(), () -> { scheduler.scheduleSyncDelayedTask(Stargate.getInstance(), () -> {
@ -214,7 +215,7 @@ public class VehicleTeleporter extends EntityTeleporter {
//Teleport any creatures leashed by the player in a 15-block range //Teleport any creatures leashed by the player in a 15-block range
teleportLeashedCreatures(player, origin); teleportLeashedCreatures(player, origin);
} }
teleportAndAddPassenger(vehicle, passenger); teleportAndAddPassenger(vehicle, passenger, exitRotation);
}, delay); }, delay);
} }
} }
@ -227,9 +228,10 @@ public class VehicleTeleporter extends EntityTeleporter {
* *
* @param targetVehicle <p>The vehicle to add the passenger to</p> * @param targetVehicle <p>The vehicle to add the passenger to</p>
* @param passenger <p>The passenger to teleport and add</p> * @param passenger <p>The passenger to teleport and add</p>
* @param exitDirection <p>The direction of any passengers exiting the stargate</p>
*/ */
private void teleportAndAddPassenger(Vehicle targetVehicle, Entity passenger) { private void teleportAndAddPassenger(Vehicle targetVehicle, Entity passenger, Vector exitDirection) {
if (!passenger.teleport(targetVehicle.getLocation())) { if (!passenger.teleport(targetVehicle.getLocation().clone().setDirection(exitDirection))) {
Stargate.debug("handleVehiclePassengers", "Failed to teleport passenger"); Stargate.debug("handleVehiclePassengers", "Failed to teleport passenger");
} }
if (!targetVehicle.addPassenger(passenger)) { if (!targetVehicle.addPassenger(passenger)) {