From 446ba9ad7bf4b83ddcadcb28b66f948f09baf340 Mon Sep 17 00:00:00 2001
From: walterhiggins <walter.higgins@gmail.com>
Date: Sat, 26 Jan 2013 13:47:16 +0000
Subject: [PATCH] changed  to  and tweaked tabcomplete

---
 README.md                                | 2 +-
 src/main/javascript/core/_primitives.js  | 2 +-
 src/main/javascript/core/_scriptcraft.js | 4 ++--
 src/main/javascript/drone/drone.js       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2e3a352..7bcff9d 100644
--- a/README.md
+++ b/README.md
@@ -97,7 +97,7 @@ the Bukkit ScriptCraft plugin...
 
  * `__plugin` - the ScriptCraft Plugin itself. This is a useful starting point for accessing other Bukkit objects. The `__plugin` object is of type [org.bukkit.plugin.java.JavaPlugin][api] and all of its properties and methods are accessible. For example... `js __plugin.server.motd` returns the server's message of the day (javascript is more concise than the equivalent java code: __plugin.getServer().getMotd() ).
  * `self` - The player/command-block or server console operator who invoked the js command. Again, this is a good jumping off point for diving into the Bukkit API.
- * `bukkit` - The top-level Bukkit object. See the [Bukkit API docs][bukapi] for reference.
+ * `server` - The top-level org.bukkit.Server object. See the [Bukkit API docs][bukapi] for reference.
 
 [dl]: http://walterhiggins.net/blog/files/scriptcraft/
 [api]: http://jd.bukkit.org/apidocs/org/bukkit/plugin/java/JavaPlugin.html
diff --git a/src/main/javascript/core/_primitives.js b/src/main/javascript/core/_primitives.js
index 93207aa..6341432 100644
--- a/src/main/javascript/core/_primitives.js
+++ b/src/main/javascript/core/_primitives.js
@@ -56,7 +56,7 @@ var global = this;
             throw new Error("Invalid Parameter: blockId must be 63 or 68");
         putBlock(x,y,z,blockId,meta);
         var block = _getBlockObject(x,y,z);
-        state = block.state;
+        var state = block.state;
         if (state instanceof org.bukkit.block.Sign){
             for (var i = 0;i < texts.length; i++)
                 state.setLine(i%4,texts[i]);
diff --git a/src/main/javascript/core/_scriptcraft.js b/src/main/javascript/core/_scriptcraft.js
index cc4273e..87848b5 100644
--- a/src/main/javascript/core/_scriptcraft.js
+++ b/src/main/javascript/core/_scriptcraft.js
@@ -23,7 +23,7 @@ var verbose = verbose || false;
 /*
   wph 20130124 - make self, plugin and bukkit public - these are far more useful now that tab-complete works.
 */
-var bukkit = org.bukkit.Bukkit;
+var server = org.bukkit.Bukkit.server;
 //
 // private implementation
 //
@@ -241,7 +241,7 @@ var bukkit = org.bukkit.Bukkit;
                 for (var j = 0;j < _javaLangObjectMethods.length; j++)
                     if (_javaLangObjectMethods[j] == i)
                         continue propertyLoop;
-                if (typeof o[i] == "function")
+                if (typeof o[i] == "function" )
                     result.push(i+"()");
                 else
                     result.push(i);
diff --git a/src/main/javascript/drone/drone.js b/src/main/javascript/drone/drone.js
index 68e8b4c..67fa155 100644
--- a/src/main/javascript/drone/drone.js
+++ b/src/main/javascript/drone/drone.js
@@ -341,7 +341,7 @@ var Drone = Drone || {
         }
         var bm = _getBlockIdAndMeta(block);
         block = bm[0];
-        meta = bm[1];
+        var meta = bm[1];
         if (block != 63 && block != 68){
             print("ERROR: Invalid block id for use in signs");
             return;
@@ -653,7 +653,7 @@ var Drone = Drone || {
                 return [parseInt(bs),0];
             }
             b = parseInt(bs.substring(0,sp));
-            md = parseInt(bs.substring(sp+1,bs.length));
+            var md = parseInt(bs.substring(sp+1,bs.length));
             return [b,md];
         }else{
             return [b,0];