Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-09 12:30:42 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #460 from main--/2.9

Browse Source 
Made the "throws" declaration of getWarps() more specific
This commit is contained in:
Iaccidentally 2013-04-30 08:30:41 -07:00
commit 42dc6a2e07
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Essentials/src/com/earth2me/essentials/EssentialsConf.java
View File

@ -1,6 +1,8 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.InvalidWorldException;
import com.google.common.io.Files; import com.google.common.io.Files;
import java.io.*; import java.io.*;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
@ -379,7 +381,7 @@ public class EssentialsConf extends YamlConfiguration
return isSet(path); return isSet(path);
} }
public Location getLocation(final String path, final Server server) throws Exception public Location getLocation(final String path, final Server server) throws InvalidWorldException
{ {
final String worldName = getString((path == null ? "" : path + ".") + "world"); final String worldName = getString((path == null ? "" : path + ".") + "world");
if (worldName == null || worldName.isEmpty()) if (worldName == null || worldName.isEmpty())
@ -389,7 +391,7 @@ public class EssentialsConf extends YamlConfiguration
final World world = server.getWorld(worldName); final World world = server.getWorld(worldName);
if (world == null) if (world == null)
{ {
throw new Exception(_("invalidWorld")); throw new InvalidWorldException(worldName);
} }
return new Location(world, return new Location(world,
getDouble((path == null ? "" : path + ".") + "x", 0), getDouble((path == null ? "" : path + ".") + "x", 0),

3
Essentials/src/com/earth2me/essentials/Warps.java
View File

@ -3,6 +3,7 @@ package com.earth2me.essentials;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.IWarps; import com.earth2me.essentials.api.IWarps;
import com.earth2me.essentials.api.InvalidNameException; import com.earth2me.essentials.api.InvalidNameException;
import com.earth2me.essentials.api.InvalidWorldException;
import com.earth2me.essentials.commands.WarpNotFoundException; import com.earth2me.essentials.commands.WarpNotFoundException;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -49,7 +50,7 @@ public class Warps implements IConf, IWarps
} }
@Override @Override
public Location getWarp(String warp) throws Exception public Location getWarp(String warp) throws WarpNotFoundException, InvalidWorldException
{ {
EssentialsConf conf = warpPoints.get(new StringIgnoreCase(warp)); EssentialsConf conf = warpPoints.get(new StringIgnoreCase(warp));
if (conf == null) if (conf == null)

7
Essentials/src/com/earth2me/essentials/api/IWarps.java
View File

@ -2,6 +2,8 @@ package com.earth2me.essentials.api;
import java.io.File; import java.io.File;
import java.util.Collection; import java.util.Collection;
import com.earth2me.essentials.commands.WarpNotFoundException;
import org.bukkit.Location; import org.bukkit.Location;
@ -12,9 +14,10 @@ public interface IWarps
* *
* @param warp - Warp name * @param warp - Warp name
* @return - Location the warp is set to * @return - Location the warp is set to
* @throws Exception * @throws WarpNotFoundException When the warp is not found
* @throws InvalidWorldException When the world the warp is in is not found
*/ */
Location getWarp(String warp) throws Exception; Location getWarp(String warp) throws WarpNotFoundException, InvalidWorldException;
/** /**
* Gets a list of warps * Gets a list of warps

16
Essentials/src/com/earth2me/essentials/api/InvalidWorldException.java Normal file
View File

@ -0,0 +1,16 @@
package com.earth2me.essentials.api;
import static com.earth2me.essentials.I18n._;
public class InvalidWorldException extends Exception {
private final String world;
public InvalidWorldException(final String world) {
super(_("invalidWorld"));
this.world = world;
}
public String getWorld() {
return this.world;
}
}