Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-10 04:41:04 +01:00
Code Issues Projects Releases Wiki Activity

If no direction on sign, use sign rotation

Browse Source
This commit is contained in:
Sn0wStorm 2016-06-01 21:35:23 +02:00
parent 479935f007
commit dd8d3b1d0f
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/io/github/dre2n/dungeonsxl/sign/TeleportSign.java
View File

@ -22,9 +22,7 @@ public class TeleportSign extends DSign {
String lines[] = getSign().getLines();
for (int i = 1; i <= 2; i++) {
if (!lines[i].isEmpty()) {
if (lines[i].equalsIgnoreCase("N") || lines[i].equalsIgnoreCase("E") || lines[i].equalsIgnoreCase("S") || lines[i].equalsIgnoreCase("W")) {
continue;
} else {
if (letterToYaw(lines[i].charAt(0)) == -1) {
String[] loc = lines[i].split(",");
if (loc.length != 3) {
return false;
@ -45,17 +43,13 @@ public class TeleportSign extends DSign {
@Override
public void onInit() {
location = getSign().getLocation().add(0.5, 0, 0.5);
location.setYaw(letterToYaw(((org.bukkit.material.Sign) getSign().getData()).getFacing().getOppositeFace().name().charAt(0)));
String lines[] = getSign().getLines();
for (int i = 1; i <= 2; i++) {
if (!lines[i].isEmpty()) {
if (lines[i].equalsIgnoreCase("S")) {
location.setYaw(0);
} else if (lines[i].equalsIgnoreCase("W")) {
location.setYaw(90);
} else if (lines[i].equalsIgnoreCase("N")) {
location.setYaw(180);
} else if (lines[i].equalsIgnoreCase("E")) {
location.setYaw(-90);
int yaw = letterToYaw(lines[i].charAt(0));
if (yaw != -1) {
location.setYaw(yaw);
} else {
String[] loc = lines[i].split(",");
if (loc.length == 3) {
@ -106,4 +100,25 @@ public class TeleportSign extends DSign {
public DSignType getType() {
return type;
}
public static int letterToYaw(char c) {
switch (c) {
case 'S':
case 's':
return 0;
case 'W':
case 'w':
return 90;
case 'N':
case 'n':
return 180;
case 'E':
case 'e':
case 'O':
case 'o':
return -90;
default:
return -1;
}
}
}