3
0
Fork 0
This commit is contained in:
BuildTools 2019-02-18 19:50:58 +01:00
parent f9100dd560
commit 8856ebe077
6 changed files with 12 additions and 6 deletions

View file

@ -11,7 +11,7 @@
<groupId>me.paradoxpixel</groupId> <groupId>me.paradoxpixel</groupId>
<artifactId>themepark</artifactId> <artifactId>themepark</artifactId>
<version>1.2</version> <version>1.2.2</version>
<dependencies> <dependencies>
<dependency> <dependency>

View file

@ -11,6 +11,9 @@ public class LocationUtils {
return null; return null;
World world = location.getWorld(); World world = location.getWorld();
if(world == null)
return null;
double x = location.getX(); double x = location.getX();
double y = location.getY(); double y = location.getY();
double z = location.getZ(); double z = location.getZ();
@ -31,6 +34,9 @@ public class LocationUtils {
return null; return null;
World world = Bukkit.getWorld(args[0]); World world = Bukkit.getWorld(args[0]);
if(world == null)
return null;
double x = Double.parseDouble(args[1]); double x = Double.parseDouble(args[1]);
double y = Double.parseDouble(args[2]); double y = Double.parseDouble(args[2]);
double z = Double.parseDouble(args[3]); double z = Double.parseDouble(args[3]);

View file

@ -273,7 +273,7 @@ public class ThemeParkCommand extends BukkitCommand {
String id = args[1]; String id = args[1];
if(!API.isAttraction(id)) { if(!API.isAttraction(id)) {
String message = Message.getMessage("attraction.no"); String message = Message.getMessage("attraction.not");
message = message.replace("{id}", id); message = message.replace("{id}", id);
sender.sendMessage(Utils.color(message)); sender.sendMessage(Utils.color(message));
return true; return true;
@ -302,7 +302,7 @@ public class ThemeParkCommand extends BukkitCommand {
String id = args[1]; String id = args[1];
if (!API.isAttraction(id)) { if (!API.isAttraction(id)) {
String message = Message.getMessage("attraction.no"); String message = Message.getMessage("attraction.not");
message = message.replace("{id}", id); message = message.replace("{id}", id);
sender.sendMessage(Utils.color(message)); sender.sendMessage(Utils.color(message));
return true; return true;

View file

@ -46,7 +46,7 @@ public class YamlConfig {
} }
public void reload() { public void reload() {
if(file == null) { if(file == null || !file.exists()) {
load(); load();
return; return;
} }

View file

@ -25,7 +25,7 @@ status:
attraction: attraction:
notfound: "&4No attractions found" notfound: "&4No attractions found"
list: "&6ID: &f{id} &6Name: &f{name} &6Region: &f{region} &6Status: &f{status}" list: "&6ID: &f{id} &6Name: &f{name} &6Region: &f{region} &6Status: &f{status}"
no: "{prefix} &4There is no attraction with ID: {id}" not: "{prefix} &4There is no attraction with ID: {id}"
nostatus: "{prefix} &4Attraction: {name} &4has no status named: {status}" nostatus: "{prefix} &4Attraction: {name} &4has no status named: {status}"
changed: changed:
status: status:

View file

@ -1,5 +1,5 @@
name: ThemePark name: ThemePark
version: 1.2 version: 1.2.2
main: me.paradoxpixel.themepark.ThemeParkPlugin main: me.paradoxpixel.themepark.ThemeParkPlugin
author: ParadoxPixel author: ParadoxPixel
commands: commands: