Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-11-20 09:50:06 +01:00
fix rollback database query (#2591)
Dieser Commit ist enthalten in:
Ursprung
3a9bbb7293
Commit
f5dfe3ae16
@ -159,18 +159,23 @@ public class RollbackDatabase extends AsyncNotifyQueue {
|
|||||||
Future<Integer> future = call(() -> {
|
Future<Integer> future = call(() -> {
|
||||||
try {
|
try {
|
||||||
int count = 0;
|
int count = 0;
|
||||||
String stmtStr;
|
String stmtStr = """
|
||||||
|
SELECT * FROM `%sedits`
|
||||||
|
WHERE `time` > ?
|
||||||
|
AND `x2` >= ?
|
||||||
|
AND `x1` <= ?
|
||||||
|
AND `z2` >= ?
|
||||||
|
AND `z1` <= ?
|
||||||
|
AND `y2` >= ?
|
||||||
|
AND `y1` <= ?
|
||||||
|
""";
|
||||||
|
if (uuid != null) {
|
||||||
|
stmtStr += "\n AND `player`= ?";
|
||||||
|
}
|
||||||
if (ascending) {
|
if (ascending) {
|
||||||
if (uuid == null) {
|
stmtStr += "\n ORDER BY `time` ASC, `id` ASC";
|
||||||
stmtStr = "SELECT * FROM`%sedits` WHERE `time`>? AND `x2`>=? AND `x1`<=? AND `z2`>=? AND `z1`<=? AND " +
|
|
||||||
"`y2`>=? AND `y1`<=? ORDER BY `time` , `id`";
|
|
||||||
} else {
|
|
||||||
stmtStr = "SELECT * FROM`%sedits` WHERE `time`>? AND `x2`>=? AND `x1`<=? AND `z2`>=? AND `z1`<=? AND " +
|
|
||||||
"`y2`>=? AND `y1`<=? AND `player`=? ORDER BY `time` ASC, `id` ASC";
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
stmtStr = "SELECT * FROM`%sedits` WHERE `time`>? AND `x2`>=? AND `x1`<=? AND `z2`>=? AND `z1`<=? AND " +
|
stmtStr += "\n ORDER BY `time` DESC, `id` DESC";
|
||||||
"`y2`>=? AND `y1`<=? AND `player`=? ORDER BY `time` DESC, `id` DESC";
|
|
||||||
}
|
}
|
||||||
try (PreparedStatement stmt = connection.prepareStatement(stmtStr.formatted(this.prefix))) {
|
try (PreparedStatement stmt = connection.prepareStatement(stmtStr.formatted(this.prefix))) {
|
||||||
stmt.setInt(1, (int) (minTime / 1000));
|
stmt.setInt(1, (int) (minTime / 1000));
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren