Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #46

Merged
merged 20 commits into from
Aug 8, 2024
Merged

Dev #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
871ac9c
Update maven.yml
RegadPoleCN May 12, 2024
486f31b
增加对BungeeCord的支持\n更新1.3.2
RegadPoleCN May 15, 2024
293a5c3
fix
RegadPoleCN May 23, 2024
87b61b5
Merge branch 'dev' of https://gitee.com/regadpole/PlumBot into dev
RegadPoleCN May 23, 2024
6a7a966
fix
RegadPoleCN May 23, 2024
2f50691
Merge branch 'dev' of https://gitee.com/regadpole/PlumBot into dev
RegadPoleCN Jun 20, 2024
b820841
1.管理员白名单limitless
RegadPoleCN Jun 20, 2024
83ed519
1.管理员白名单limitless
RegadPoleCN Jun 20, 2024
c8de514
Merge branch 'dev' of https://gitee.com/regadpole/PlumBot into dev
RegadPoleCN Jun 24, 2024
86141b7
1.修复查询结果
RegadPoleCN Jun 24, 2024
384e6a5
fix kook whitelist
RegadPoleCN Jun 26, 2024
46bf9c8
fix
RegadPoleCN Jun 26, 2024
e784645
update readme
RegadPoleCN Jun 26, 2024
e71d807
1. try fix OutOfMemoryError when using database
RegadPoleCN Jul 3, 2024
cd26750
fix bugs
RegadPoleCN Jul 8, 2024
99bf8b3
fixed
RegadPoleCN Jul 12, 2024
1802e6e
fix
RegadPoleCN Jul 12, 2024
011d673
pre-fix
RegadPoleCN Jul 21, 2024
fd349b2
fix bugs when using mysql & using commands
RegadPoleCN Jul 30, 2024
3f84e78
Merge branch 'main' into dev
RegadPoleCN Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions plumbot-bukkit/src/main/java/me/regadpole/plumbot/command/Commands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,12 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
return true;
}
if (args.length == 3) {
if (!WhitelistHelper.checkIDNotExist(args[1])) {
sender.sendMessage(plugin.getEnvironment().prefix+"§c绑定失败，此ID已绑定用户" + DatabaseManager.getBindId(args[1], DataBase.type().toLowerCase(), PlumBot.getDatabase()));
if (!WhitelistHelper.checkIDNotExist(args[2])) {
sender.sendMessage(plugin.getEnvironment().prefix+"§c绑定失败，此ID已绑定用户" + DatabaseManager.getBindId(args[2], DataBase.type().toLowerCase(), PlumBot.getDatabase()));
return true;
}
List<String> id = WhitelistHelper.addAndGet(args[2], args[1], DataBase.type().toLowerCase(), PlumBot.getDatabase());
sender.sendMessage(plugin.getEnvironment().prefix+"§a成功申请白名单，" + args[0] + "目前的白名单为" + id);
sender.sendMessage(plugin.getEnvironment().prefix+"§a成功申请白名单，" + args[1] + "目前的白名单为" + id);
}
break;
case "kook":
Expand Down
11 changes: 6 additions & 5 deletions plumbot-bukkit/src/main/java/me/regadpole/plumbot/event/server/ServerEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void onPreLogin(AsyncPlayerPreLoginEvent event){
long qq;
qq = (DatabaseManager.getBindId(name, DataBase.type().toLowerCase(), PlumBot.getDatabase()));
if (qq == 0L) {
event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_WHITELIST, Args.WhitelistKick());
PlumBot.getScheduler().runTask(() -> event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_WHITELIST, Args.WhitelistKick()));
List<Long> groups = Config.getGroupQQs();
for (long groupID : groups) {
PlumBot.getBot().sendMsg(true, "玩家" + name + "因为未在白名单中被踢出", groupID);
Expand All @@ -87,7 +87,7 @@ public void onPreLogin(AsyncPlayerPreLoginEvent event){
}
for (long groupID : Config.getGroupQQs()) {
if(!PlumBot.getBot().checkUserInGroup(qq, groupID)){
event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_WHITELIST, Args.WhitelistKick());
PlumBot.getScheduler().runTask(() -> event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_WHITELIST, Args.WhitelistKick()));
List<Long> groups = Config.getGroupQQs();
for (long group : groups) {
PlumBot.getBot().sendMsg(true, "玩家" + name + "因为未在白名单中被踢出", group);
Expand All @@ -96,7 +96,8 @@ public void onPreLogin(AsyncPlayerPreLoginEvent event){
return;
}
}
event.allow();
PlumBot.getScheduler().runTask(event::allow);

});
}
}
Expand All @@ -112,7 +113,7 @@ public void onJoin(PlayerJoinEvent event){
long qq;
qq = (DatabaseManager.getBindId(name, DataBase.type().toLowerCase(), PlumBot.getDatabase()));
if (qq == 0L) {
player.kickPlayer(Args.WhitelistKick());
PlumBot.getScheduler().runTask(() -> player.kickPlayer(Args.WhitelistKick()));
List<Long> groups = Config.getGroupQQs();
for (long groupID : groups) {
PlumBot.getBot().sendMsg(true, "玩家" + name + "因为未在白名单中被踢出", groupID);
Expand All @@ -121,7 +122,7 @@ public void onJoin(PlayerJoinEvent event){
}
for (long groupID : Config.getGroupQQs()) {
if(!PlumBot.getBot().checkUserInGroup(qq, groupID)){
player.kickPlayer(Args.WhitelistKick());
PlumBot.getScheduler().runTask(() -> player.kickPlayer(Args.WhitelistKick()));
List<Long> groups = Config.getGroupQQs();
for (long group : groups) {
PlumBot.getBot().sendMsg(true, "玩家" + name + "因为未在白名单中被踢出", group);
Expand Down
14 changes: 6 additions & 8 deletions plumbot-bukkit/src/main/java/me/regadpole/plumbot/internal/database/DatabaseManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,6 @@ public static void removeBind(String qq, String mode, Database db) {

ResultSet resultSet = connection.prepareStatement(select).executeQuery();

if (resultSet.isBeforeFirst()) {
resultSet.next();
}
connection.prepareStatement(delete).executeUpdate();
resultSet.close();
connection.close();
Expand All @@ -270,10 +267,9 @@ public static long getBindId(String id, String mode, Database db) {

ResultSet resultSet = connection.prepareStatement(select).executeQuery();

if (resultSet.isBeforeFirst()) {
resultSet.next();
if (resultSet.next()) {
qq = resultSet.getLong("qq");
}
qq = resultSet.getLong("qq");
resultSet.close();
connection.close();
break;
Expand Down Expand Up @@ -315,8 +311,10 @@ public static List<String> getBind(String qq,String mode, Database db) {

ResultSet resultSet = connection.prepareStatement(select).executeQuery();

if (resultSet.isBeforeFirst()) {
resultSet.next();
if (!resultSet.next()) {
resultSet.close();
connection.close();
break;
}
do {
String tempId = resultSet.getString("id");
Expand Down
Loading