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

v14: log water/lava buckets, bug fixes relating to logging signs

Browse Source
This commit is contained in:
bootswithdefer
2010-12-15 14:44:46 -07:00
parent 9ec407f565
commit 784965c795
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
LogBlock.java
View File

@@ -11,7 +11,7 @@ import net.minecraft.server.MinecraftServer;
public class LogBlock extends Plugin public class LogBlock extends Plugin
{ {
private static String name = "LogBlock"; private static String name = "LogBlock";
private static int version = 13; private static int version = 14;
private boolean debug = false; private boolean debug = false;
private String dbDriver = "com.mysql.jdbc.Driver"; private String dbDriver = "com.mysql.jdbc.Driver";
private String dbUrl = ""; private String dbUrl = "";
@@ -100,6 +100,7 @@ public class LogBlock extends Plugin
etc.getLoader().addListener(PluginLoader.Hook.BLOCK_PLACE, listener, this, PluginListener.Priority.LOW); etc.getLoader().addListener(PluginLoader.Hook.BLOCK_PLACE, listener, this, PluginListener.Priority.LOW);
etc.getLoader().addListener(PluginLoader.Hook.BLOCK_BROKEN, listener, this, PluginListener.Priority.LOW); etc.getLoader().addListener(PluginLoader.Hook.BLOCK_BROKEN, listener, this, PluginListener.Priority.LOW);
etc.getLoader().addListener(PluginLoader.Hook.COMPLEX_BLOCK_CHANGE, listener, this, PluginListener.Priority.LOW); etc.getLoader().addListener(PluginLoader.Hook.COMPLEX_BLOCK_CHANGE, listener, this, PluginListener.Priority.LOW);
etc.getLoader().addListener(PluginLoader.Hook.ITEM_USE, listener, this, PluginListener.Priority.LOW);
} }
private Connection getConnection() throws SQLException private Connection getConnection() throws SQLException
@@ -401,6 +402,18 @@ public class LogBlock extends Plugin
} }
return false; return false;
} }
public boolean onItemUse(Player player, Block blockPlaced, Block blockClicked, Item item)
{
if (item.getItemId() != 326 && item.getItemId() != 327) // water and lava buckets
return false;
queueBlock(player, lastface, blockPlaced);
if (debug)
lblog.info("onItemUse: placed " + blockPlaced.getType() + " clicked " + blockClicked.getType() + " item " + item.getItemId());
return false;
}
} // end LBListener } // end LBListener
private class Consumer implements Runnable // start private class Consumer implements Runnable // start
@@ -428,17 +441,17 @@ public class LogBlock extends Plugin
try { try {
conn = getConnection(); conn = getConnection();
conn.setAutoCommit(false); conn.setAutoCommit(false);
ps = conn.prepareStatement("INSERT INTO blocks (date, player, replaced, type, x, y, z) VALUES (now(),?,?,?,?,?,?)", Statement.RETURN_GENERATED_KEYS);
while (count < 100 && start+delay > (System.currentTimeMillis()/1000L)) while (count < 100 && start+delay > (System.currentTimeMillis()/1000L))
{ {
// if (debug) // if (debug)
// lblog.info("Loop DB thread at " + (System.currentTimeMillis()/1000L)); // lblog.info("Loop DB thread at " + (System.currentTimeMillis()/1000L));
b = bqueue.poll(1L, TimeUnit.SECONDS); b = bqueue.poll(1L, TimeUnit.SECONDS);
if (b == null) if (b == null)
continue; continue;
//b.log(); //b.log();
ps = conn.prepareStatement("INSERT INTO blocks (date, player, replaced, type, x, y, z) VALUES (now(),?,?,?,?,?,?)", Statement.RETURN_GENERATED_KEYS);
ps.setString(1, b.name); ps.setString(1, b.name);
ps.setInt(2, b.replaced); ps.setInt(2, b.replaced);
ps.setInt(3, b.type); ps.setInt(3, b.type);