From 7b5e833b18af4226b168197c2445d02ee36f9a17 Mon Sep 17 00:00:00 2001
From: Jos van 't Hof <josvth@live.nl>
Date: Sun, 15 Apr 2012 12:42:14 +0200
Subject: [PATCH] Removed meta data storage since it's not persistent. Now
 simply using setBedSpawnLocation(),

---
 .../RandomSpawn/Listeners/JoinListener.java   | 25 ++-----------------
 .../Listeners/RespawnListener.java            |  7 +++---
 .../RandomSpawn/Listeners/SignListener.java   |  2 +-
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Listeners/JoinListener.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Listeners/JoinListener.java
index b60c40595..0bea55163 100644
--- a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Listeners/JoinListener.java	
+++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Listeners/JoinListener.java	
@@ -32,14 +32,7 @@ public class JoinListener implements Listener{
 		String worldName = world.getName();
 
 		if(world.getEnvironment().equals(Environment.NETHER) || world.getEnvironment().equals(Environment.THE_END)) return;
-		
-		if(!player.hasMetadata(worldName + ".spawn")
-				&& plugin.yamlHandler.worlds.getBoolean(worldName + ".keeprandomspawns",false)
-				&& plugin.yamlHandler.spawnLocations.contains(worldName + "." + playerName)
-				){
-			migrateMetaData(player, world);
-		}
-		
+				
 		File file = new File(world.getWorldFolder() + File.separator + "players" + File.separator + player.getName() + ".dat");
 
 		if(file.exists()) return;
@@ -68,7 +61,7 @@ public class JoinListener implements Listener{
 			player.setNoDamageTicks(plugin.yamlHandler.config.getInt("nodamagetime",5)*20);
 			
 			if (plugin.yamlHandler.worlds.getBoolean(worldName + ".keeprandomspawns",false)){
-				plugin.setPlayerSpawn(player, spawnLocation);
+				player.setBedSpawnLocation(spawnLocation);
 			}
 				
 			if (plugin.yamlHandler.config.getString("messages.randomspawned") != null){
@@ -78,20 +71,6 @@ public class JoinListener implements Listener{
 		}			
 	}
 	
-	private void migrateMetaData(Player player, World world) {
-		
-		String playerName = player.getName();
-		String worldName = world.getName();
-		
-		plugin.logDebug("(JoinListener) Migrating spawnlocation of '" + playerName + "' to metadata format!");
-		
-		double x = this.plugin.yamlHandler.spawnLocations.getDouble(worldName + "." + playerName + ".x");
-		double y = this.plugin.yamlHandler.spawnLocations.getDouble(worldName + "." + playerName + ".y");
-		double z = this.plugin.yamlHandler.spawnLocations.getDouble(worldName + "." + playerName + ".z");
-		
-		plugin.setPlayerSpawn(player, new Location(world,x,y,z));
-	}
-
 	private Location getFirstSpawn(World world) {
 		String worldName = world.getName();
 
diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Listeners/RespawnListener.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Listeners/RespawnListener.java
index 1eb00afb6..99ecdfb61 100644
--- a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Listeners/RespawnListener.java	
+++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Listeners/RespawnListener.java	
@@ -41,9 +41,8 @@ public class RespawnListener implements Listener{
 			return; 
 		}
 		
-		if (plugin.yamlHandler.worlds.getBoolean(worldName + ".keeprandomspawns", false) && 
-				player.hasMetadata(player.getWorld().getName() + ".spawn")){
-			event.setRespawnLocation(plugin.getPlayerSpawn(player, world));
+		if (plugin.yamlHandler.worlds.getBoolean(worldName + ".keeprandomspawns", false)){
+			event.setRespawnLocation(player.getBedSpawnLocation());
 			plugin.logDebug(playerName + " is spawned at his saved spawn.");
 			return;
 		}
@@ -59,7 +58,7 @@ public class RespawnListener implements Listener{
 			player.setNoDamageTicks(plugin.yamlHandler.config.getInt("nodamagetime",5)*20);
 			
 			if (plugin.yamlHandler.worlds.getBoolean(worldName + ".keeprandomspawns",false)){
-				plugin.setPlayerSpawn(player, spawnLocation);
+				player.setBedSpawnLocation(spawnLocation);
 			}
 
 			if (plugin.yamlHandler.config.getString("messages.randomspawned") != null){
diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Listeners/SignListener.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Listeners/SignListener.java
index cbac08d09..6645b689e 100644
--- a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Listeners/SignListener.java	
+++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Listeners/SignListener.java	
@@ -43,7 +43,7 @@ public class SignListener implements Listener {
 						player.setNoDamageTicks(plugin.yamlHandler.config.getInt("nodamagetime",5)*20);
 						
 						if (plugin.yamlHandler.worlds.getBoolean(world.getName() + ".keeprandomspawns",false)){
-							plugin.setPlayerSpawn(player, spawnLocation);
+							player.setBedSpawnLocation(spawnLocation);
 						}
 						
 					}else{