Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2025-02-12 18:31:54 +01:00
Code Issues Projects Releases Wiki Activity

Minor fixes for announcer

Browse Source
This commit is contained in:
Daniel Saukel 2016-05-22 00:07:56 +02:00
parent 6e43b559b6
commit 39a9aa03ca
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcer.java
View File

@ -18,6 +18,7 @@ package io.github.dre2n.dungeonsxl.announcer;
import io.github.dre2n.commons.compatibility.CompatibilityHandler;
import io.github.dre2n.commons.util.guiutil.GUIUtil;
import io.github.dre2n.commons.util.messageutil.DefaultFontInfo;
import io.github.dre2n.commons.util.messageutil.MessageUtil;
import io.github.dre2n.dungeonsxl.DungeonsXL;
import io.github.dre2n.dungeonsxl.config.DMessages;
@ -26,6 +27,7 @@ import io.github.dre2n.dungeonsxl.event.dgroup.DGroupCreateEvent;
import io.github.dre2n.dungeonsxl.player.DGroup;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import net.md_5.bungee.api.chat.BaseComponent;
@ -251,7 +253,11 @@ public class Announcer {
slice.setClickEvent(onClick);
}
player.spigot().sendMessage(message);
TextComponent center = new TextComponent(DefaultFontInfo.center(BaseComponent.toPlainText(message)).replaceAll(BaseComponent.toPlainText(message), ""));
ArrayList<BaseComponent> toSend = new ArrayList<>(Arrays.asList(message));
toSend.add(0, center);
player.spigot().sendMessage(toSend.toArray(new BaseComponent[]{}));
} else {
MessageUtil.sendCenteredMessage(player, DMessages.ANNOUNCER_CMD.getMessage(getName().toUpperCase()));

2
src/main/java/io/github/dre2n/dungeonsxl/task/AnnouncerTask.java
View File

@ -46,7 +46,7 @@ public class AnnouncerTask extends BukkitRunnable {
List<String> worlds = announcer.getWorlds();
for (Player player : Bukkit.getOnlinePlayers()) {
if (!(plugin.getDPlayers().getByPlayer(player) instanceof DInstancePlayer)) {
if (worlds == null || worlds.contains(player.getWorld().getName())) {
if (worlds.isEmpty() || worlds.contains(player.getWorld().getName())) {
announcer.send(player);
}
}