Tweaked message remover to allow removal of any message not just the

first one.
This commit is contained in:
BuildTools 2017-11-14 07:43:28 -05:00
parent 28139c5fd8
commit 12720f9949
2 changed files with 5 additions and 6 deletions

View File

@ -41,13 +41,13 @@ import mineverse.Aust1n46.chat.listeners.LoginListener;
import mineverse.Aust1n46.chat.listeners.ChatListener; import mineverse.Aust1n46.chat.listeners.ChatListener;
import mineverse.Aust1n46.chat.listeners.PacketListener; import mineverse.Aust1n46.chat.listeners.PacketListener;
import mineverse.Aust1n46.chat.listeners.SignListener; import mineverse.Aust1n46.chat.listeners.SignListener;
import mineverse.Aust1n46.chat.alias.Alias; //import mineverse.Aust1n46.chat.alias.Alias;
import mineverse.Aust1n46.chat.alias.AliasInfo; import mineverse.Aust1n46.chat.alias.AliasInfo;
import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannel;
import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.channel.ChatChannelInfo;
import mineverse.Aust1n46.chat.command.CCommand; //import mineverse.Aust1n46.chat.command.CCommand;
import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.command.MineverseCommandExecutor; import mineverse.Aust1n46.chat.command.MineverseCommandExecutor;
import mineverse.Aust1n46.chat.command.chat.Broadcast; import mineverse.Aust1n46.chat.command.chat.Broadcast;
@ -136,7 +136,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
public static String lastJson; public static String lastJson;
public static Method messageMethod; public static Method messageMethod;
public static Field posField; public static Field posField;
public static Class chatMessageType; public static Class<?> chatMessageType;
private static Field commandMap; private static Field commandMap;
private static Field knownCommands; private static Field knownCommands;

View File

@ -81,8 +81,8 @@ public class Removemessage extends MineverseCommand {
resend = true; resend = true;
continue; continue;
} }
if(message.getMessage().contains(Format.FormatStringAll(plugin.getConfig().getString("guiicon")))) { if(message.getMessage().contains(ChatColor.stripColor(Format.FormatStringAll(plugin.getConfig().getString("guiicon"))))) {
String submessage = message.getMessage().substring(0, message.getMessage().length() - plugin.getConfig().getString("guiicon").length() - 1).replaceAll("(§([a-z0-9]))", ""); String submessage = message.getMessage().substring(0, message.getMessage().length() - ChatColor.stripColor(Format.FormatStringAll(plugin.getConfig().getString("guiicon"))).length());
if(submessage.hashCode() == hash) { if(submessage.hashCode() == hash) {
WrappedChatComponent removedComponent = p.getPlayer().hasPermission("venturechat.message.bypass") ? Removemessage.this.getMessageDeletedChatComponentAdmin(message) : Removemessage.this.getMessageDeletedChatComponentPlayer(); WrappedChatComponent removedComponent = p.getPlayer().hasPermission("venturechat.message.bypass") ? Removemessage.this.getMessageDeletedChatComponentAdmin(message) : Removemessage.this.getMessageDeletedChatComponentPlayer();
message.setComponent(removedComponent); message.setComponent(removedComponent);
@ -148,7 +148,6 @@ public class Removemessage extends MineverseCommand {
for(Player p : packets.keySet()) { for(Player p : packets.keySet()) {
List<PacketContainer> pPackets = packets.get(p); List<PacketContainer> pPackets = packets.get(p);
for(PacketContainer c : pPackets) { for(PacketContainer c : pPackets) {
//System.out.println("test packet send");
Removemessage.this.sendPacketPlayOutChat(p, c); Removemessage.this.sendPacketPlayOutChat(p, c);
} }
} }