diff --git a/plumbot-bukkit/pom.xml b/plumbot-bukkit/pom.xml index d19bda2..1a57c53 100644 --- a/plumbot-bukkit/pom.xml +++ b/plumbot-bukkit/pom.xml @@ -6,7 +6,7 @@ me.regadpole plumbot - 1.3.1-pre1 + 1.3.0 plumbot-bukkit diff --git a/plumbot-bukkit/src/main/java/me/regadpole/plumbot/event/qq/QQEvent.java b/plumbot-bukkit/src/main/java/me/regadpole/plumbot/event/qq/QQEvent.java index e5ad4ca..274962c 100644 --- a/plumbot-bukkit/src/main/java/me/regadpole/plumbot/event/qq/QQEvent.java +++ b/plumbot-bukkit/src/main/java/me/regadpole/plumbot/event/qq/QQEvent.java @@ -36,11 +36,6 @@ public void onFriendMessageReceive(PrivateMessage e){ if(!Config.Online()){ return; } - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(e.getMessage()); - if (matcher.find()){ - return; - } bot.sendMsg(false, "当前在线:" + "("+Bukkit.getServer().getOnlinePlayers().size()+"人)"+ServerManager.listOnlinePlayer(), e.getUserId()); return; } @@ -49,11 +44,6 @@ public void onFriendMessageReceive(PrivateMessage e){ if(!Config.TPS()){ return; } - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(e.getMessage()); - if (matcher.find()){ - return; - } ServerTps st = new ServerTps(); bot.sendMsg(false, "当前tps:" + st.getTps() + "\n" + "当前MSPT:" + st.getMSPT(),e.getUserId()); return; @@ -66,11 +56,6 @@ public void onFriendMessageReceive(PrivateMessage e){ if(!Config.CMD()){ return; } - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(matcher.group()); - if (matcher.find()){ - return; - } String cmd = matcher.group().replace(Prefix+"cmd ", ""); bot.sendMsg(false, "已发送指令至服务器",e.getUserId()); PlumBot.getScheduler().runTaskAsynchronously(()->{ @@ -124,11 +109,6 @@ public void onGroupMessageReceive(GroupMessage e){ if(!Config.CMD()){ return; } - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(msg); - if (matcher.find()){ - return; - } String cmd = matcher.group().replace(Prefix+"cmd ", ""); bot.sendMsg(true, "已发送指令至服务器",groupID); PlumBot.getScheduler().runTaskAsynchronously(()->{ @@ -144,11 +124,6 @@ public void onGroupMessageReceive(GroupMessage e){ if (!Config.WhiteList()) { return; } - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(msg); - if (matcher.find()){ - return; - } String name = matcher.group().replace(Prefix + "删除白名单 ", ""); if (name.isEmpty()) { bot.sendMsg(true, "id不能为空", groupID); @@ -172,11 +147,6 @@ public void onGroupMessageReceive(GroupMessage e){ if (!Config.WhiteList()) { return; } - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(msg); - if (matcher.find()){ - return; - } String qq = matcher.group().replace(Prefix + "删除User白名单 ", ""); if (qq.isEmpty()) { bot.sendMsg(true, "QQ不能为空", groupID); @@ -200,11 +170,6 @@ public void onGroupMessageReceive(GroupMessage e){ if (!Config.SDC()){ return; } - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(msg); - if (matcher.find()){ - return; - } String scmd = matcher.group().replace(Prefix+"", ""); String gcmd = Config.getCommandsYaml().getString("Admin."+scmd); if(gcmd!=null) { @@ -245,11 +210,6 @@ public void onGroupMessageReceive(GroupMessage e){ if(!Config.Online()){ return; } - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(msg); - if (matcher.find()){ - return; - } bot.sendMsg(true, "当前在线:" + "("+Bukkit.getServer().getOnlinePlayers().size()+"人)"+ServerManager.listOnlinePlayer(),groupID); return; } @@ -258,11 +218,6 @@ public void onGroupMessageReceive(GroupMessage e){ if(!Config.TPS()){ return; } - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(msg); - if (matcher.find()){ - return; - } ServerTps st = new ServerTps(); bot.sendMsg(true, "当前tps:" + st.getTps() + "\n" + "当前MSPT:" + st.getMSPT(),groupID); return; @@ -274,11 +229,6 @@ public void onGroupMessageReceive(GroupMessage e){ if (!Config.WhiteList()) { return; } - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(msg); - if (matcher.find()){ - return; - } String PlayerName = matcher.group().replace(Prefix + "申请白名单 ", ""); if (PlayerName.isEmpty()) { bot.sendMsg(true, "id不能为空", groupID); @@ -301,11 +251,6 @@ public void onGroupMessageReceive(GroupMessage e){ if (!Config.WhiteList()) { return; } - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(msg); - if (matcher.find()){ - return; - } PlumBot.getScheduler().runTaskAsynchronously(() -> { String idForName = DatabaseManager.getBind(String.valueOf(senderID), DataBase.type().toLowerCase(), PlumBot.getDatabase()); if (idForName == null || idForName.isEmpty()) { @@ -325,11 +270,6 @@ public void onGroupMessageReceive(GroupMessage e){ if (!Config.SDC()){ return; } - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(msg); - if (matcher.find()){ - return; - } String scmd = matcher.group().replace(Prefix+"", ""); String gcmd = Config.getCommandsYaml().getString("User."+scmd); if(gcmd!=null) { @@ -344,11 +284,6 @@ public void onGroupMessageReceive(GroupMessage e){ if (Config.SDR()){ String back = Config.getReturnsYaml().getString(msg); if(back!=null){ - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(msg); - if (matcher.find()){ - return; - } bot.sendMsg(true, back,groupID); return; } diff --git a/plumbot-velocity/pom.xml b/plumbot-velocity/pom.xml index db110d7..89cf6de 100644 --- a/plumbot-velocity/pom.xml +++ b/plumbot-velocity/pom.xml @@ -6,7 +6,7 @@ me.regadpole plumbot - 1.3.1-pre1 + 1.3.0 plumbot-velocity diff --git a/plumbot-velocity/src/main/java/me/regadpole/plumbot/event/qq/QQEvent.java b/plumbot-velocity/src/main/java/me/regadpole/plumbot/event/qq/QQEvent.java index 919cfca..2537194 100644 --- a/plumbot-velocity/src/main/java/me/regadpole/plumbot/event/qq/QQEvent.java +++ b/plumbot-velocity/src/main/java/me/regadpole/plumbot/event/qq/QQEvent.java @@ -41,11 +41,6 @@ public void onFriendMessageReceive(PrivateMessage e){ if(!Config.config.Online){ return; } - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(e.getMessage()); - if (matcher.find()){ - return; - } List pname = new ArrayList<>(); for (Player player : plugin.getServer().getAllPlayers()) { pname.add(player.getUsername()); @@ -92,11 +87,6 @@ public void onGroupMessageReceive(GroupMessage e){ if (!Config.config.WhiteList.enable) { return; } - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(msg); - if (matcher.find()){ - return; - } String name = matcher.group().replace("/删除白名单 ", ""); if (name.isEmpty()) { PlumBot.getBot().sendMsg(true, "id不能为空", groupID); @@ -120,11 +110,6 @@ public void onGroupMessageReceive(GroupMessage e){ if (!Config.config.WhiteList.enable) { return; } - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(msg); - if (matcher.find()){ - return; - } String qq = matcher.group().replace(Prefix + "删除User白名单 ", ""); if (qq.isEmpty()) { bot.sendMsg(true, "QQ不能为空", groupID); @@ -168,11 +153,6 @@ public void onGroupMessageReceive(GroupMessage e){ if(!Config.config.Online){ return; } - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(msg); - if (matcher.find()){ - return; - } List pname = new ArrayList<>(); for (Player player : plugin.getServer().getAllPlayers()) { pname.add(player.getUsername()); @@ -187,11 +167,6 @@ public void onGroupMessageReceive(GroupMessage e){ if (!Config.config.WhiteList.enable) { return; } - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(msg); - if (matcher.find()){ - return; - } String PlayerName = matcher.group().replace("/申请白名单 ", ""); if (PlayerName.isEmpty()) { PlumBot.getBot().sendMsg(true, "id不能为空", groupID); @@ -214,11 +189,6 @@ public void onGroupMessageReceive(GroupMessage e){ if (!Config.config.WhiteList.enable) { return; } - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(msg); - if (matcher.find()){ - return; - } PlumBot.INSTANCE.getServer().getScheduler().buildTask(PlumBot.INSTANCE, () -> { String idForName = DatabaseManager.getBind(String.valueOf(senderID), DbConfig.type.toLowerCase(), PlumBot.getDatabase()); if (idForName == null || idForName.isEmpty()) { @@ -235,11 +205,6 @@ public void onGroupMessageReceive(GroupMessage e){ if (plugin.vconf.getReturnsObj().get(msg) == null) return; String back = String.valueOf(plugin.vconf.getReturnsObj().get(msg)); if(back!=null){ - pattern = Pattern.compile("\\[CQ:.*].*"); - matcher = pattern.matcher(msg); - if (matcher.find()){ - return; - } PlumBot.getBot().sendMsg(true, back,groupID); return; } diff --git a/pom.xml b/pom.xml index a4cceac..44d1c0c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ me.regadpole plumbot - 1.3.1-pre1 + 1.3.0 pom PlumBot