From 2fad33b35d7b0dea68c08b678507b51e98ffcec5 Mon Sep 17 00:00:00 2001
From: walterhiggins <walter.higgins@gmail.com>
Date: Sat, 17 Jan 2015 09:31:14 +0000
Subject: [PATCH] fixes issue #199

---
 docs/API-Reference.md           | 35 ++++++++++++++++++++-
 src/main/js/modules/teleport.js | 54 +++++++++++++++++++++++++++++++--
 2 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/docs/API-Reference.md b/docs/API-Reference.md
index 4614d5f..dc76af7 100644
--- a/docs/API-Reference.md
+++ b/docs/API-Reference.md
@@ -400,6 +400,9 @@ Walter Higgins
    * [signs.getTargetedBy() function](#signsgettargetedby-function)
  * [Sounds Module](#sounds-module)
    * [Usage (Bukkit) :](#usage-bukkit-)
+ * [Teleport Module](#teleport-module)
+   * [Parameters](#parameters)
+   * [Example](#example-2)
  * [Utilities Module](#utilities-module)
    * [utils.player() function](#utilsplayer-function)
    * [utils.world( worldName ) function](#utilsworld-worldname--function)
@@ -456,7 +459,7 @@ Walter Higgins
    * [Administration options](#administration-options)
  * [NumberGuess mini-game:](#numberguess-mini-game)
    * [Description](#description-1)
-   * [Example](#example-2)
+   * [Example](#example-3)
  * [Cow Clicker Mini-Game](#cow-clicker-mini-game)
    * [How to Play](#how-to-play)
    * [Rules](#rules)
@@ -4820,6 +4823,36 @@ Example
 
 <p style="color:gold;font-weight:bold">Hello World</p>    
 
+## Teleport Module
+
+This module provides a function to teleport entities (Players or NPCs). 
+
+### Parameters
+
+ * entity - The player or NPC to be teleported. If of type String, then a player with that name will be teleported.
+ * destination - The location to which they should be teleported. If not of type Location but is a Player, Block or any
+   object which has a `location` property then that works too. If of type String, then it's assumed that the destination is the player with that name.
+
+### Example 
+
+The following code will teleport each player back to their spawn position.
+
+```javascript
+var teleport = require('teleport'),
+    utils = require('utils'),
+    players = utils.players(), 
+    i = 0;
+for ( ; i < players.length; i++ ) {
+  teleport( players[i], players[i].spawnPosition );
+}
+```
+
+The following code will teleport 'tom' to 'jane's location.
+
+```javascript
+var teleport = require('teleport');
+teleport('tom' , 'jane'); 
+```
 ## Utilities Module
 
 The `utils` module is a storehouse for various useful utility
diff --git a/src/main/js/modules/teleport.js b/src/main/js/modules/teleport.js
index 33acefe..d882fa9 100644
--- a/src/main/js/modules/teleport.js
+++ b/src/main/js/modules/teleport.js
@@ -1,10 +1,58 @@
-function teleport( entity, location){
+'use strict';
+/*global __plugin, org, module, require*/
+var utils = require('utils');
+/************************************************************************
+## Teleport Module
+
+This module provides a function to teleport entities (Players or NPCs). 
+
+### Parameters
+
+ * entity - The player or NPC to be teleported. If of type String, then a player with that name will be teleported.
+ * destination - The location to which they should be teleported. If not of type Location but is a Player, Block or any
+   object which has a `location` property then that works too. If of type String, then it's assumed that the destination is the player with that name.
+
+### Example 
+
+The following code will teleport each player back to their spawn position.
+
+```javascript
+var teleport = require('teleport'),
+    utils = require('utils'),
+    players = utils.players(), 
+    i = 0;
+for ( ; i < players.length; i++ ) {
+  teleport( players[i], players[i].spawnPosition );
+}
+```
+
+The following code will teleport 'tom' to 'jane's location.
+
+```javascript
+var teleport = require('teleport');
+teleport('tom' , 'jane'); 
+```
+***/
+function teleport( entity, destination){
+  if (typeof entity === 'String' || entity instanceof java.lang.String){
+    entity = utils.player(entity);
+  }
+  if (typeof destination === 'String' || destination instanceof java.lang.String){
+    var player = utils.player(destination);
+    if (player){
+      destination = player.location;
+    }
+  } else {
+    if (destination.location){
+      destination = destination.location;
+    }
+  }
   if (__plugin.bukkit){
     var bkTeleportCause = org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-    entity.teplort( location, bkTeleportCause.PLUGIN);
+    entity.teleport( destination, bkTeleportCause.PLUGIN);
   }
   if (__plugin.canary){
-    entity['teleportTo(Location)'](location);
+    entity['teleportTo(Location)'](destination);
   }
 }
 module.exports = teleport;