From 9951701ded301c47bcc203c12001ef866204b78c Mon Sep 17 00:00:00 2001 From: Virizion <9b717b9d4e5f09e89fa3@gmail.com> Date: Thu, 3 Dec 2015 19:51:11 -0500 Subject: [PATCH] Added a FixSpawnFacing flag to Game which controls whether or not GameTeam will modify the yaw of a spawn when returning it. --- .../src/nautilus/game/arcade/game/Game.java | 2 ++ .../src/nautilus/game/arcade/game/GameTeam.java | 15 +++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java index 27f429305..7616b98ad 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java @@ -302,6 +302,8 @@ public abstract class Game implements Listener public boolean DeadBodiesDeath = true; public int DeadBodiesExpire = -1; + public boolean FixSpawnFacing = true; + private IPacketHandler _useEntityPacketHandler; private int _deadBodyCount; private NautHashMap _deadBodies = new NautHashMap(); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java index 6527ec0ea..ddbd4f68c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java @@ -113,12 +113,15 @@ public class GameTeam private Location fixFacing(Location loc) { - float yaw = UtilAlg.GetYaw(UtilAlg.getTrajectory2d(loc, Host.GetSpectatorLocation())); - - yaw = (int) (yaw / 90) * 90; - - loc = loc.clone(); - loc.setYaw(yaw); + if (Host.FixSpawnFacing) + { + float yaw = UtilAlg.GetYaw(UtilAlg.getTrajectory2d(loc, Host.GetSpectatorLocation())); + + yaw = (int) (yaw / 90) * 90; + + loc = loc.clone(); + loc.setYaw(yaw); + } return loc; }