Fix issue with SQLite town creation not setting the right IDs

Author: WiIIiam278

common/src/main/java/net/william278/husktowns/HuskTowns.java

@@ -159,13 +159,14 @@ default Optional<Preferences> getUserPreferences(@NotNull UUID uuid) {
     @NotNull
     List<Town> getTowns();
 
-    default Optional<Member> getUserTown(@NotNull User user) {
+    default Optional<Member> getUserTown(@NotNull User user) throws IllegalStateException {
         for (int i = 0; i < getTowns().size(); i++) {
             final Town town = getTowns().get(i);
             if (town.getMembers().containsKey(user.getUuid())) {
                 final int weight = town.getMembers().get(user.getUuid());
-                return getRoles().fromWeight(weight)
-                        .map(role -> new Member(user, town, role));
+                return Optional.of(getRoles().fromWeight(weight)
+                        .map(role -> new Member(user, town, role))
+                        .orElseThrow(() -> new IllegalStateException("No role found for weight " + weight)));
             }
         }
         return Optional.empty();

common/src/main/java/net/william278/husktowns/claim/TownClaim.java

@@ -23,4 +23,9 @@ public boolean isAdminClaim(@NotNull HuskTowns plugin) {
     public boolean contains(@NotNull Position position) {
         return claim.contains(position);
     }
+
+    @Override
+    public String toString() {
+        return "Town: " + town.getName() + ", Claim: " + claim;
+    }
 }

common/src/main/java/net/william278/husktowns/database/SqLiteDatabase.java

@@ -213,15 +213,20 @@ public List<Town> getAllTowns() {
     }
 
     @Override
-    public @NotNull Town createTown(@NotNull String name, @NotNull User creator) {
+    @NotNull
+    public Town createTown(@NotNull String name, @NotNull User creator) {
         final Town town = Town.create(name, creator, plugin);
         town.addMember(creator.getUuid(), plugin.getRoles().getMayorRole());
         try (PreparedStatement statement = getConnection().prepareStatement(format("""
                 INSERT INTO `%town_data%` (`name`, `data`)
-                VALUES (?, ?)"""))) {
+                VALUES (?, ?)"""), Statement.RETURN_GENERATED_KEYS)) {
             statement.setString(1, town.getName());
             statement.setBytes(2, plugin.getGson().toJson(town).getBytes(StandardCharsets.UTF_8));
-            town.setId(statement.executeUpdate());
+            statement.executeUpdate();
+            final ResultSet resultSet = statement.getGeneratedKeys();
+            if (resultSet.next()) {
+                town.setId(resultSet.getInt(1));
+            }
         } catch (SQLException | JsonSyntaxException e) {
             plugin.log(Level.SEVERE, "Failed to create town in table", e);
         }

common/src/main/java/net/william278/husktowns/manager/ClaimsManager.java

@@ -88,7 +88,7 @@ public void createClaimData(@NotNull OnlineUser user, @NotNull TownClaim claim,
             claimWorld.addClaim(claim);
             plugin.getManager().editTown(user, claim.town(), (town -> {
                 town.setClaimCount(town.getClaimCount() + 1);
-                town.getLog().log(Action.of(user, Action.Type.CREATE_CLAIM, claim.toString()));
+                town.getLog().log(Action.of(user, Action.Type.CREATE_CLAIM, claim.claim().toString()));
             }));
         }
         plugin.getDatabase().updateClaimWorld(claimWorld);

common/src/main/java/net/william278/husktowns/manager/Manager.java

@@ -203,12 +203,14 @@ protected void ifClaimOwner(@NotNull Member member, @NotNull OnlineUser user, @N
      * @param town  The town to update
      */
     public void updateTownData(@NotNull OnlineUser actor, @NotNull Town town) {
+        // Update in the cache
+        plugin.getTowns().remove(town);
+        plugin.getTowns().add(town);
+
+        // Update in the database
         plugin.getDatabase().updateTown(town);
-        if (plugin.getTowns().contains(town)) {
-            plugin.getTowns().replaceAll(t -> t.getId() == town.getId() ? town : t);
-        } else {
-            plugin.getTowns().add(town);
-        }
+
+        // Propagate to other servers
         plugin.getMessageBroker().ifPresent(broker -> Message.builder()
                 .type(Message.Type.TOWN_UPDATE)
                 .payload(Payload.integer(town.getId()))

common/src/main/java/net/william278/husktowns/network/Broker.java

@@ -59,10 +59,7 @@ protected void handle(@Nullable OnlineUser receiver, @NotNull Message message) {
             case TOWN_UPDATE -> plugin.runAsync(() -> message.getPayload().getInteger()
                     .flatMap(id -> plugin.getDatabase().getTown(id))
                     .ifPresentOrElse(town -> {
-                        if (plugin.getTowns().contains(town)) {
-                            plugin.getTowns().replaceAll(t -> t.getId() == town.getId() ? town : t);
-                            return;
-                        }
+                        plugin.getTowns().remove(town);
                         plugin.getTowns().add(town);
                     }, () -> plugin.log(Level.WARNING, "Failed to update town: Town not found")));
             case TOWN_INVITE_REQUEST -> {