arg/scriptcraft
Archived
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix issue #214

Browse source
This commit is contained in:
walterhiggins 2015-02-19 20:24:20 +00:00
parent 869bd489bd
commit 5a82f0afa7
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/API-Reference.md
View file

@ -5295,6 +5295,9 @@ Returns the timeofday for the given world using 24 hour notation. (number of min
See http://minecraft.gamepedia.com/Day-night_cycle#Conversions See http://minecraft.gamepedia.com/Day-night_cycle#Conversions
#### Parameters
* world : the name of the world or world object for which you want to get time
### utils.find() function ### utils.find() function
The utils.find() function will return a list of all files starting at The utils.find() function will return a list of all files starting at

22
src/main/js/modules/utils/utils.js
View file

@ -76,13 +76,27 @@ Returns a World object matching the given name
***/ ***/
function _world( worldName ){ function _world( worldName ){
if (__plugin.canary){ if (__plugin.canary){
if (worldName instanceof Packages.net.canarymod.api.world.World){
return worldName;
}
var worldMgr = Canary.server.worldManager;
try { try {
return Canary.server.worldManager.getWorld( worldName, true ); if (worldName === undefined){
var worldNames = worldMgr.getLoadedWorldsNames();
worldName = worldNames[0];
}
return worldMgr.getWorld( worldName, true );
} catch (error) { } catch (error) {
console.error( 'utils.world() failed to load ' + worldName + ',Error:' + error ); console.error( 'utils.world() failed to load ' + worldName + ',Error:' + error );
} }
} }
if (__plugin.bukkit){ if (__plugin.bukkit){
if (worldName instanceof org.bukkit.World){
return worldName;
}
if (worldName === undefined){
return bkBukkit.getWorlds().get(0);
}
return bkBukkit.getWorld( worldName ); return bkBukkit.getWorld( worldName );
} }
return null; return null;
@ -427,6 +441,8 @@ See http://minecraft.gamepedia.com/Day-night_cycle#Conversions
***/ ***/
function getTime(world){ function getTime(world){
world = _world(world);
if (__plugin.bukkit){ if (__plugin.bukkit){
return world.time; return world.time;
} }
@ -450,8 +466,12 @@ Returns the timeofday for the given world using 24 hour notation. (number of min
See http://minecraft.gamepedia.com/Day-night_cycle#Conversions See http://minecraft.gamepedia.com/Day-night_cycle#Conversions
#### Parameters
* world : the name of the world or world object for which you want to get time
***/ ***/
function getTime24( world ){ function getTime24( world ){
world = _world(world); // accept world name or object or undeifned
var mcTime = getTime(world); var mcTime = getTime(world);
var mins = Math.floor( ( (mcTime + 6000) % 24000) / 16.6667 ); var mins = Math.floor( ( (mcTime + 6000) % 24000) / 16.6667 );
return mins; return mins;