Inital extra bed commit with back-compatibility

.gitattributes

@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

.travis.yml

@@ -1,5 +1,5 @@
-language: java
-jdk:
-  - oraclejdk6
-notifications:
+language: java
+jdk:
+  - oraclejdk6
+notifications:
   email: false

src/main/java/com/onarandombox/MultiverseCore/destination/BedDestination.java

@@ -9,8 +9,11 @@
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
+
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -21,6 +24,8 @@
  */
 public class BedDestination implements MVDestination {
 
+	public static final String OLD_BED_STRING = "b:playerbed";
+	private String playername = "";
     private boolean isValid;
     private Location knownBedLoc;
     private MultiverseCore plugin;
@@ -38,8 +43,18 @@ public String getIdentifier() {
      */
     @Override
     public boolean isThisType(JavaPlugin plugin, String destination) {
-        String[] split = destination.split(":");
-        this.isValid = split.length >= 1 && split.length <= 2 && split[0].equals(this.getIdentifier());
+    	boolean backwardsCompat = (destination == OLD_BED_STRING);
+
+    	String[] split = destination.split(":");
+        boolean validFormat = split.length >= 1 && split.length <= 2 && split[0].equals(this.getIdentifier());
+
+        OfflinePlayer p = Bukkit.getOfflinePlayer(split[1]);
+        boolean validPlayer = (p != null);
+
+        if(validFormat && validPlayer) this.playername = p.getName();
+
+        this.isValid = backwardsCompat || (validFormat && validPlayer);
+
         return this.isValid;
     }
 
@@ -49,9 +64,13 @@ public boolean isThisType(JavaPlugin plugin, String destination) {
     @Override
     public Location getLocation(Entity entity) {
         if (entity instanceof Player) {
-            this.knownBedLoc = this.plugin.getBlockSafety().getSafeBedSpawn(((Player) entity).getBedSpawnLocation());
-            if (this.knownBedLoc == null) {
-                ((Player) entity).sendMessage("Your bed was " + ChatColor.RED + "invalid or blocked" + ChatColor.RESET + ". Sorry.");
+        	if (this.playername.isEmpty()){
+        		this.knownBedLoc = this.plugin.getBlockSafety().getSafeBedSpawn(((Player) entity).getBedSpawnLocation());
+        	}else{
+        		this.knownBedLoc = this.plugin.getBlockSafety().getSafeBedSpawn(Bukkit.getOfflinePlayer(this.playername).getBedSpawnLocation());
+        	}
+        	if (this.knownBedLoc == null) {
+                ((Player) entity).sendMessage("The bed was " + ChatColor.RED + "invalid or blocked" + ChatColor.RESET + ". Sorry.");
             }
             return this.knownBedLoc;
         }
@@ -120,6 +139,11 @@ public boolean useSafeTeleporter() {
 
     @Override
     public String toString() {
-        return "b:playerbed";
+    	if(this.playername.isEmpty()) {
+    		return "b:playerbed";
+    	}else{
+    		return "b:"+this.playername;
+    	}
+
     }
 }