Redstoner/Modules
Archived
0
Fork 0
Code Activity

Fixed Normal Chat

Browse Source
This commit is contained in:
minenash
2018-01-16 17:58:35 -05:00
parent bef6fa9308
commit 7064f8d3f4
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/redstoner/modules/datamanager/DataManager.java
View File

@@ -172,7 +172,7 @@ public final class DataManager implements CoreModule, Listener
protected Object getOrDefault_(String id, String module, String key, Object fallback) protected Object getOrDefault_(String id, String module, String key, Object fallback)
{ {
Object o = getData_(id, module, key); Object o = getData_(id, "Ignore", key);
return o == null ? fallback : o; return o == null ? fallback : o;
} }

21
src/com/redstoner/modules/ignore/Ignore.java
View File

@@ -8,10 +8,15 @@ import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
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.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.json.simple.JSONArray; import org.json.simple.JSONArray;
import com.nemez.cmdmgr.Command; import com.nemez.cmdmgr.Command;
import com.nemez.cmdmgr.Command.AsyncType; import com.nemez.cmdmgr.Command.AsyncType;
import com.redstoner.annotations.AutoRegisterListener;
import com.redstoner.annotations.Commands; import com.redstoner.annotations.Commands;
import com.redstoner.annotations.Version; import com.redstoner.annotations.Version;
import com.redstoner.coremods.moduleLoader.ModuleLoader; import com.redstoner.coremods.moduleLoader.ModuleLoader;
@@ -20,23 +25,27 @@ import com.redstoner.misc.CommandHolderType;
import com.redstoner.misc.Utils; import com.redstoner.misc.Utils;
import com.redstoner.modules.Module; import com.redstoner.modules.Module;
import com.redstoner.modules.datamanager.DataManager; import com.redstoner.modules.datamanager.DataManager;
import net.nemez.chatapi.ChatAPI;
import net.nemez.chatapi.click.Message; import net.nemez.chatapi.click.Message;
@Commands(CommandHolderType.File) @Commands(CommandHolderType.File)
@AutoRegisterListener
@Version(major = 4, minor = 0, revision = 0, compatible = 4) @Version(major = 4, minor = 0, revision = 0, compatible = 4)
public class Ignore implements Module{ public class Ignore implements Module, Listener{
@EventHandler(Priority=HIGHEST) @EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerChat(AsyncPlayerChatEvent) public void onPlayerChat(AsyncPlayerChatEvent event)
{ {
Player player = event.getPlayer(); Player player = event.getPlayer();
String msg = event.getMessage();
event.setCancelled(true); event.setCancelled(true);
if (player.hasPermission("utils.chat")) if (player.hasPermission("utils.chat"))
Utils.broadcast(" " + player.getDisplayName(), " §7→§r " + ChatAPI.colorify(sender, message), Utils.broadcast(" " + player.getDisplayName(), " §7→§r " + ChatAPI.colorify(player, msg), getIgnoredBy(player));
ModuleLoader.exists("Ignore")? Ignore.getIgnoredBy(player) : null);
else else
new Message(sender, "§8[§cServer§8]").appendText("You don't have permission to chat.").send(); player.sendMessage("§8[§cServer§8] You don't have permission to chat.");
} }
@Command(hook = "unignore", async = AsyncType.ALWAYS) @Command(hook = "unignore", async = AsyncType.ALWAYS)