Skip to content

Commit

Permalink
Merge pull request #538 from CivMC/snitchcrash
Browse files Browse the repository at this point in the history
Fix some snitches crashing the server
  • Loading branch information
RedDevel2 committed May 16, 2024
2 parents fe34d7f + bb949ac commit b0ad341
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ public List<LoggableAction> loadLogs(@Nonnull final Snitch snitch,
try (final Connection connection = this.db.getConnection();
final PreparedStatement statement = connection.prepareStatement(
"SELECT jsa.name, jse.uuid, jse.x, jse.y, jse.z, jse.creation_time, jse.victim, jse.id "
+ "FROM ja_snitch_entries jse INNER JOIN ja_snitch_actions jsa ON "
+ "FROM ja_snitch_entries jse STRAIGHT_JOIN ja_snitch_actions jsa ON "
+ "jse.type_id = jsa.id WHERE snitch_id = ? AND jse.creation_time >= ? "
+ "ORDER BY jse.creation_time DESC LIMIT " + Math.max(actionLimit, 1) + ";")) {
statement.setInt(1, snitchId);
Expand Down

0 comments on commit b0ad341

Please sign in to comment.