EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-28 19:54:43 +02:00
Code Issues Projects Releases Wiki Activity

Minor tweaks

Browse Source
This commit is contained in:
Jesse Boyd
2015-10-29 23:13:10 +11:00
parent 95feaed870
commit 215ed04754
8 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,14 +146,12 @@ public class PS {
PLATFORM = platform;
EconHandler.manager = IMP.getEconomyHandler();
if (getJavaVersion() < 1.7) {
log(C.PREFIX.s() + "&cYour java version is outdated. Please update to at least 1.7.");
// Didn't know of any other link :D
log(C.PREFIX.s() + "&cURL: &6https://java.com/en/download/index.jsp");
log(C.CONSOLE_JAVA_OUTDATED_1_7);
IMP.disable();
return;
}
if (getJavaVersion() < 1.8) {
log(C.PREFIX.s() + "&cIt's really recommended to run Java 1.8, as it increases performance");
log(C.CONSOLE_JAVA_OUTDATED_1_8);
}
TASK = IMP.getTaskManager();
if (C.ENABLED.s().length() > 0) {
@ -185,7 +183,7 @@ public class PS {
if (Settings.METRICS) {
IMP.startMetrics();
} else {
log("&dUsing metrics will allow us to improve the plugin, please consider it :)");
log(C.CONSOLE_PLEASE_ENABLE_METRICS);
}
IMP.startMetrics();
if (Settings.CHUNK_PROCESSOR) {

4
src/main/java/com/intellectualcrafters/plot/commands/Template.java
View File

@ -69,8 +69,8 @@ public class Template extends SubCommand {
final ZipInputStream zis = new ZipInputStream(new FileInputStream(input));
ZipEntry ze = zis.getNextEntry();
while (ze != null) {
final String name = ze.getName();
final File newFile = new File((output + File.separator + name.replaceAll("[\\\\|\\|/]", File.separator)).replaceAll("__TEMP_DIR__", world));
final String name = ze.getName().replace('\\', File.separatorChar).replace('/', File.separatorChar);
final File newFile = new File((output + File.separator + name).replaceAll("__TEMP_DIR__", world));
new File(newFile.getParent()).mkdirs();
final FileOutputStream fos = new FileOutputStream(newFile);
int len;

6
src/main/java/com/intellectualcrafters/plot/config/C.java
View File

@ -90,6 +90,12 @@ public enum C {
PERMISSION_ADMIN_INTERACT_UNOWNED("plots.admin.interact.unowned", "static.permissions"),
PERMISSION_ADMIN_INTERACT_OTHER("plots.admin.interact.other", "static.permissions"),
PERMISSION_ADMIN_BUILD_HEIGHTLIMIT("plots.admin.build.heightlimit", "static.permissions"),
/*
* Static console
*/
CONSOLE_JAVA_OUTDATED_1_7("&cYour java version is outdated. Please update to at least 1.7.\n&cURL: &6https://java.com/en/download/index.jsp","static.console"),
CONSOLE_JAVA_OUTDATED_1_8("&cIt's really recommended to run Java 1.8, as it increases performance","static.console"),
CONSOLE_PLEASE_ENABLE_METRICS("&dUsing metrics will allow us to improve the plugin, please consider it :)","static.console"),
/*
* Confirm
*/

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

@ -661,7 +661,6 @@ public class MainUtil {
public static Location getDefaultHome(Plot plot) {
plot = plot.getBasePlot(false);
final PlotWorld plotworld = PS.get().getPlotWorld(plot.world);
if (plotworld.DEFAULT_HOME != null) {
if (plotworld.DEFAULT_HOME != null) {
final int x;
final int z;
@ -675,7 +674,7 @@ public class MainUtil {
Location bot = plot.getBottomAbs();
x = bot.getX() + plotworld.DEFAULT_HOME.x;
z = bot.getZ() + plotworld.DEFAULT_HOME.z;
}
}
final int y = getHeighestBlock(plot.world, x, z);
return new Location(plot.world, x, y + 1, z);
}