Skip to content

Commit 697129e

Browse files
committed
Fix SQLite bugs
1 parent 3ebb9d5 commit 697129e

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

API/src/main/java/me/innectic/permissify/api/database/handlers/SQLHandler.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ public void initialize() {
119119
superAdminStatement.close();
120120

121121
if (!hasFormattingTable(connection.get(), database)) {
122-
System.out.println("Creating");
123122
PreparedStatement formattingStatement = connection.get().prepareStatement("CREATE TABLE IF NOT EXISTS " + database + "formatting (`format` VARCHAR(400) NOT NULL, formatter VARCHAR(200) NOT NULL)");
124123
formattingStatement.execute();
125124
formattingStatement.close();
@@ -358,11 +357,12 @@ public boolean createGroup(String name, String prefix, String suffix, String cha
358357
}
359358

360359
try {
361-
PreparedStatement statement = connection.get().prepareStatement("INSERT INTO groups (name,prefix,suffix,chatcolor) VALUES (?,?,?,?)");
360+
PreparedStatement statement = connection.get().prepareStatement("INSERT INTO groups (name,prefix,suffix,chatcolor,defaultGroup) VALUES (?,?,?,?,?)");
362361
statement.setString(1, name);
363362
statement.setString(2, prefix);
364363
statement.setString(3, suffix);
365364
statement.setString(4, chatColor);
365+
statement.setBoolean(5, false);
366366
// Cleanup
367367
statement.execute();
368368
statement.close();
@@ -417,9 +417,10 @@ public boolean addPlayerToGroup(UUID uuid, PermissionGroup group) {
417417
return false;
418418
}
419419
try {
420-
PreparedStatement statement = connection.get().prepareStatement("INSERT INTO groupMembers (uuid,`group`) VALUES (?,?)");
420+
PreparedStatement statement = connection.get().prepareStatement("INSERT INTO groupMembers (uuid,`group`,`primary`) VALUES (?,?,?)");
421421
statement.setString(1, uuid.toString());
422422
statement.setString(2, group.getName());
423+
statement.setBoolean(3, false);
423424
statement.execute();
424425
statement.close();
425426
connection.get().close();

Spigot/src/main/java/me/innectic/permissify/spigot/events/PlayerChat.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ public void onPlayerChat(AsyncPlayerChatEvent e) {
4949
if (!plugin.getPermissifyAPI().getDatabaseHandler().isPresent()) return;
5050
Player player = e.getPlayer();
5151
if (player == null) return;
52-
Optional<PermissionGroup> group = plugin.getPermissifyAPI().getDatabaseHandler().get().getGroups().stream().filter(permissionGroup -> permissionGroup.hasPlayer(player.getUniqueId())).findFirst();
52+
Optional<PermissionGroup> group = plugin.getPermissifyAPI().getDatabaseHandler().get().getGroups().stream()
53+
.filter(permissionGroup -> permissionGroup.hasPlayer(player.getUniqueId()))
54+
.filter(permissionGroup -> permissionGroup.isPrimaryGroup(player.getUniqueId())).findFirst();
5355
group.ifPresent(permissionGroup -> {
5456
e.setCancelled(true);
5557
Bukkit.broadcastMessage(ColorUtil.makeReadable(ChatFormatter.formatChat(player.getUniqueId(), player.getName(), e.getMessage())));

0 commit comments

Comments
 (0)