Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2025-02-20 06:11:30 +01:00
Code Issues Projects Releases Wiki Activity

Sound sign compatibility fix

Browse Source
This commit is contained in:
Daniel Saukel 2018-04-26 23:57:59 +02:00
parent ac788515db
commit 6282deaf3c
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/io/github/dre2n/dungeonsxl/sign/message/SoundMessageSign.java
View File

@ -16,6 +16,8 @@
*/ */
package io.github.dre2n.dungeonsxl.sign.message; package io.github.dre2n.dungeonsxl.sign.message;
import de.erethon.commons.compatibility.CompatibilityHandler;
import de.erethon.commons.compatibility.Internals;
import de.erethon.commons.misc.EnumUtil; import de.erethon.commons.misc.EnumUtil;
import de.erethon.commons.misc.NumberUtil; import de.erethon.commons.misc.NumberUtil;
import io.github.dre2n.dungeonsxl.sign.DSign; import io.github.dre2n.dungeonsxl.sign.DSign;
@ -62,13 +64,16 @@ public class SoundMessageSign extends DSign {
sound = lines[1]; sound = lines[1];
if (!lines[2].isEmpty()) { if (!lines[2].isEmpty()) {
String[] args = lines[2].split(","); String[] args = lines[2].split(",");
if (args.length >= 1) { if (args.length >= 1 && args.length != 2 && Internals.andHigher(Internals.v1_11_R1).contains(CompatibilityHandler.getInstance().getInternals())) {
category = EnumUtil.getEnumIgnoreCase(SoundCategory.class, args[0]); category = EnumUtil.getEnumIgnoreCase(SoundCategory.class, args[0]);
if (category == null) { if (category == null) {
category = SoundCategory.MASTER; category = SoundCategory.MASTER;
} }
} }
if (args.length == 3) { if (args.length == 2) {
volume = (float) NumberUtil.parseDouble(args[0], 5.0);
pitch = (float) NumberUtil.parseDouble(args[1], 1.0);
} else if (args.length == 3) {
volume = (float) NumberUtil.parseDouble(args[1], 5.0); volume = (float) NumberUtil.parseDouble(args[1], 5.0);
pitch = (float) NumberUtil.parseDouble(args[2], 1.0); pitch = (float) NumberUtil.parseDouble(args[2], 1.0);
} }
@ -95,7 +100,11 @@ public class SoundMessageSign extends DSign {
if (initialized) { if (initialized) {
if (!done.contains(player)) { if (!done.contains(player)) {
done.add(player); done.add(player);
player.playSound(getSign().getLocation(), sound, category, volume, pitch); if (Internals.andHigher(Internals.v1_11_R1).contains(CompatibilityHandler.getInstance().getInternals())) {
player.playSound(getSign().getLocation(), sound, category, volume, pitch);
} else {
player.playSound(getSign().getLocation(), sound, volume, pitch);
}
} }
if (done.size() >= getGameWorld().getWorld().getPlayers().size()) { if (done.size() >= getGameWorld().getWorld().getPlayers().size()) {