EpicKnarvik97/Jail
EpicKnarvik97/Jail
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

If the location is empty, don't try it. If the language string doesn't

Browse Source 
exist, then don't try to parse it either and return an empty string.
This commit is contained in:
graywolf336 2013-12-25 22:41:01 -06:00
parent 57e4eb6c1e
commit 6423e8d2e5
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/graywolf336/jail/JailIO.java
View File

@ -88,11 +88,13 @@ public class JailIO {
* *
* @param langString Which {@link LangString} we should be getting to send. * @param langString Which {@link LangString} we should be getting to send.
* @param variables All the variables to replace, in order from 0 to however many. * @param variables All the variables to replace, in order from 0 to however many.
* @return The message as a colorful message. * @return The message as a colorful message or an empty message if that isn't defined in the language file.
*/ */
public String getLanguageString(LangString langString, String... variables) { public String getLanguageString(LangString langString, String... variables) {
String message = lang.getString("language." + langString.toString().toLowerCase()); String message = lang.getString("language." + langString.toString().toLowerCase());
if(message == null) return "";
for (int i = 0; i < variables.length; i++) { for (int i = 0; i < variables.length; i++) {
message = message.replaceAll("%" + i + "%", variables[i]); message = message.replaceAll("%" + i + "%", variables[i]);
} }

1
src/main/java/com/graywolf336/jail/beans/Prisoner.java
View File

@ -123,6 +123,7 @@ public class Prisoner {
/** Sets the previous location of this player from a comma separated string. */ /** Sets the previous location of this player from a comma separated string. */
public void setPreviousPosition(String location) { public void setPreviousPosition(String location) {
if(location == null) return; if(location == null) return;
if(location.isEmpty()) return;
String[] s = location.split(","); String[] s = location.split(",");
this.previousPosition = new Location(Bukkit.getWorld(s[0]), this.previousPosition = new Location(Bukkit.getWorld(s[0]),