Minor fixes.

This commit is contained in:
Robin Kupper
2011-04-26 17:54:52 +02:00
parent 90fef4d277
commit aab2dbfe5d
3 changed files with 8 additions and 9 deletions

View File

@@ -26,7 +26,7 @@ public class LBBlockListener extends BlockListener
final BlockState after = event.getBlockPlaced().getState(); final BlockState after = event.getBlockPlaced().getState();
if (before.getTypeId() == 0) if (before.getTypeId() == 0)
consumer.queueBlockPlace(event.getPlayer().getName(), after); consumer.queueBlockPlace(event.getPlayer().getName(), after);
else if (before.getTypeId() >= 8 && before.getTypeId() <= 11 && before.getRawData() == 0) else if (before.getRawData() == 0)
consumer.queueBlock(event.getPlayer().getName(), event.getBlock().getLocation(), before.getTypeId(), after.getTypeId(), after.getRawData()); consumer.queueBlock(event.getPlayer().getName(), event.getBlock().getLocation(), before.getTypeId(), after.getTypeId(), after.getRawData());
else else
consumer.queueBlockReplace(event.getPlayer().getName(), before, after); consumer.queueBlockReplace(event.getPlayer().getName(), before, after);

View File

@@ -229,9 +229,9 @@ public class LogBlock extends JavaPlugin
} else } else
player.sendMessage(ChatColor.RED + "You aren't allowed to do this"); player.sendMessage(ChatColor.RED + "You aren't allowed to do this");
} else if (args[0].equalsIgnoreCase("world")) { } else if (args[0].equalsIgnoreCase("world")) {
if (checkPermission(player,"logblock.area")) { if (checkPermission(player,"logblock.area"))
new Thread(new AreaStats(this, player, Short.MAX_VALUE)).start(); new Thread(new AreaStats(this, player, Short.MAX_VALUE)).start();
} else else
player.sendMessage(ChatColor.RED + "You aren't allowed to do this"); player.sendMessage(ChatColor.RED + "You aren't allowed to do this");
} else if (args[0].equalsIgnoreCase("player")) { } else if (args[0].equalsIgnoreCase("player")) {
if (checkPermission(player,"logblock.area")) { if (checkPermission(player,"logblock.area")) {
@@ -389,17 +389,16 @@ public class LogBlock extends JavaPlugin
player.sendMessage(ChatColor.RED + "You aren't allowed to do this"); player.sendMessage(ChatColor.RED + "You aren't allowed to do this");
} else if (args[0].equalsIgnoreCase("writelogfile")) { } else if (args[0].equalsIgnoreCase("writelogfile")) {
if (checkPermission(player,"logblock.rollback")) { if (checkPermission(player,"logblock.rollback")) {
if (args.length == 2) { if (args.length == 2)
new Thread(new WriteLogFile(this, player, args[1])).start(); new Thread(new WriteLogFile(this, player, args[1])).start();
}
else else
player.sendMessage(ChatColor.RED + "Usage: /lb writelogfile [name]"); player.sendMessage(ChatColor.RED + "Usage: /lb writelogfile [name]");
} else } else
player.sendMessage(ChatColor.RED + "You aren't allowed to do this"); player.sendMessage(ChatColor.RED + "You aren't allowed to do this");
} else if (args[0].equalsIgnoreCase("me")) { } else if (args[0].equalsIgnoreCase("me")) {
if (checkPermission(player,"logblock.me")) { if (checkPermission(player,"logblock.me"))
new Thread(new PlayerAreaStats(this, player, player.getName(), Short.MAX_VALUE)).start(); new Thread(new PlayerAreaStats(this, player, player.getName(), Short.MAX_VALUE)).start();
} else else
player.sendMessage(ChatColor.RED + "You aren't allowed to do this"); player.sendMessage(ChatColor.RED + "You aren't allowed to do this");
} else if (args[0].equalsIgnoreCase("help")) { } else if (args[0].equalsIgnoreCase("help")) {
player.sendMessage(ChatColor.LIGHT_PURPLE + "LogBlock Commands:"); player.sendMessage(ChatColor.LIGHT_PURPLE + "LogBlock Commands:");

View File

@@ -192,10 +192,10 @@ public class Rollback implements Runnable
} }
private boolean equalsType(int type1, int type2) { private boolean equalsType(int type1, int type2) {
if ((type1 == 2 || type1 == 3) && (type2 == 2 || type2 == 3))
return true;
if (type1 == type2) if (type1 == type2)
return true; return true;
if ((type1 == 2 || type1 == 3) && (type2 == 2 || type2 == 3))
return true;
return false; return false;
} }
} }