Merge pull request #74 from Ben12345rocks/2.8.3

2.8.3

Author: BenCodez

AdvancedCore/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>AdvancedCore</artifactId>
-	<version>2.8.2</version>
+	<version>2.8.3</version>
 	<packaging>jar</packaging>
 	<name>AdvancedCore</name>
 	<properties>

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java

@@ -1507,7 +1507,7 @@ public void playSound(User user) {
 	 *            placeholders
 	 */
 	public void runCommands(User user, HashMap<String, String> placeholders) {
-		MiscUtils.getInstance().executeConsoleCommands(user.getPlayer(), getConsoleCommands(), placeholders);
+		MiscUtils.getInstance().executeConsoleCommands(user.getPlayerName(), getConsoleCommands(), placeholders);
 
 		user.preformCommand(getPlayerCommands(), placeholders);
 	}

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Javascript/JavascriptEngine.java

@@ -8,6 +8,7 @@
 import javax.script.ScriptException;
 
 import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -103,4 +104,21 @@ public String getStringValue(String expression) {
 		}
 		return "";
 	}
+
+	public JavascriptEngine addPlayer(OfflinePlayer player) {
+		addToEngine("Player", player);
+		addToEngine("PlayerName", player.getName());
+		addToEngine("PlayerUUID", player.getUniqueId().toString());
+		addToEngine("AdvancedCoreUser", UserManager.getInstance().getUser(player));
+		addToEngine("CommandSender", player);
+
+		for (JavascriptPlaceholderRequest request : AdvancedCoreHook.getInstance().getJavascriptEngineRequests()) {
+			addToEngine(request.getStr(), request.getObject(player));
+		}
+		
+		if (player.isOnline()) {
+			return addPlayer(player.getPlayer());
+		}
+		return this;
+	}
 }

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Javascript/JavascriptPlaceholderRequest.java

@@ -1,6 +1,6 @@
 package com.Ben12345rocks.AdvancedCore.Util.Javascript;
 
-import org.bukkit.entity.Player;
+import org.bukkit.OfflinePlayer;
 
 public abstract class JavascriptPlaceholderRequest {
 
@@ -10,7 +10,7 @@ public JavascriptPlaceholderRequest(String str) {
 		this.str = str;
 	}
 
-	public abstract Object getObject(Player player);
+	public abstract Object getObject(OfflinePlayer player);
 
 	/**
 	 * @return the str

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/ArrayUtils.java

@@ -11,6 +11,7 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -408,6 +409,14 @@ public ArrayList<String> replaceJavascript(Player player, ArrayList<String> list
 		}
 		return msg;
 	}
+	
+	public ArrayList<String> replaceJavascript(OfflinePlayer player, ArrayList<String> list) {
+		ArrayList<String> msg = new ArrayList<String>();
+		for (String str : list) {
+			msg.add(StringUtils.getInstance().replaceJavascript(player, str));
+		}
+		return msg;
+	}
 
 	public ArrayList<String> replacePlaceHolder(ArrayList<String> list, HashMap<String, String> placeholders) {
 		ArrayList<String> newList = new ArrayList<String>();

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java

@@ -91,6 +91,25 @@ public void run() {
 		}
 	}
 
+	@SuppressWarnings("deprecation")
+	public void executeConsoleCommands(final String playerName, final ArrayList<String> cmds,
+			final HashMap<String, String> placeholders) {
+		if (cmds != null && !cmds.isEmpty()) {
+			placeholders.put("player", playerName);
+			final ArrayList<String> commands = ArrayUtils.getInstance().replaceJavascript(Bukkit.getOfflinePlayer(playerName),
+					ArrayUtils.getInstance().replacePlaceHolder(cmds, placeholders));
+			Bukkit.getScheduler().runTask(plugin.getPlugin(), new Runnable() {
+
+				@Override
+				public void run() {
+					for (String cmd : commands) {
+						Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), cmd);
+					}
+				}
+			});
+		}
+	}
+
 	public void executeConsoleCommands(Player player, String command, HashMap<String, String> placeholders) {
 		if (command != null && !command.isEmpty()) {
 			final String cmd = StringUtils.getInstance().replaceJavascript(player,

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/StringUtils.java

@@ -5,6 +5,7 @@
 import java.util.Map.Entry;
 import java.util.regex.Pattern;
 
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -115,6 +116,11 @@ public String replaceJavascript(Player player, String text) {
 		JavascriptEngine engine = new JavascriptEngine().addPlayer(player);
 		return replaceJavascript(replacePlaceHolders(player, text), engine);
 	}
+	
+	public String replaceJavascript(OfflinePlayer player, String text) {
+		JavascriptEngine engine = new JavascriptEngine().addPlayer(player);
+		return replaceJavascript(text, engine);
+	}
 
 	public String replaceJavascript(String text) {
 		return replaceJavascript(text, null);