From 7eb7404dcdf809c2b60dc856ce252e1d2af4c8ca Mon Sep 17 00:00:00 2001 From: Brettflan Date: Wed, 14 Dec 2011 06:05:43 -0600 Subject: [PATCH] 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 --- .gitignore | 3 ++- src/com/wimbli/WorldBorder/WorldTrimTask.java | 16 ++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 4d97136..f05f027 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ /dist /lib/GroupManager.jar /nbproject/pmd.settings -/lib/craftbukkit-1.0.0-SNAPSHOT.jar \ No newline at end of file +/lib/craftbukkit-1.0.0-SNAPSHOT.jar +/lib/craftbukkit-1.0.1-R1.jar \ No newline at end of file diff --git a/src/com/wimbli/WorldBorder/WorldTrimTask.java b/src/com/wimbli/WorldBorder/WorldTrimTask.java index 2a7a63d..3fb6262 100644 --- a/src/com/wimbli/WorldBorder/WorldTrimTask.java +++ b/src/com/wimbli/WorldBorder/WorldTrimTask.java @@ -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());