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

Fixes the behavior of backwards portals

Browse Source 
Fixes a bug where backwards portals only rotated the player
Fixes the rotation being wrong when teleporting from a backwards portal
This commit is contained in:
Kristian Knarvik
2021-10-08 18:59:14 +02:00
parent fff4d8d78b
commit 0c29788a31
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/net/knarcraft/stargate/portal/Portal.java
View File

@ -484,7 +484,7 @@ public class Portal {
Location exit = getExit(player, traveller);
//Rotate the player to face out from the portal
adjustRotation(exit, origin);
adjustRotation(exit);
//Call the StargatePortalEvent to allow plugins to change destination
if (!origin.equals(this)) {
@ -514,11 +514,10 @@ public class Portal {
* Adjusts the rotation of the player to face out from the portal
*
* @param exit <p>The location the player will exit from</p>
* @param origin <p>The portal the player entered from</p>
*/
private void adjustRotation(Location exit, Portal origin) {
private void adjustRotation(Location exit) {
int adjust = 0;
if (options.isBackwards() != origin.options.isBackwards()) {
if (options.isBackwards()) {
adjust = 180;
}
float newYaw = (this.getYaw() + adjust) % 360;
@ -530,9 +529,8 @@ public class Portal {
* Teleports a vehicle to this portal
*
* @param vehicle <p>The vehicle to teleport</p>
* @param origin <p>The portal the vehicle entered</p>
*/
public void teleport(final Vehicle vehicle, Portal origin) {
public void teleport(final Vehicle vehicle) {
Location traveller = vehicle.getLocation();
Location exit = getExit(vehicle, traveller);
@ -544,7 +542,7 @@ public class Portal {
//Get new velocity
Vector newVelocityDirection = DirectionHelper.getDirectionVectorFromYaw(this.getYaw());
Vector newVelocity = newVelocityDirection.multiply(velocity);
adjustRotation(exit, origin);
adjustRotation(exit);
List<Entity> passengers = vehicle.getPassengers();
@ -632,11 +630,11 @@ public class Portal {
RelativeBlockVector relativeExit = gate.getLayout().getExit();
if (relativeExit != null) {
BlockLocation exit = getBlockAt(relativeExit);
float yaw = traveller.getYaw();
float portalYaw = this.getYaw();
if (options.isBackwards()) {
yaw += 180;
portalYaw += 180;
}
exitLocation = exit.getRelativeLocation(0D, 0D, 1, this.getYaw(), yaw);
exitLocation = exit.getRelativeLocation(0D, 0D, 1, portalYaw);
if (entity != null) {
double entitySize = EntityHelper.getEntityMaxSize(entity);