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

Fixed rollback crashing on large (50k+) rollbacks

Browse Source
This commit is contained in:
Robin Kupper
2011-03-17 19:25:24 +01:00
parent 2030a285a5
commit c7a14be22a
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,6 +125,7 @@ public class Rollback implements Runnable
player.sendMessage(ChatColor.GREEN + "" + changes + " Changes found."); player.sendMessage(ChatColor.GREEN + "" + changes + " Changes found.");
player.sendMessage(ChatColor.GOLD + "This may take " + (int)Math.ceil(changes/1000) + " seconds."); player.sendMessage(ChatColor.GOLD + "This may take " + (int)Math.ceil(changes/1000) + " seconds.");
int counter = 0; int counter = 0;
long start = System.currentTimeMillis();
Edit e = edits.poll(); Edit e = edits.poll();
while (e != null) while (e != null)
{ {
@@ -136,7 +137,7 @@ public class Rollback implements Runnable
Thread.sleep(100); Thread.sleep(100);
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
LogBlock.log.log(Level.SEVERE, this.getClass().getName() + " SQL exception", ex); LogBlock.log.log(Level.SEVERE, this.getClass().getName() + " SQL exception", ex);
player.sendMessage("<EFBFBD>cError, check server logs."); player.sendMessage(ChatColor.RED + "Error, check server logs.");
} }
counter = 0; counter = 0;
} }
@@ -144,6 +145,7 @@ public class Rollback implements Runnable
} }
player.sendMessage(ChatColor.GREEN + "Rollback finished successfully"); player.sendMessage(ChatColor.GREEN + "Rollback finished successfully");
player.sendMessage(ChatColor.GREEN + "Undid " + rolledBack + " of " + changes + " changes"); player.sendMessage(ChatColor.GREEN + "Undid " + rolledBack + " of " + changes + " changes");
player.sendMessage(ChatColor.GREEN + "Took: " + (System.currentTimeMillis() - start) + "ms");
} }
private class Edit private class Edit
@@ -166,12 +168,14 @@ public class Rollback implements Runnable
public boolean perform() { public boolean perform() {
if (type == replaced) if (type == replaced)
return false; return false;
Block block = world.getBlockAt(x, y, z); try {
if (block.getTypeId() == type || (block.getTypeId() >= 8 && block.getTypeId() <= 11) || block.getTypeId() == 51) { Block block = world.getBlockAt(x, y, z);
if (block.setTypeId(replaced)) { if (!world.isChunkLoaded(block.getChunk()))
block.setData(data); world.loadChunk(block.getChunk());
return true; if (block.getTypeId() == type || (block.getTypeId() >= 8 && block.getTypeId() <= 11) || block.getTypeId() == 51)
} return block.setTypeIdAndData(replaced, data, false);
} catch (Exception ex) {
LogBlock.log.severe("[LogBlock Rollback] " + ex.toString());
} }
return false; return false;
} }