Merge pull request #6 from tylermurphy534/dev

merge fix

1 files changed, 14 insertions, 26 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/Store.java b/src/main/java/net/tylermurphy/hideAndSeek/Store.java
index 05122b3..85cef2a 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/Store.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/Store.java
@@ -1,33 +1,37 @@
 package net.tylermurphy.hideAndSeek;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
+import org.bukkit.ChatColor;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.scoreboard.Team;
 import org.bukkit.util.Vector;
 
-import net.md_5.bungee.api.ChatColor;
-
 public class Store {
 
 	public static Map<String,Player> playerList = new HashMap<String,Player>();
-	public static List<String> loadedPlayers = new ArrayList<String>();
-	public static Scoreboard board;
+	
+	public static Scoreboard board;	
 	public static Team Hider,Seeker,Spectator;
+	
 	public static String status = "Setup";
+	
 	public static String messagePrefix = String.format("%sHide and Seek > %s", ChatColor.BLUE, ChatColor.WHITE);
 	public static String errorPrefix = String.format("%sError > %s", ChatColor.RED, ChatColor.WHITE);
-	public static Vector spawnPosition,worldborderPosition;
+	
+	public static Vector spawnPosition;
+	
+	public static Vector worldborderPosition;
 	public static int worldborderSize,worldborderDelay,currentWorldborderSize;
 	public static boolean worldborderEnabled = false, decreaseBorder = false;
+	
 	public static String tauntPlayer = "";
-	public static HashMap<String,Integer> playerData = new HashMap<String,Integer>();
-	public static int startTaskId;
+	
+	public static int glowTime = 0;
+	
 	public static int gameId = 0;
 	
 	public static FileConfiguration getConfig() {
@@ -38,20 +42,4 @@ public class Store {
 		Main.plugin.saveConfig();
 	}
 	
-	public static int getPlayerData(String playerName, String key) {
-		if(playerData.get(playerName + " " + key) == null) {
-			return 0;
-		} else {
-			return playerData.get(playerName + " " + key);
-		}
-	}
-	
-	public static void setPlayerData(String playerName, String key, int value) {
-		playerData.put(playerName + " " + key, value);
-	}
-	
-	public static void resetPlayerData(String playerName, boolean giveItems) {
-		playerData.put(playerName+" Death", 0);
-		playerData.put(playerName+" GiveStatus", (giveItems) ? 1 : 0);
-	}
-}
+}
\ No newline at end of file