Redstoner/Modules
Archived
0
Fork 0
Code Activity

Removed redundant code

Browse Source
This commit is contained in:
Pepich
2017-10-16 21:04:22 +02:00
parent 4be7a4de22
commit e8400e9da9
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/redstoner/modules/message/Message.java
View File

@@ -17,13 +17,11 @@ 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;
@Commands(CommandHolderType.File) @Commands(CommandHolderType.File)
@Version(major = 4, minor = 0, revision = 0, compatible = 4) @Version(major = 4, minor = 0, revision = 1, compatible = 4)
public class Message implements Module public class Message implements Module
{ {
HashMap<CommandSender, CommandSender> replyTargets = new HashMap<CommandSender, CommandSender>(); HashMap<CommandSender, CommandSender> replyTargets = new HashMap<>();
@Command(hook = "message", async = AsyncType.ALWAYS) @Command(hook = "message", async = AsyncType.ALWAYS)
public boolean message(CommandSender sender, String target, String message) public boolean message(CommandSender sender, String target, String message)
@@ -40,7 +38,6 @@ public class Message implements Module
} }
else else
{ {
message = ChatAPI.colorify(sender, message);
if (ModuleLoader.getModule("Socialspy") != null) if (ModuleLoader.getModule("Socialspy") != null)
Socialspy.spyBroadcast(sender, p, message, "/m", new BroadcastFilter() Socialspy.spyBroadcast(sender, p, message, "/m", new BroadcastFilter()
{ {
@@ -50,7 +47,7 @@ public class Message implements Module
return !(recipient.equals(sender) || recipient.equals(p)); return !(recipient.equals(sender) || recipient.equals(p));
} }
}); });
net.nemez.chatapi.click.Message m = new net.nemez.chatapi.click.Message(sender, null); net.nemez.chatapi.click.Message m = new net.nemez.chatapi.click.Message(sender, null);
m.appendText("&6[&cme &6-> " + Utils.getName(p) + "&6] " + "§f" + message); m.appendText("&6[&cme &6-> " + Utils.getName(p) + "&6] " + "§f" + message);
m.send(); m.send();
@@ -76,7 +73,6 @@ public class Message implements Module
} }
else else
{ {
message = ChatAPI.colorify(sender, message);
if (ModuleLoader.getModule("Socialspy") != null) if (ModuleLoader.getModule("Socialspy") != null)
Socialspy.spyBroadcast(sender, target, message, "/r", new BroadcastFilter() Socialspy.spyBroadcast(sender, target, message, "/r", new BroadcastFilter()
{ {
@@ -86,7 +82,7 @@ public class Message implements Module
return !(recipient.equals(sender) || recipient.equals(target)); return !(recipient.equals(sender) || recipient.equals(target));
} }
}); });
net.nemez.chatapi.click.Message m = new net.nemez.chatapi.click.Message(sender, null); net.nemez.chatapi.click.Message m = new net.nemez.chatapi.click.Message(sender, null);
m.appendText("&6[&cme &6-> " + Utils.getName(target) + "&6] " + "§f" + message); m.appendText("&6[&cme &6-> " + Utils.getName(target) + "&6] " + "§f" + message);
m.send(); m.send();