Redstoner/Modules
Archived
0
Fork 0
Code Activity

Made name detection use Utils function

Browse Source
This commit is contained in:
Pepich
2017-05-11 16:28:45 +02:00
parent 9ba244da6e
commit 15ee01792d
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ import com.redstoner.modules.message.Message;
* *
* @author Pepich */ * @author Pepich */
@AutoRegisterListener @AutoRegisterListener
@Version(major = 2, minor = 0, revision = 5, compatible = 2) @Version(major = 2, minor = 0, revision = 6, compatible = 2)
public class Chatgroups implements Module, Listener public class Chatgroups implements Module, Listener
{ {
private static final char defaultKey = ':'; private static final char defaultKey = ':';
@@ -222,11 +222,7 @@ public class Chatgroups implements Module, Listener
Utils.sendErrorMessage(sender, null, "You were not in a chatgroup!"); Utils.sendErrorMessage(sender, null, "You were not in a chatgroup!");
return true; return true;
} }
String name; String name = Utils.getName(sender);
if (sender instanceof Player)
name = ((Player) sender).getDisplayName();
else
name = sender.getName();
sendToGroup(group, "&9" + name + " &7left the group!"); sendToGroup(group, "&9" + name + " &7left the group!");
Utils.sendMessage(sender, null, "Successfully removed you from your group!"); Utils.sendMessage(sender, null, "Successfully removed you from your group!");
if (sender instanceof Player) if (sender instanceof Player)
@@ -242,11 +238,7 @@ public class Chatgroups implements Module, Listener
@Command(hook = "cgjoin") @Command(hook = "cgjoin")
public boolean cgJoin(CommandSender sender, String name) public boolean cgJoin(CommandSender sender, String name)
{ {
String pname; String pname = Utils.getName(sender);
if (sender instanceof Player)
pname = ((Player) sender).getDisplayName();
else
pname = sender.getName();
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);
@@ -351,11 +343,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)
{ {
String name; String name = Utils.getName(sender);
if (sender instanceof Player)
name = ((Player) sender).getDisplayName();
else
name = sender.getName();
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()
{ {