Merge remote branch 'upstream/master'
This commit is contained in:
commit
0b7bd72231
24 changed files with 173 additions and 49 deletions
|
|
@ -300,6 +300,7 @@ public class MapManager {
|
|||
dynmapWorld.servertime = (int)(w.getTime() % 24000);
|
||||
dynmapWorld.sendposition = worldConfiguration.getBoolean("sendposition", true);
|
||||
dynmapWorld.sendhealth = worldConfiguration.getBoolean("sendhealth", true);
|
||||
dynmapWorld.bigworld = worldConfiguration.getBoolean("bigworld", false);
|
||||
if(loclist != null) {
|
||||
for(ConfigurationNode loc : loclist) {
|
||||
Location lx = new Location(w, loc.getDouble("x", 0), loc.getDouble("y", 64), loc.getDouble("z", 0));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue