EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 21:26:45 +01:00
Code Issues Projects Releases Wiki Activity

Some fixes

Browse Source
This commit is contained in:
boy0001 2015-07-31 15:40:53 +10:00
parent cdee23796b
commit 0667e885de
6 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/intellectualcrafters/plot/PS.java
View File

@ -182,7 +182,13 @@ public class PS {
} }
// create UUIDWrapper // create UUIDWrapper
UUIDHandler.implementation = IMP.initUUIDHandler(); UUIDHandler.implementation = IMP.initUUIDHandler();
UUIDHandler.startCaching(null); // TODO maybe a notification when this is done? TaskManager.runTaskLater(new Runnable() {
@Override
public void run() {
PS.debug("Starting UUID caching");
UUIDHandler.startCaching(null);
}
}, 20);
// create event util class // create event util class
EventUtil.manager = IMP.initEventUtil(); EventUtil.manager = IMP.initEventUtil();
// create Hybrid utility class // create Hybrid utility class

13
src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java
View File

@ -27,6 +27,7 @@ import java.util.List;
import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.object.ConsolePlayer; import com.intellectualcrafters.plot.object.ConsolePlayer;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotId;
@ -62,12 +63,13 @@ public class MainCommand extends CommandManager<PlotPlayer> {
createCommand(new Buy()); createCommand(new Buy());
createCommand(new Save()); createCommand(new Save());
createCommand(new Load()); createCommand(new Load());
createCommand(new Unclaim());
createCommand(new Confirm());
createCommand(new Template()); createCommand(new Template());
createCommand(new Download()); createCommand(new Download());
createCommand(new Update()); createCommand(new Update());
createCommand(new Template()); createCommand(new Template());
createCommand(new Setup()); createCommand(new Setup());
// createCommand(new DebugUUID());
createCommand(new DebugFill()); createCommand(new DebugFill());
createCommand(new DebugSaveTest()); createCommand(new DebugSaveTest());
createCommand(new DebugLoadTest()); createCommand(new DebugLoadTest());
@ -121,6 +123,15 @@ public class MainCommand extends CommandManager<PlotPlayer> {
createCommand(new Condense()); createCommand(new Condense());
createCommand(new Copy()); createCommand(new Copy());
createCommand(new Chat()); createCommand(new Chat());
createCommand(new Trim());
if (Settings.ENABLE_CLUSTERS) {
createCommand(new Cluster());
}
// Broken
// createCommand(new DebugUUID());
} }
public static boolean no_permission(final PlotPlayer player, final String permission) { public static boolean no_permission(final PlotPlayer player, final String permission) {

2
src/main/java/com/intellectualcrafters/plot/commands/Set.java
View File

@ -357,7 +357,7 @@ public class Set extends SubCommand {
a.append(" ").append(args[x]); a.append(" ").append(args[x]);
} }
} }
MainCommand.onCommand(plr, "flag", ("set " + args[0] + a.toString()).split(" ")); MainCommand.onCommand(plr, "plot", ("flag set " + args[0] + a.toString()).split(" "));
return true; return true;
} }
} }

2
src/main/java/com/intellectualcrafters/plot/config/Settings.java
View File

@ -179,7 +179,7 @@ public class Settings {
*/ */
public static boolean TWIN_MODE_UUID = false; public static boolean TWIN_MODE_UUID = false;
public static boolean OFFLINE_MODE = false; public static boolean OFFLINE_MODE = false;
public static boolean UUID_LOWERCASE = true; public static boolean UUID_LOWERCASE = false;
/** /**
* Command confirmation * Command confirmation
*/ */

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

@ -1083,7 +1083,7 @@ public class MainUtil {
public void run() { public void run() {
ChunkLoc loc = new ChunkLoc(value[0], value[1]); ChunkLoc loc = new ChunkLoc(value[0], value[1]);
ChunkManager.manager.loadChunk(plot.world, loc, false); ChunkManager.manager.loadChunk(plot.world, loc, false);
setBiome(plot.world, value[2], value[3], value[4], value[4], biome); setBiome(plot.world, value[2], value[3], value[4], value[5], biome);
ChunkManager.manager.unloadChunk(plot.world, loc, true, true); ChunkManager.manager.unloadChunk(plot.world, loc, true, true);
} }
}, new Runnable() { }, new Runnable() {

2
src/main/java/com/plotsquared/bukkit/BukkitMain.java
View File

@ -464,7 +464,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
AbstractTitle.TITLE_CLASS = new DefaultTitle(); AbstractTitle.TITLE_CLASS = new DefaultTitle();
if (wrapper instanceof DefaultUUIDWrapper) { if (wrapper instanceof DefaultUUIDWrapper) {
Settings.TWIN_MODE_UUID = true; Settings.TWIN_MODE_UUID = true;
} else if (wrapper instanceof OfflineUUIDWrapper && !Bukkit.getOnlineMode()) { } else if (wrapper.getClass() == OfflineUUIDWrapper.class && !Bukkit.getOnlineMode()) {
Settings.TWIN_MODE_UUID = true; Settings.TWIN_MODE_UUID = true;
} }
} }