diff --git a/build.xml b/build.xml index a213127..267caa7 100644 --- a/build.xml +++ b/build.xml @@ -2,6 +2,7 @@ Builds the scriptcraft.jar file - a plugin for bukkit + @@ -25,14 +26,19 @@ - + + debug="true"> + + + + + + + @@ -189,7 +195,7 @@ Walter Higgins - + diff --git a/lib/bukkit-1.7.9-R0.2.jar b/lib/bukkit-1.7.9-R0.2.jar new file mode 100644 index 0000000..c9fc31a Binary files /dev/null and b/lib/bukkit-1.7.9-R0.2.jar differ diff --git a/src/main/js/lib/canary.js b/src/main/js/lib/canary.js new file mode 100644 index 0000000..1a54e6b --- /dev/null +++ b/src/main/js/lib/canary.js @@ -0,0 +1,3 @@ +module.exports = function( container ) { + +}; diff --git a/src/main/js/modules/utils/utils.js b/src/main/js/modules/utils/utils.js index db214ba..ec7fd57 100644 --- a/src/main/js/modules/utils/utils.js +++ b/src/main/js/modules/utils/utils.js @@ -724,7 +724,7 @@ all of Javascript's Array goodness. var worlds = utils.array(server.worlds); ***/ -exports.array = function( ){ +function toArray( ){ var result = [], javaArray = null, i = 0; @@ -745,7 +745,17 @@ exports.array = function( ){ } } return result; -}; +} +exports.array = toArray; + +function canaryWorlds(){ + return toArray( server.worlds ); +} +function bukkitWorlds(){ + return toArray( server.worldManager.allWorlds ); +} +exports.worlds = __plugin.canary ? canaryWorlds : bukkitWorlds; + /************************************************************************* ### utils.players() function