Redstoner/Modules
Archived
0
Fork 0
Code Activity

removed redundant code, updated to new broadcast

Browse Source
This commit is contained in:
Pepich
2017-10-16 21:27:11 +02:00
parent 21ae1371d3
commit aac7578c08
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/redstoner/modules/chatgroups/Chatgroups.java
View File

@@ -6,7 +6,6 @@ import java.util.Iterator;
import java.util.UUID; import java.util.UUID;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@@ -27,12 +26,14 @@ import com.redstoner.misc.Utils;
import com.redstoner.modules.Module; import com.redstoner.modules.Module;
import com.redstoner.modules.socialspy.Socialspy; import com.redstoner.modules.socialspy.Socialspy;
import net.nemez.chatapi.ChatAPI;
/** The ChatGroups module. Allows people to have private sub-chats that can be accessed via a single char prefix or a toggle. /** The ChatGroups module. Allows people to have private sub-chats that can be accessed via a single char prefix or a toggle.
* *
* @author Pepich */ * @author Pepich */
@Commands(CommandHolderType.String) @Commands(CommandHolderType.String)
@AutoRegisterListener @AutoRegisterListener
@Version(major = 4, minor = 0, revision = 0, compatible = 4) @Version(major = 4, minor = 0, revision = 1, compatible = 4)
public class Chatgroups implements Module, Listener public class Chatgroups implements Module, Listener
{ {
private static final char defaultKey = ':'; private static final char defaultKey = ':';
@@ -56,7 +57,7 @@ public class Chatgroups implements Module, Listener
keys = new JSONObject(); keys = new JSONObject();
saveKeys(); saveKeys();
} }
cgtoggled = new ArrayList<UUID>(); cgtoggled = new ArrayList<>();
return true; return true;
} }
@@ -122,9 +123,9 @@ public class Chatgroups implements Module, Listener
getLogger().message(sender, true, "You are not in a chatgroup!"); getLogger().message(sender, true, "You are not in a chatgroup!");
else else
{ {
ArrayList<String> message = new ArrayList<String>(); ArrayList<String> message = new ArrayList<>();
message.add("§7Your current chatgroup is: §6" + group); message.add("§7Your current chatgroup is: §6" + group);
ArrayList<String> players = new ArrayList<String>(); ArrayList<String> players = new ArrayList<>();
Iterator<String> iter = groups.keySet().iterator(); Iterator<String> iter = groups.keySet().iterator();
while (iter.hasNext()) while (iter.hasNext())
{ {
@@ -356,6 +357,7 @@ public class Chatgroups implements Module, Listener
{ {
String name = Utils.getName(sender); String name = Utils.getName(sender);
String group = getGroup(sender); String group = getGroup(sender);
message = ChatAPI.colorify(null, message);
Utils.broadcast("§8[§bCG§8] §9", name + "§8: §6" + message, new BroadcastFilter() Utils.broadcast("§8[§bCG§8] §9", name + "§8: §6" + message, new BroadcastFilter()
{ {
@Override @Override
@@ -391,7 +393,7 @@ public class Chatgroups implements Module, Listener
* @param message the message to be sent. */ * @param message the message to be sent. */
private void sendToGroup(String group, String message) private void sendToGroup(String group, String message)
{ {
message = ChatColor.translateAlternateColorCodes('&', message); message = ChatAPI.colorify(null, message);
Utils.broadcast(null, message, new BroadcastFilter() Utils.broadcast(null, message, new BroadcastFilter()
{ {
@Override @Override