feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Only return keys when necessary

Browse Source
This commit is contained in:
Robin Kupper
2011-06-29 21:49:57 +02:00
parent 58a9f3e902
commit 99e56289ab
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/de/diddiz/LogBlock/Consumer.java
View File

@@ -255,20 +255,18 @@ public class Consumer extends TimerTask
log.warning("[LogBlock Consumer] Failed to add player " + b.playerName); log.warning("[LogBlock Consumer] Failed to add player " + b.playerName);
continue; continue;
} }
final boolean needKeys = b.signtext != null || b.ca != null;
table = config.tables.get(b.loc.getWorld().getName().hashCode()); table = config.tables.get(b.loc.getWorld().getName().hashCode());
state.execute("INSERT INTO `" + table + "` (date, playerid, replaced, type, data, x, y, z) VALUES (now(), " + players.get(playerHash) + ", " + b.replaced + ", " + b.type + ", " + b.data + ", '" + b.loc.getBlockX() + "', " + b.loc.getBlockY() + ", '" + b.loc.getBlockZ() + "')", Statement.RETURN_GENERATED_KEYS); state.execute("INSERT INTO `" + table + "` (date, playerid, replaced, type, data, x, y, z) VALUES (now(), " + players.get(playerHash) + ", " + b.replaced + ", " + b.type + ", " + b.data + ", '" + b.loc.getBlockX() + "', " + b.loc.getBlockY() + ", '" + b.loc.getBlockZ() + "')", needKeys ? Statement.RETURN_GENERATED_KEYS : Statement.NO_GENERATED_KEYS);
if (b.signtext != null) { if (needKeys) {
final ResultSet keys = state.getGeneratedKeys(); final ResultSet keys = state.getGeneratedKeys();
if (keys.next()) if (keys.next()) {
if (b.signtext != null)
state.execute("INSERT INTO `" + table + "-sign` (id, signtext) values (" + keys.getInt(1) + ", '" + b.signtext + "')"); state.execute("INSERT INTO `" + table + "-sign` (id, signtext) values (" + keys.getInt(1) + ", '" + b.signtext + "')");
else if (b.ca != null)
log.warning("[LogBlock Consumer] Failed to get generated keys. Unable to log sign text.");
} else if (b.ca != null) {
final ResultSet keys = state.getGeneratedKeys();
if (keys.next())
state.execute("INSERT INTO `" + table + "-chest` (id, itemtype, itemamount, itemdata) values (" + keys.getInt(1) + ", " + b.ca.itemType + ", " + b.ca.itemAmount + ", " + b.ca.itemData + ")"); state.execute("INSERT INTO `" + table + "-chest` (id, itemtype, itemamount, itemdata) values (" + keys.getInt(1) + ", " + b.ca.itemType + ", " + b.ca.itemAmount + ", " + b.ca.itemData + ")");
else } else
log.warning("[LogBlock Consumer] Failed to get generated keys. Unable to log chest access."); log.warning("[LogBlock Consumer] Failed to get generated keys. You may have to repair " + table);
} }
count++; count++;
} }