EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-11-04 03:03:43 +01:00
Code Issues Projects Releases Wiki Activity

Fixes

Browse Source 
Closes #683
Potential fix for sign issue
Potential fix for templates not working
Incremented version number.
This commit is contained in:
Jesse Boyd
2015-10-24 21:55:34 +11:00
parent 6650ea2a4c
commit e20e4a8650
6 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
src/main/java/com/intellectualcrafters/plot/object/Plot.java
View File

@@ -716,7 +716,7 @@ public class Plot {
public Location getHome() {
return MainUtil.getPlotHome(this);
}
/**
* Get the average rating of the plot. This is the value displayed in /plot info
* @return average rating as double

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

@@ -158,6 +158,7 @@ public abstract class SchematicHandler {
RegionWrapper region = MainUtil.getLargestRegion(plot);
if ((((region.maxX - region.minX + x_offset) + 1) < WIDTH) || (((region.maxZ - region.minZ + z_offset) + 1) < LENGTH) || (HEIGHT > 256)) {
PS.debug("Schematic is too large");
PS.debug("(" + WIDTH + "," + LENGTH + "," + HEIGHT + ") is bigger than (" + (region.maxX - region.minX) + "," + (region.maxZ - region.minZ) + ",256)");
TaskManager.runTask(whenDone);
return;
}
@@ -465,7 +466,7 @@ public abstract class SchematicHandler {
}
}
}
final File file = new File(PS.get().IMP.getDirectory() + File.separator + "schematics" + File.separator + name + ".schematic");
final File file = new File(PS.get().IMP.getDirectory() + File.separator + "schematics" + File.separator + name + (name.endsWith(name) ? "" : ".schematic"));
return getSchematic(file);
}