Skip to content

Commit 3b11db7

Browse files
committed
Didn't notice the order IDEA generated the onEnable and onDisable methods...
1 parent c083b66 commit 3b11db7

File tree

4 files changed

+22
-11
lines changed

4 files changed

+22
-11
lines changed

Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/MainCommand.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.jaimemartz.playerbalanceraddon;
22

3+
import com.google.common.base.Strings;
4+
import net.md_5.bungee.api.ChatColor;
5+
import net.md_5.bungee.api.chat.ComponentBuilder;
36
import org.bukkit.command.Command;
47
import org.bukkit.command.CommandExecutor;
58
import org.bukkit.command.CommandSender;
@@ -13,6 +16,12 @@ public MainCommand(PlayerBalancerAddon plugin) {
1316

1417
@Override
1518
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
19+
if (cmd.getName().equalsIgnoreCase("balanceraddon"))
20+
21+
sender.spigot().sendMessage(new ComponentBuilder(Strings.repeat("-", 53)).strikethrough(true).color(ChatColor.GRAY).create());
22+
sender.spigot().sendMessage(new ComponentBuilder("Available commands:").color(ChatColor.GRAY).create());
23+
sender.spigot().sendMessage(new ComponentBuilder("/section connect <section> [player]").color(ChatColor.AQUA).append(" - ").color(ChatColor.GRAY).append("Connects you or the specified player to that section").color(ChatColor.RED).create());
24+
sender.spigot().sendMessage(new ComponentBuilder(Strings.repeat("-", 53)).strikethrough(true).color(ChatColor.GRAY).create());
1625
return false;
1726
}
1827
}

Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerAddon.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ public class PlayerBalancerAddon extends JavaPlugin {
66
private PluginMessageManager manager;
77

88
@Override
9-
public void onDisable() {
9+
public void onEnable() {
1010
manager = new PluginMessageManager(this);
11-
getCommand("balancer").setExecutor(new MainCommand(this));
11+
getCommand("balanceraddon").setExecutor(new MainCommand(this));
1212
}
1313

1414
@Override
15-
public void onEnable() {
16-
15+
public void onDisable() {
16+
//Nothing to do...
1717
}
1818

1919
public PluginMessageManager getManager() {

Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void onPluginMessageReceived(String channel, Player player, byte[] messag
3838
ByteArrayDataInput in = ByteStreams.newDataInput(message);
3939
String subchannel = in.readUTF();
4040

41-
contexts.get(new MessageContext(channel, subchannel, player))
41+
contexts.get(new MessageContext(channel, subchannel, player.getUniqueId()))
4242
.stream().findFirst().ifPresent(a -> a.accept(in));
4343
}
4444
}
@@ -64,7 +64,7 @@ public boolean getSectionByName(String section, Consumer<String> consumer) {
6464
contexts.put(new MessageContext(
6565
"PlayerBalancer",
6666
"GetSectionByName",
67-
player
67+
player.getUniqueId()
6868
), ByteArrayDataInput::readUTF);
6969

7070
return true;
@@ -84,7 +84,7 @@ public boolean getSectionByServer(String server, Consumer<String> consumer) {
8484
contexts.put(new MessageContext(
8585
"PlayerBalancer",
8686
"GetSectionByServer",
87-
player
87+
player.getUniqueId()
8888
), ByteArrayDataInput::readUTF);
8989
return true;
9090
}
@@ -98,16 +98,16 @@ public void getSectionOfPlayer(Player player, Consumer<String> consumer) {
9898
contexts.put(new MessageContext(
9999
"PlayerBalancer",
100100
"GetSectionOfPlayer",
101-
player
101+
player.getUniqueId()
102102
), ByteArrayDataInput::readUTF);
103103
}
104104

105105
private final class MessageContext {
106106
private final String channel;
107107
private final String subchannel;
108-
private final Player player;
108+
private final UUID player;
109109

110-
public MessageContext(String channel, String subchannel, Player player) {
110+
public MessageContext(String channel, String subchannel, UUID player) {
111111
this.channel = channel;
112112
this.subchannel = subchannel;
113113
this.player = player;
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
name: PlayerBalancerAddon
22
main: com.jaimemartz.playerbalanceraddon.PlayerBalancerAddon
33
version: ${project.version}
4-
author: jaime29010
4+
author: jaime29010
5+
6+
softdepend: [PlaceholderAPI]

0 commit comments

Comments
 (0)