Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-09-16 01:57:14 +02:00
Code Issues Projects Releases Wiki Activity

yaw null check

Browse Source
This commit is contained in:
Daniel Saukel 2019-06-16 06:09:33 +02:00
parent 209f8064de
commit 5a0723b145
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
core/src/main/java/de/erethon/dungeonsxl/sign/TeleportSign.java
View File

@ -52,25 +52,26 @@ public class TeleportSign extends LocationSign {
public void onInit() {
super.onInit();
for (int i = 1; i <= 2; i++) {
if (!lines[i].isEmpty()) {
int yaw = BlockUtil.lettersToYaw(lines[i]);
if (yaw != -1) {
location.setYaw(yaw);
} else {
String[] loc = lines[i].split(",");
if (loc.length == 3) {
double x = NumberUtil.parseDouble(loc[0]);
double y = NumberUtil.parseDouble(loc[1]);
double z = NumberUtil.parseDouble(loc[2]);
if (lines[i].isEmpty()) {
continue;
}
Integer yaw = BlockUtil.lettersToYaw(lines[i]);
if (yaw != null) {
location.setYaw(yaw);
} else {
String[] loc = lines[i].split(",");
if (loc.length == 3) {
double x = NumberUtil.parseDouble(loc[0]);
double y = NumberUtil.parseDouble(loc[1]);
double z = NumberUtil.parseDouble(loc[2]);
// If round number, add 0.5 to tp to middle of block
x = NumberUtil.parseInt(loc[0]) + 0.5;
z = NumberUtil.parseInt(loc[2]) + 0.5;
// If round number, add 0.5 to tp to middle of block
x = NumberUtil.parseInt(loc[0]) + 0.5;
z = NumberUtil.parseInt(loc[2]) + 0.5;
location.setX(x);
location.setY(y);
location.setZ(z);
}
location.setX(x);
location.setY(y);
location.setZ(z);
}
}
}