Upstream
/
WorldBorder
mirror of https://github.com/Brettflan/WorldBorder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changed world folder location determination for "trim" task to use new World.getWorldFolder() method 

Added "The End" world support to the "trim" command, since it uses a new region folder location
This commit is contained in:
Brettflan 2011-12-14 06:05:43 -06:00
parent 1fb5aa9780
commit 7eb7404dcd
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -6,4 +6,5 @@
/dist
/lib/GroupManager.jar
/nbproject/pmd.settings
/lib/craftbukkit-1.0.0-SNAPSHOT.jar
/lib/craftbukkit-1.0.0-SNAPSHOT.jar
/lib/craftbukkit-1.0.1-R1.jar

16
src/com/wimbli/WorldBorder/WorldTrimTask.java
View File

@ -4,7 +4,6 @@ import java.io.*;
import java.util.ArrayList;
import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.bukkit.Server;
import org.bukkit.World;
@ -68,16 +67,21 @@ public class WorldTrimTask implements Runnable
this.border.setRadius(border.getRadius() + trimDistance);
regionFolder = new File("./"+worldName+"/region");
regionFolder = new File(this.world.getWorldFolder(), "region");
if (!regionFolder.exists() || !regionFolder.isDirectory())
{
String mainRegionFolder = regionFolder.getPath();
regionFolder = new File("./"+worldName+"/DIM-1/region");
regionFolder = new File(this.world.getWorldFolder(), "DIM-1"+File.separator+"region"); // nether worlds
if (!regionFolder.exists() || !regionFolder.isDirectory())
{
sendMessage("Could not validate folder for world's region files. Looked in: "+mainRegionFolder+" -and- "+regionFolder.getPath());
this.stop();
return;
String subRegionFolder = regionFolder.getPath();
regionFolder = new File(this.world.getWorldFolder(), "DIM1"+File.separator+"region"); // "the end" worlds; not sure why "DIM1" vs "DIM-1", but that's how it is
if (!regionFolder.exists() || !regionFolder.isDirectory())
{
sendMessage("Could not validate folder for world's region files. Looked in: "+mainRegionFolder+" -and- "+subRegionFolder+" -and- "+regionFolder.getPath());
this.stop();
return;
}
}
}
regionFiles = regionFolder.listFiles(new RegionFileFilter());