Skip to content

Commit 6d66144

Browse files
authored
Merge pull request #75 from Ben12345rocks/2.8.4
2.8.4
2 parents 85319b1 + 37b5230 commit 6d66144

File tree

3 files changed

+38
-6
lines changed

3 files changed

+38
-6
lines changed

AdvancedCore/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.Ben12345rocks</groupId>
55
<artifactId>AdvancedCore</artifactId>
6-
<version>2.8.3</version>
6+
<version>2.8.4</version>
77
<packaging>jar</packaging>
88
<name>AdvancedCore</name>
99
<properties>
@@ -179,7 +179,7 @@
179179
<dependency>
180180
<groupId>com.github.Ben12345rocks</groupId>
181181
<artifactId>ChatComponentAPI</artifactId>
182-
<version>LATEST</version>
182+
<version>master-SNAPSHOT</version>
183183
<scope>compile</scope>
184184
</dependency>
185185
<dependency>

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/CommandLoader.java

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.ArrayList;
44

5+
import org.bukkit.Bukkit;
56
import org.bukkit.command.CommandSender;
67
import org.bukkit.entity.Player;
78

@@ -11,7 +12,9 @@
1112
import com.Ben12345rocks.AdvancedCore.Commands.GUI.UserGUI;
1213
import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
1314
import com.Ben12345rocks.AdvancedCore.Objects.Reward;
15+
import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
1416
import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
17+
import com.Ben12345rocks.AdvancedCore.Objects.UUID;
1518
import com.Ben12345rocks.AdvancedCore.Objects.User;
1619
import com.Ben12345rocks.AdvancedCore.Objects.UserStorage;
1720
import com.Ben12345rocks.AdvancedCore.Report.Report;
@@ -62,6 +65,35 @@ public void addPermission(String perm) {
6265

6366
public ArrayList<CommandHandler> getBasicAdminCommands(String permPrefix) {
6467
ArrayList<CommandHandler> cmds = new ArrayList<CommandHandler>();
68+
cmds.add(new CommandHandler(new String[] { "GiveAll", "(reward)" }, permPrefix + ".GiveAll",
69+
"Give all users a reward") {
70+
71+
@Override
72+
public void execute(CommandSender sender, String[] args) {
73+
Reward reward = RewardHandler.getInstance().getReward(args[1]);
74+
ArrayList<User> users = new ArrayList<User>();
75+
for (String uuid : UserManager.getInstance().getAllUUIDs()) {
76+
User user = UserManager.getInstance().getUser(new UUID(uuid));
77+
users.add(user);
78+
}
79+
for (User user : users) {
80+
new RewardBuilder(reward).send(user);
81+
}
82+
}
83+
});
84+
85+
cmds.add(new CommandHandler(new String[] { "GiveAllOnline", "(reward)" }, permPrefix + ".GiveAllOnline",
86+
"Give all users a reward") {
87+
88+
@Override
89+
public void execute(CommandSender sender, String[] args) {
90+
Reward reward = RewardHandler.getInstance().getReward(args[1]);
91+
for (Player p : Bukkit.getOnlinePlayers()) {
92+
User user = UserManager.getInstance().getUser(p);
93+
new RewardBuilder(reward).send(user);
94+
}
95+
}
96+
});
6597
cmds.add(new CommandHandler(new String[] { "GiveReward", "(Reward)", "(Player)" }, permPrefix + ".GiveReward",
6698
"Give a player a reward file", true) {
6799

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/ServerHandle/CraftBukkitHandle.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
import org.bukkit.entity.Player;
44

55
import net.md_5.bungee.api.chat.BaseComponent;
6-
import net.pl3x.bukkit.chatapi.ComponentSender;
76

87
public class CraftBukkitHandle implements IServerHandle {
98

109
@Override
1110
public void sendMessage(Player player, BaseComponent component) {
12-
ComponentSender.sendMessage(player, component);
13-
11+
player.sendMessage(component.toPlainText());
1412
}
1513

1614
@Override
1715
public void sendMessage(Player player, BaseComponent... components) {
18-
ComponentSender.sendMessage(player, components);
16+
for (BaseComponent comp : components) {
17+
sendMessage(player, comp);
18+
}
1919
}
2020
}

0 commit comments

Comments
 (0)