ChromaGaming/AliPresents
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity

Started Work on Dungeons #43

Merged
alisolarflare merged 7 commits from Dungeons into master 2016-12-24 07:39:43 +00:00
Conversation 0 Commits 7 Files changed 13 +18 -8
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b9219413f6 - Show all commits

26
src/buttondevteam/alipresents/components/dungeons/dungeons/GenericDungeonA1.java
View file

@ -22,15 +22,24 @@ public class GenericDungeonA1 extends Dungeon{
plugin.getServer().broadcastMessage("Available Worlds... " + plugin.getServer().getWorlds().toString()); plugin.getServer().broadcastMessage("Available Worlds... " + plugin.getServer().getWorlds().toString());
return false; return false;
}*/ }*/
if ((entrance = loadLocation(plugin, "dungeons.dungeona1.enter")) == null){ Location temp;
if(plugin.getServer().getWorld("Dungeons") != null){ if ((temp = loadLocation(plugin, "dungeons.dungeona1.enter")) != null){
entrance = new Location(plugin.getServer().getWorld("Dungeons"), -7.5, 138.0, -91.5); entrance = temp;
} }else if(plugin.getServer().getWorld("Dungeons") != null){
entrance = new Location(plugin.getServer().getWorld("Dungeons"), -7.5, 138.0, -91.5);
}else{
plugin.getServer().broadcastMessage("There is no working default dungeon entrance for A1, setting to null");
entrance = null;
} }
if ((exit = loadLocation(plugin, "dungeons.dungeona1.exit")) == null){
if (plugin.getServer().getWorld("world") != null){ temp = null;
exit = plugin.getServer().getWorld("world").getSpawnLocation().clone(); if ((temp = loadLocation(plugin, "dungeons.dungeona1.exit")) != null){
} exit = temp;
}else if (plugin.getServer().getWorld("world") != null){
exit = plugin.getServer().getWorld("world").getSpawnLocation().clone();
}else{
plugin.getServer().broadcastMessage("There is no working default dungeon exit for A1, setting to null");
exit = null;
} }
if (entrance == null || exit == null){ if (entrance == null || exit == null){
@ -72,6 +81,7 @@ public class GenericDungeonA1 extends Dungeon{
double x = plugin.getConfig().getDouble(path+".x"); double x = plugin.getConfig().getDouble(path+".x");
double y = plugin.getConfig().getDouble(path+".y"); double y = plugin.getConfig().getDouble(path+".y");
double z = plugin.getConfig().getDouble(path+".z"); double z = plugin.getConfig().getDouble(path+".z");
return new Location(world, x, y, z); return new Location(world, x, y, z);
}catch(Exception e){ }catch(Exception e){
e.printStackTrace(); e.printStackTrace();