Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows

src/main/java/com/gmail/nossr50/util/TextComponentFactory.java

@@ -78,7 +78,7 @@ public class TextComponentFactory {
 
         wikiLinkComponent.hoverEvent(HoverEvent.showText(componentBuilder.build()));
 
-        mcMMO.getAudiences().audience(player).sendMessage(wikiLinkComponent, MessageType.SYSTEM);
+        mcMMO.getAudiences().player(player).sendMessage(wikiLinkComponent, MessageType.SYSTEM);
     }
 
     public static void sendPlayerUrlHeader(Player player) {
@@ -89,7 +89,7 @@ public class TextComponentFactory {
 
         TextComponent emptySpace = TextComponent.space();
 
-        mcMMO.getAudiences().audience(player).sendMessage(TextComponent.ofChildren(
+        mcMMO.getAudiences().player(player).sendMessage(TextComponent.ofChildren(
           prefix,
           getWebLinkTextComponent(McMMOWebLinks.WEBSITE),
           emptySpace,
@@ -113,7 +113,7 @@ public class TextComponentFactory {
         AtomicReference<Component> messageToSend = new AtomicReference<>();
         int newLineCount = 0; //Hacky solution to wordwrap problems
 
-        final Audience audience = mcMMO.getAudiences().audience(player);
+        final Audience audience = mcMMO.getAudiences().player(player);
         for (Component textComponent : textComponents) {
             //Don't send more than 3 subskills per line to avoid MOST wordwrap problems
             if(newLineCount > 2)

src/main/java/com/gmail/nossr50/util/player/NotificationManager.java

@@ -105,7 +105,7 @@ public class NotificationManager {
         if (customEvent.isCancelled())
             return;
 
-        final Audience audience = mcMMO.getAudiences().audience(player);
+        final Audience audience = mcMMO.getAudiences().player(player);
 
         //If the message is being sent to the action bar we need to check if the copy if a copy is sent to the chat system
         if(customEvent.getChatMessageType() == McMMOMessageType.ACTION_BAR)
@@ -165,8 +165,7 @@ public class NotificationManager {
             return;
 
         //CHAT MESSAGE
-
-        mcMMO.getAudiences().audience(mcMMOPlayer.getPlayer()).sendMessage(TextComponentFactory.getSubSkillUnlockedNotificationComponents(mmoPlayer.getPlayer(), subSkillType));
+        mcMMO.getAudiences().player(mmoPlayer.getPlayer()).sendMessage(TextComponentFactory.getSubSkillUnlockedNotificationComponents(mmoPlayer.getPlayer(), subSkillType));
 
         //Unlock Sound Effect
         SoundManager.sendCategorizedSound(mmoPlayer.getPlayer(), mmoPlayer.getPlayer().getLocation(), SoundType.SKILL_UNLOCKED, SoundCategory.MASTER);