Redstoner/Modules
Archived
0
Fork 0
Code Activity

Fixed coloring

Browse Source
This commit is contained in:
Pepich
2017-05-11 16:35:01 +02:00
parent e8f3853bd9
commit da7fab57cf
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ 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;
@@ -28,7 +29,7 @@ import com.redstoner.modules.message.Message;
* *
* @author Pepich */ * @author Pepich */
@AutoRegisterListener @AutoRegisterListener
@Version(major = 2, minor = 0, revision = 7, compatible = 2) @Version(major = 2, minor = 0, revision = 8, compatible = 2)
public class Chatgroups implements Module, Listener public class Chatgroups implements Module, Listener
{ {
private static final char defaultKey = ':'; private static final char defaultKey = ':';
@@ -242,8 +243,8 @@ public class Chatgroups implements Module, Listener
String group = getGroup(sender); String group = getGroup(sender);
sendToGroup(name, "&9" + pname + " &7joined the group!"); sendToGroup(name, "&9" + pname + " &7joined the group!");
setGroup(sender, name); setGroup(sender, name);
if (group != null) if (group != null && !group.equals(name))
sendToGroup(group, "&9" + pname + " &7joined the group!"); sendToGroup(group, "&9" + pname + " &7left the group!");
Utils.sendMessage(sender, null, "Successfully joined group §6" + name); Utils.sendMessage(sender, null, "Successfully joined group §6" + name);
return true; return true;
} }
@@ -343,6 +344,7 @@ public class Chatgroups implements Module, Listener
* @param message the message to be sent. */ * @param message the message to be sent. */
private void sendToGroup(CommandSender sender, String message) private void sendToGroup(CommandSender sender, String message)
{ {
message = Utils.colorify(message, sender);
String name = Utils.getName(sender); String name = Utils.getName(sender);
String group = getGroup(sender); String group = getGroup(sender);
Utils.broadcast("§8[§bCG§8] §9", name + "§8: §6" + message, new BroadcastFilter() Utils.broadcast("§8[§bCG§8] §9", name + "§8: §6" + message, new BroadcastFilter()
@@ -359,7 +361,7 @@ public class Chatgroups implements Module, Listener
}, '&'); }, '&');
if (ModuleLoader.getModule("Message") != null) if (ModuleLoader.getModule("Message") != null)
{ {
Message.spyBroadcast(sender, "&e" + group + " &a(cg)", message, "/cg", new BroadcastFilter() Message.spyBroadcast(sender, "§e" + group + " §a(cg)", message, "/cg", new BroadcastFilter()
{ {
@Override @Override
public boolean sendTo(CommandSender recipient) public boolean sendTo(CommandSender recipient)
@@ -380,6 +382,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);
Utils.broadcast(null, message, new BroadcastFilter() Utils.broadcast(null, message, new BroadcastFilter()
{ {
@Override @Override
@@ -391,10 +394,10 @@ public class Chatgroups implements Module, Listener
else else
return false; return false;
} }
}, '&'); });
if (ModuleLoader.getModule("Message") != null) if (ModuleLoader.getModule("Message") != null)
{ {
Message.spyBroadcast(Bukkit.getConsoleSender(), "&e" + group + " &a(cg)", message, "/cg", Message.spyBroadcast(Bukkit.getConsoleSender(), "§e" + group + " §a(cg)", message, "/cg",
new BroadcastFilter() new BroadcastFilter()
{ {
@Override @Override