From c8b87fddd6acefa19155924233b027a547103f1c Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Tue, 30 Aug 2016 17:36:23 -0400 Subject: [PATCH] Fixed bug in message notification sound. --- .../mineverse/Aust1n46/chat/listeners/ChatListener.java | 5 +++-- MineverseChat/mineverse/Aust1n46/chat/utilities/Format.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java index 97d0de2..b0b5bd2 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java +++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java @@ -299,12 +299,13 @@ public class ChatListener implements Listener { p.getPlayer().sendMessage(send); mcp.getPlayer().sendMessage(echo); if(p.hasNotifications()) { - if(VersionHandler.is1_8()) { + if(VersionHandler.is1_8() || VersionHandler.is1_7_10() || VersionHandler.is1_7_2() || VersionHandler.is1_7_9()) { p.getPlayer().playSound(p.getPlayer().getLocation(), Sound.valueOf("LEVEL_UP"), 1, 0); } - if(VersionHandler.is1_9()) { + else { p.getPlayer().playSound(p.getPlayer().getLocation(), Sound.valueOf("ENTITY_PLAYER_LEVELUP"), 1, 0); } + p.getPlayer().playSound(p.getPlayer().getLocation(), Sound.valueOf("ENTITY_PLAYER_LEVELUP"), 1, 0); } p.setReplyPlayer(mcp.getUUID()); mcp.setReplyPlayer(p.getUUID()); diff --git a/MineverseChat/mineverse/Aust1n46/chat/utilities/Format.java b/MineverseChat/mineverse/Aust1n46/chat/utilities/Format.java index bf1e49a..8a1cc5b 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/utilities/Format.java +++ b/MineverseChat/mineverse/Aust1n46/chat/utilities/Format.java @@ -3,6 +3,7 @@ package mineverse.Aust1n46.chat.utilities; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.bukkit.Bukkit; import org.bukkit.ChatColor; import me.clip.placeholderapi.PlaceholderAPI; @@ -36,7 +37,7 @@ public class Format { } catch(Exception e) { if(plugin.getConfig().getString("loglevel", "info").equals("debug")) { - System.out.println("[" + plugin.getConfig().getString("pluginname", "MineverseChat") + "] Prefix and / or suffix don't exist, setting to nothing."); + Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Prefix and / or suffix don't exist, setting to nothing.")); } } String nickname = "";