EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-01-19 16:59:36 +01:00
Code Issues Projects Releases Wiki Activity

debugexec

Browse Source
This commit is contained in:
boy0001 2015-02-22 17:42:52 +11:00
parent 528581b63b
commit ab012ddc0e
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java
View File

@ -31,15 +31,15 @@ import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.UUID; import java.util.UUID;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PlotSquared;
import com.intellectualcrafters.plot.object.BukkitOfflinePlayer;
import com.intellectualcrafters.plot.object.ChunkLoc; import com.intellectualcrafters.plot.object.ChunkLoc;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.util.AChunkManager;
import com.intellectualcrafters.plot.util.BlockManager;
import com.intellectualcrafters.plot.util.ExpireManager; import com.intellectualcrafters.plot.util.ExpireManager;
import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
@ -74,8 +74,8 @@ public class DebugExec extends SubCommand {
} }
case "update-expired": { case "update-expired": {
if (args.length > 1) { if (args.length > 1) {
final World world = Bukkit.getWorld(args[1]); final String world = args[1];
if (world == null) { if (!BlockManager.manager.isWorld(world)) {
return MainUtil.sendMessage(null, "Invalid world: " + args[1]); return MainUtil.sendMessage(null, "Invalid world: " + args[1]);
} }
MainUtil.sendMessage(null, "Updating expired plot list"); MainUtil.sendMessage(null, "Updating expired plot list");
@ -86,10 +86,13 @@ public class DebugExec extends SubCommand {
} }
case "show-expired": { case "show-expired": {
if (args.length > 1) { if (args.length > 1) {
final World world = Bukkit.getWorld(args[1]); final String world = args[1];
if ((world == null) || !ExpireManager.expiredPlots.containsKey(args[1])) { if (!BlockManager.manager.isWorld(world)) {
return MainUtil.sendMessage(null, "Invalid world: " + args[1]); return MainUtil.sendMessage(null, "Invalid world: " + args[1]);
} }
if (!ExpireManager.expiredPlots.containsKey(args[1])) {
return MainUtil.sendMessage(null, "No task for world: " + args[1]);
}
MainUtil.sendMessage(null, "Expired plots (" + ExpireManager.expiredPlots.get(args[1]).size() + "):"); MainUtil.sendMessage(null, "Expired plots (" + ExpireManager.expiredPlots.get(args[1]).size() + "):");
for (final Entry<Plot, Long> entry : ExpireManager.expiredPlots.get(args[1]).entrySet()) { for (final Entry<Plot, Long> entry : ExpireManager.expiredPlots.get(args[1]).entrySet()) {
final Plot plot = entry.getKey(); final Plot plot = entry.getKey();
@ -108,8 +111,8 @@ public class DebugExec extends SubCommand {
if (uuid == null) { if (uuid == null) {
return MainUtil.sendMessage(null, "player not found: " + args[1]); return MainUtil.sendMessage(null, "player not found: " + args[1]);
} }
final OfflinePlayer op = UUIDHandler.uuidWrapper.getOfflinePlayer(uuid); BukkitOfflinePlayer op = UUIDHandler.uuidWrapper.getOfflinePlayer(uuid);
if ((op == null) || !op.hasPlayedBefore()) { if ((op == null) || op.getLastPlayed() == 0) {
return MainUtil.sendMessage(null, "player hasn't connected before: " + args[1]); return MainUtil.sendMessage(null, "player hasn't connected before: " + args[1]);
} }
final Timestamp stamp = new Timestamp(op.getLastPlayed()); final Timestamp stamp = new Timestamp(op.getLastPlayed());
@ -127,8 +130,8 @@ public class DebugExec extends SubCommand {
MainUtil.sendMessage(null, "&7 - Generates a list of regions to trim"); MainUtil.sendMessage(null, "&7 - Generates a list of regions to trim");
return MainUtil.sendMessage(null, "&7 - Run after plot expiry has run"); return MainUtil.sendMessage(null, "&7 - Run after plot expiry has run");
} }
final World world = Bukkit.getWorld(args[1]); final String world = args[1];
if ((world == null) || !PlotSquared.isPlotWorld(args[1])) { if (!BlockManager.manager.isWorld(world) || !PlotSquared.isPlotWorld(args[1])) {
return MainUtil.sendMessage(null, "Invalid world: " + args[1]); return MainUtil.sendMessage(null, "Invalid world: " + args[1]);
} }
final ArrayList<ChunkLoc> empty = new ArrayList<>(); final ArrayList<ChunkLoc> empty = new ArrayList<>();
@ -143,9 +146,8 @@ public class DebugExec extends SubCommand {
PrintWriter writer; PrintWriter writer;
try { try {
writer = new PrintWriter(file); writer = new PrintWriter(file);
final String worldname = world.getName();
for (final ChunkLoc loc : empty) { for (final ChunkLoc loc : empty) {
writer.println(worldname + "/region/r." + loc.x + "." + loc.z + ".mca"); writer.println(world + "/region/r." + loc.x + "." + loc.z + ".mca");
} }
writer.close(); writer.close();
Trim.sendMessage("File saved to 'plugins/PlotSquared/trim.txt'"); Trim.sendMessage("File saved to 'plugins/PlotSquared/trim.txt'");
@ -166,7 +168,7 @@ public class DebugExec extends SubCommand {
} }
} }
} }
MainUtil.sendMessage(BukkitUtil.getPlayer(player), "Possible sub commands: /plot debugexec <" + StringUtils.join(allowed_params, "|") + ">"); MainUtil.sendMessage(player, "Possible sub commands: /plot debugexec <" + StringUtils.join(allowed_params, "|") + ">");
return true; return true;
} }
} }

5
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trim.java
View File

@ -38,6 +38,7 @@ import com.intellectualcrafters.plot.object.ChunkLoc;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotId;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.util.AChunkManager;
import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.TaskManager; import com.intellectualcrafters.plot.util.TaskManager;
import com.intellectualcrafters.plot.util.bukkit.ChunkManager; import com.intellectualcrafters.plot.util.bukkit.ChunkManager;
@ -162,7 +163,7 @@ public class Trim extends SubCommand {
return true; return true;
} }
public static boolean getTrimRegions(final ArrayList<ChunkLoc> empty, final World world, final Runnable whenDone) { public static boolean getTrimRegions(final ArrayList<ChunkLoc> empty, final String world, final Runnable whenDone) {
if (Trim.TASK) { if (Trim.TASK) {
return false; return false;
} }
@ -170,7 +171,7 @@ public class Trim extends SubCommand {
sendMessage("Collecting region data..."); sendMessage("Collecting region data...");
final ArrayList<Plot> plots = new ArrayList<>(); final ArrayList<Plot> plots = new ArrayList<>();
plots.addAll(PlotSquared.getPlots(world).values()); plots.addAll(PlotSquared.getPlots(world).values());
final HashSet<ChunkLoc> chunks = new HashSet<>(ChunkManager.getChunkChunks(world)); final HashSet<ChunkLoc> chunks = new HashSet<>(AChunkManager.manager.getChunkChunks(world));
sendMessage(" - MCA #: " + chunks.size()); sendMessage(" - MCA #: " + chunks.size());
sendMessage(" - CHUNKS: " + (chunks.size() * 1024) + " (max)"); sendMessage(" - CHUNKS: " + (chunks.size() * 1024) + " (max)");
sendMessage(" - TIME ESTIMATE: " + (chunks.size() / 1200) + " minutes"); sendMessage(" - TIME ESTIMATE: " + (chunks.size() / 1200) + " minutes");

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java
View File

@ -10,7 +10,6 @@ import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
import com.intellectualcrafters.plot.BukkitMain; import com.intellectualcrafters.plot.BukkitMain;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PlotSquared;
@ -24,7 +23,6 @@ import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotManager; import com.intellectualcrafters.plot.object.PlotManager;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.object.PlotWorld;
import com.intellectualcrafters.plot.util.bukkit.BukkitUtil;
import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
public class ExpireManager { public class ExpireManager {