Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2024-09-27 22:18:11 +02:00
Code Issues Projects Releases Wiki Activity

Fix for negative yaw values. v0.6 release.

Browse Source
This commit is contained in:
taoneill 2011-01-30 02:20:51 -05:00
parent bd472264e8
commit 9eec0b92e8
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
war/src/main/java/com/tommytony/war/Team.java
View File

@ -100,7 +100,12 @@ public class Team {
warzone.getWorld().getBlockAt(x-2, y-1, z-2).setType(material);
// Orientation
float yaw = teamSpawn.getYaw() % 360;
int yaw = 0;
if(teamSpawn.getYaw() >= 0){
yaw = (int)(teamSpawn.getYaw() % 360);
} else {
yaw = (int)(360 + (teamSpawn.getYaw() % 360));
}
BlockFace facing = null;
BlockFace opposite = null;
int signData = 0;

16
war/src/main/java/com/tommytony/war/mappers/WarzoneMapper.java
View File

@ -264,7 +264,13 @@ public class WarzoneMapper {
String teleportStr = "";
Location tele = warzone.getTeleport();
if(tele != null) {
teleportStr = tele.getBlockX() + "," + tele.getBlockY() + "," + tele.getBlockZ() + "," + (int)(tele.getYaw() % 360);
int intYaw = 0;
if(tele.getYaw() >= 0){
intYaw = (int)(tele.getYaw() % 360);
} else {
intYaw = (int)(360 + (tele.getYaw() % 360));
}
teleportStr = tele.getBlockX() + "," + tele.getBlockY() + "," + tele.getBlockZ() + "," + intYaw;
}
warzoneConfig.setString("teleport", teleportStr);
@ -273,7 +279,13 @@ public class WarzoneMapper {
List<Team> teams = warzone.getTeams();
for(Team team : teams) {
Location spawn = team.getTeamSpawn();
teamsStr += team.getName() + "," + spawn.getBlockX() + "," + spawn.getBlockY() + "," + spawn.getBlockZ() + "," + (int)spawn.getYaw() + ";";
int intYaw = 0;
if(spawn.getYaw() >= 0){
intYaw = (int)(spawn.getYaw() % 360);
} else {
intYaw = (int)(360 + (spawn.getYaw() % 360));
}
teamsStr += team.getName() + "," + spawn.getBlockX() + "," + spawn.getBlockY() + "," + spawn.getBlockZ() + "," + intYaw + ";";
}
warzoneConfig.setString("teams", teamsStr);