Merge pull request #75 from Ben12345rocks/2.8.4

2.8.4
BenCodez · Jul 23, 2017 · 6d66144 · 6d66144
2 parents 85319b1 + 37b5230
commit 6d66144
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 6 deletions.
diff --git a/AdvancedCore/pom.xml b/AdvancedCore/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>AdvancedCore</artifactId>
-	<version>2.8.3</version>
+	<version>2.8.4</version>
 	<packaging>jar</packaging>
 	<name>AdvancedCore</name>
 	<properties>
@@ -179,7 +179,7 @@
 		<dependency>
 			<groupId>com.github.Ben12345rocks</groupId>
 			<artifactId>ChatComponentAPI</artifactId>
-			<version>LATEST</version>
+			<version>master-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>

diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/CommandLoader.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/CommandLoader.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 
+import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -11,7 +12,9 @@
 import com.Ben12345rocks.AdvancedCore.Commands.GUI.UserGUI;
 import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
 import com.Ben12345rocks.AdvancedCore.Objects.Reward;
+import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
 import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Objects.UUID;
 import com.Ben12345rocks.AdvancedCore.Objects.User;
 import com.Ben12345rocks.AdvancedCore.Objects.UserStorage;
 import com.Ben12345rocks.AdvancedCore.Report.Report;
@@ -62,6 +65,35 @@ public void addPermission(String perm) {
 
 	public ArrayList<CommandHandler> getBasicAdminCommands(String permPrefix) {
 		ArrayList<CommandHandler> cmds = new ArrayList<CommandHandler>();
+		cmds.add(new CommandHandler(new String[] { "GiveAll", "(reward)" }, permPrefix + ".GiveAll",
+				"Give all users a reward") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				Reward reward = RewardHandler.getInstance().getReward(args[1]);
+				ArrayList<User> users = new ArrayList<User>();
+				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+					User user = UserManager.getInstance().getUser(new UUID(uuid));
+					users.add(user);
+				}
+				for (User user : users) {
+					new RewardBuilder(reward).send(user);
+				}
+			}
+		});
+
+		cmds.add(new CommandHandler(new String[] { "GiveAllOnline", "(reward)" }, permPrefix + ".GiveAllOnline",
+				"Give all users a reward") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				Reward reward = RewardHandler.getInstance().getReward(args[1]);
+				for (Player p : Bukkit.getOnlinePlayers()) {
+					User user = UserManager.getInstance().getUser(p);
+					new RewardBuilder(reward).send(user);
+				}
+			}
+		});
 		cmds.add(new CommandHandler(new String[] { "GiveReward", "(Reward)", "(Player)" }, permPrefix + ".GiveReward",
 				"Give a player a reward file", true) {
 

diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/ServerHandle/CraftBukkitHandle.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/ServerHandle/CraftBukkitHandle.java
@@ -3,18 +3,18 @@
 import org.bukkit.entity.Player;
 
 import net.md_5.bungee.api.chat.BaseComponent;
-import net.pl3x.bukkit.chatapi.ComponentSender;
 
 public class CraftBukkitHandle implements IServerHandle {
 
 	@Override
 	public void sendMessage(Player player, BaseComponent component) {
-		ComponentSender.sendMessage(player, component);
-
+		player.sendMessage(component.toPlainText());
 	}
 
 	@Override
 	public void sendMessage(Player player, BaseComponent... components) {
-		ComponentSender.sendMessage(player, components);
+		for (BaseComponent comp : components) {
+			sendMessage(player, comp);
+		}
 	}
 }