From 55563a090e0fcc6bd6e0bc8a6573f4b1f16c9327 Mon Sep 17 00:00:00 2001
From: walterhiggins <walter.higgins@gmail.com>
Date: Mon, 21 Oct 2013 20:24:29 +0100
Subject: [PATCH] added version to plugin.yml

---
 build.properties                         |  2 +-
 build.xml                                | 43 +++++++++++-------------
 src/main/javascript/core/_primitives.js  |  6 +++-
 src/main/javascript/core/_scriptcraft.js | 13 ++++++-
 src/main/javascript/drone/drone.js       |  1 +
 5 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/build.properties b/build.properties
index 27e9f1b..f7c14f9 100644
--- a/build.properties
+++ b/build.properties
@@ -1 +1 @@
-bukkit-version=1.4.7
+bukkit-version=1.6.4
diff --git a/build.xml b/build.xml
index 98cb1eb..7640914 100644
--- a/build.xml
+++ b/build.xml
@@ -1,12 +1,18 @@
 <project name="scriptcraft" default="package" basedir=".">
   <property file="build.properties"/>
-  <description>Builds the scriptcraft.jar file - a plugin for bukkit
-  </description>
+  <description>Builds the scriptcraft.jar file - a plugin for bukkit</description>
   <property name="src" location="src/main/java"/>
   <property name="build" location="target/classes"/>
   <property name="dist" location="target/" />
   <property name="minecraft.dir" location="${dist}/minecraft" />
-
+  <property name="http.agent" value="'Walter'" />
+  <target name="testy">
+    <echo message="${http.agent}"/>
+    <get src="http://dl.bukkit.org/api/1.0/downloads/projects/CraftBukkit/?_accept=application/xml"
+         verbose="true"
+         httpusecaches="false"
+         dest="${minecraft.dir}/waltbukkit.xml" />
+  </target>
   <target name="init">
     <property file="build.local.properties"/>
     <tstamp>
@@ -23,9 +29,10 @@
           unless="minecraft.present">
     <mkdir dir="${minecraft.dir}" />
     
-    <echo>Retrieving CraftBukkit artifact info
-    </echo>
-    <get src="http://dl.bukkit.org/api/1.0/downloads/projects/CraftBukkit?_accept=application/xml"
+    <echo>Retrieving CraftBukkit artifact info</echo>
+    <get src="http://dl.bukkit.org/api/1.0/downloads/projects/CraftBukkit/?_accept=application/xml"
+         verbose="true"
+         httpusecaches="false"
          dest="${minecraft.dir}/bukkit.xml" />
 
     <xslt in="${minecraft.dir}/bukkit.xml"
@@ -33,27 +40,20 @@
           style="build/bukkit-to-url.xsl"/>
     <xmlproperty file="${minecraft.dir}/ant.properties.xml" keeproot="true"/>
 
-    <echo>Retrieving CraftBukkit jar
-    </echo>
+    <echo>Retrieving CraftBukkit jar</echo>
     <get src="${bukkit.url}"
          dest="${minecraft.dir}/craftbukkit.jar"
          verbose="true"/>
 
-    <echo>Creating default ops.txt for your user
-    </echo>
+    <echo>Creating default ops.txt for your user</echo>
     <echo message="${op.name}" file="${minecraft.dir}/ops.txt" />
    
   </target>
 
 
   <target name="run" depends="server-setup, package, update-live-cb" description="Starts Bukkit with ScriptCraft">
-    <echo>Starting Bukkit with ScriptCraft
-    </echo>
-    <java jar="${minecraft.dir}/craftbukkit.jar"
-          maxmemory="1024m"
-          fork="true"
-          dir="${minecraft.dir}"
-        />
+    <echo>Starting Bukkit with ScriptCraft</echo>
+    <java jar="${minecraft.dir}/craftbukkit.jar" maxmemory="1024m" fork="true" dir="${minecraft.dir}" />
   </target>
   
   <target name="compile" depends="init, server-setup" description="compile bukkit plugin source">
@@ -72,8 +72,7 @@
   </target>
 
   <target name="coffeescript_setup" depends="init" description="Gets latest coffeescript compiler">
-    <echo>Retrieving Coffeescript compiler
-    </echo>
+    <echo>Retrieving Coffeescript compiler</echo>
     <mkdir dir="${build}/coffeescript/core" />
     <get src="https://raw.github.com/jashkenas/coffee-script/master/extras/coffee-script.js"
          dest="${build}/coffeescript/core/_coffeescript.js"/>     
@@ -86,14 +85,12 @@
     </zip>
   </target>
 
-  <target name="package" depends="gendocs,zip_js,compile" 
-          description="generate the distribution" >
+  <target name="package" depends="gendocs,zip_js,compile" description="generate the distribution" >
     <!-- ensure plugin.yml is always copied -->
     <delete file="${build}/plugin.yml" />
     <copy file="src/main/resources/plugin.yml" todir="${build}"/>
     <replace file="${build}/plugin.yml" value="${bukkit-version}-${DSTAMP}">
-      <replacetoken>[[version]]
-      </replacetoken>
+      <replacetoken>[[version]]</replacetoken>
     </replace>
     
     <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
diff --git a/src/main/javascript/core/_primitives.js b/src/main/javascript/core/_primitives.js
index 1ba6f78..27590a1 100644
--- a/src/main/javascript/core/_primitives.js
+++ b/src/main/javascript/core/_primitives.js
@@ -131,5 +131,9 @@ var global = this;
     global.putSign = _putSign;
     global.notifyAdministrators = _notifyAdministrators;
     global.echo = _echo;
-    
+    /*
+      wph 20131020 - add 'alert' - behaves just like echo. For programmers familiar with browser-based js
+     */
+    global.alert = _echo;
+
 }());
diff --git a/src/main/javascript/core/_scriptcraft.js b/src/main/javascript/core/_scriptcraft.js
index e012e8b..e2550e2 100644
--- a/src/main/javascript/core/_scriptcraft.js
+++ b/src/main/javascript/core/_scriptcraft.js
@@ -548,6 +548,7 @@ var server = org.bukkit.Bukkit.server;
         return result;
     };
     var _javaLangObjectMethods = ["equals","getClass","class","getClass","hashCode","notify","notifyAll","toString","wait","clone","finalize"];
+    
     var _getProperties = function(o)
     {
         var result = [];
@@ -563,7 +564,17 @@ var server = org.bukkit.Bukkit.server;
                 for (var j = 0;j < _javaLangObjectMethods.length; j++)
                     if (_javaLangObjectMethods[j] == i)
                         continue propertyLoop;
-                if (typeof o[i] == "function" )
+                var typeofProperty = null;
+                try { 
+                    typeofProperty = typeof o[i];
+                }catch( e ){
+                    if (e.message == "java.lang.IllegalStateException: Entity not leashed"){
+                        // wph 20131020 fail silently for Entity leashing in craftbukkit
+                    }else{
+                        throw e;
+                    }
+                }
+                if (typeofProperty == "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 590ec11..463a2fb 100644
--- a/src/main/javascript/drone/drone.js
+++ b/src/main/javascript/drone/drone.js
@@ -783,6 +783,7 @@ Used when placing torches so that they face towards the drone.
             return result;
         };
     };
+
 /**************************************************************************
 Drone.times() Method
 ====================