Skip to content

Commit 8f1fbd2

Browse files
jamezrinjamezrin
committed
Fix channels for newer spigot versions
1 parent 4caae18 commit 8f1fbd2

File tree

4 files changed

+39
-31
lines changed

4 files changed

+39
-31
lines changed

‎addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,26 @@
1515
import java.util.function.Consumer;
1616

1717
public class PluginMessageManager implements PluginMessageListener {
18+
private static final String PB_CHANNEL = "playerbalancer:main",
19+
BC_CHANNEL = "bungeecord:main";
20+
1821
private final Multimap<MessageContext, Consumer<ByteArrayDataInput>> contexts = LinkedHashMultimap.create();
1922
private final PlayerBalancerAddon plugin;
2023

2124
public PluginMessageManager(PlayerBalancerAddon plugin) {
2225
this.plugin = plugin;
2326

24-
plugin.getServer().getMessenger().registerIncomingPluginChannel(plugin, "PlayerBalancer", this);
25-
plugin.getServer().getMessenger().registerOutgoingPluginChannel(plugin, "PlayerBalancer");
27+
plugin.getServer().getMessenger().registerIncomingPluginChannel(plugin, PB_CHANNEL, this);
28+
plugin.getServer().getMessenger().registerOutgoingPluginChannel(plugin, PB_CHANNEL);
2629

2730
//In case we need to use BungeeCord channels
28-
plugin.getServer().getMessenger().registerIncomingPluginChannel(plugin, "BungeeCord", this);
29-
plugin.getServer().getMessenger().registerOutgoingPluginChannel(plugin, "BungeeCord");
31+
plugin.getServer().getMessenger().registerIncomingPluginChannel(plugin, BC_CHANNEL, this);
32+
plugin.getServer().getMessenger().registerOutgoingPluginChannel(plugin, BC_CHANNEL);
3033
}
3134

3235
@Override
3336
public void onPluginMessageReceived(String channel, Player player, byte[] message) {
34-
if (channel.equals("PlayerBalancer")) {
37+
if (channel.equals(PB_CHANNEL)) {
3538
ByteArrayDataInput in = ByteStreams.newDataInput(message);
3639
String subchannel = in.readUTF();
3740

@@ -50,14 +53,14 @@ public void connectPlayer(Player player, String section) {
5053
ByteArrayDataOutput out = ByteStreams.newDataOutput();
5154
out.writeUTF("Connect");
5255
out.writeUTF(section);
53-
player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
56+
player.sendPluginMessage(plugin, PB_CHANNEL, out.toByteArray());
5457
}
5558

5659
public void fallbackPlayer(Player player) {
5760
ByteArrayDataOutput out = ByteStreams.newDataOutput();
5861
out.writeUTF("FallbackPlayer");
5962
out.writeUTF(player.getName());
60-
player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
63+
player.sendPluginMessage(plugin, PB_CHANNEL, out.toByteArray());
6164
}
6265

6366
public boolean getSectionByName(String section, Consumer<String> consumer) {
@@ -71,12 +74,12 @@ public boolean getSectionByName(String section, Consumer<String> consumer) {
7174
out.writeUTF(section);
7275

7376
contexts.put(new MessageContext(
74-
"PlayerBalancer",
77+
PB_CHANNEL,
7578
"GetSectionByName",
7679
player.getUniqueId()
7780
), (response) -> consumer.accept(response.readUTF()));
7881

79-
player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
82+
player.sendPluginMessage(plugin, PB_CHANNEL, out.toByteArray());
8083
return true;
8184
}
8285

@@ -91,12 +94,12 @@ public boolean getSectionByServer(String server, Consumer<String> consumer) {
9194
out.writeUTF(server);
9295

9396
contexts.put(new MessageContext(
94-
"PlayerBalancer",
97+
PB_CHANNEL,
9598
"GetSectionByServer",
9699
player.getUniqueId()
97100
), (response) -> consumer.accept(response.readUTF()));
98101

99-
player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
102+
player.sendPluginMessage(plugin, PB_CHANNEL, out.toByteArray());
100103
return true;
101104
}
102105

@@ -106,12 +109,12 @@ public void getSectionOfPlayer(Player player, Consumer<String> consumer) {
106109
out.writeUTF(player.getName());
107110

108111
contexts.put(new MessageContext(
109-
"PlayerBalancer",
112+
PB_CHANNEL,
110113
"GetSectionOfPlayer",
111114
player.getUniqueId()
112115
), (response) -> consumer.accept(response.readUTF()));
113116

114-
player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
117+
player.sendPluginMessage(plugin, PB_CHANNEL, out.toByteArray());
115118
}
116119

117120
public boolean getServerStatus(String server, Consumer<String> consumer) {
@@ -125,12 +128,12 @@ public boolean getServerStatus(String server, Consumer<String> consumer) {
125128
out.writeUTF(player.getName());
126129

127130
contexts.put(new MessageContext(
128-
"PlayerBalancer",
131+
PB_CHANNEL,
129132
"GetServerStatus",
130133
player.getUniqueId()
131134
), (response) -> consumer.accept(response.readUTF()));
132135

133-
player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
136+
player.sendPluginMessage(plugin, PB_CHANNEL, out.toByteArray());
134137
return true;
135138
}
136139

@@ -145,32 +148,32 @@ public boolean getSectionPlayerCount(String section, Consumer<Integer> consumer)
145148
out.writeUTF(section);
146149

147150
contexts.put(new MessageContext(
148-
"PlayerBalancer",
151+
PB_CHANNEL,
149152
"GetSectionPlayerCount",
150153
player.getUniqueId()
151154
), (response) -> consumer.accept(response.readInt()));
152155

153-
player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
156+
player.sendPluginMessage(plugin, PB_CHANNEL, out.toByteArray());
154157
return true;
155158
}
156159

157160
public void clearPlayerBypass(Player player) {
158161
ByteArrayDataOutput out = ByteStreams.newDataOutput();
159162
out.writeUTF("ClearPlayerBypass");
160-
player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
163+
player.sendPluginMessage(plugin, PB_CHANNEL, out.toByteArray());
161164
}
162165

163166
public void setPlayerBypass(Player player) {
164167
ByteArrayDataOutput out = ByteStreams.newDataOutput();
165168
out.writeUTF("SetPlayerBypass");
166-
player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
169+
player.sendPluginMessage(plugin, PB_CHANNEL, out.toByteArray());
167170
}
168171

169172
public void bypassConnect(Player player, String server) {
170173
ByteArrayDataOutput out = ByteStreams.newDataOutput();
171174
out.writeUTF("BypassConnect");
172175
out.writeUTF(server);
173-
player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
176+
player.sendPluginMessage(plugin, PB_CHANNEL, out.toByteArray());
174177
}
175178

176179
public boolean clearStatusOverride(String server) {
@@ -182,7 +185,7 @@ public boolean clearStatusOverride(String server) {
182185
ByteArrayDataOutput out = ByteStreams.newDataOutput();
183186
out.writeUTF("ClearStatusOverride");
184187
out.writeUTF(server);
185-
player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
188+
player.sendPluginMessage(plugin, PB_CHANNEL, out.toByteArray());
186189

187190
return true;
188191
}
@@ -197,7 +200,7 @@ public boolean setStatusOverride(String server, boolean status) {
197200
out.writeUTF("SetStatusOverride");
198201
out.writeUTF(server);
199202
out.writeBoolean(status);
200-
player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
203+
player.sendPluginMessage(plugin, PB_CHANNEL, out.toByteArray());
201204

202205
return true;
203206
}

‎balancer/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public class PlayerBalancer extends Plugin {
4242
private Listener connectListener, kickListener, reloadListener, pluginMessageListener;
4343

4444
public static final String LOG_FILE_PATTERN = "balancer.log";
45+
public static final String PB_CHANNEL = "playerbalancer:main";
4546

4647
@Override
4748
public void onLoad() {
@@ -147,7 +148,7 @@ private void execStart() {
147148
getProxy().getPluginManager().registerListener(this, connectListener);
148149

149150
if (settings.getGeneralProps().isPluginMessaging()) {
150-
getProxy().registerChannel("PlayerBalancer");
151+
getProxy().registerChannel(PB_CHANNEL);
151152

152153
getProxy().getPluginManager().registerListener(this, statusManager);
153154

@@ -234,7 +235,7 @@ private void execStop() {
234235

235236
if (settings.getGeneralProps().isPluginMessaging()) {
236237
if (pluginMessageListener != null) {
237-
getProxy().unregisterChannel("PlayerBalancer");
238+
getProxy().unregisterChannel(PB_CHANNEL);
238239
getProxy().getPluginManager().unregisterListener(pluginMessageListener);
239240
pluginMessageListener = null;
240241
}

‎balancer/src/main/java/com/jaimemartz/playerbalancer/listeners/PluginMessageListener.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import java.io.DataOutputStream;
2222
import java.io.IOException;
2323

24+
import static com.jaimemartz.playerbalancer.PlayerBalancer.PB_CHANNEL;
25+
2426
public class PluginMessageListener implements Listener {
2527
private final PlayerBalancer plugin;
2628
private final Gson gson;
@@ -40,7 +42,7 @@ public PluginMessageListener(PlayerBalancer plugin) {
4042

4143
@EventHandler
4244
public void onPluginMessage(PluginMessageEvent event) {
43-
if (event.getTag().equals("PlayerBalancer") && event.getSender() instanceof Server) {
45+
if (event.getTag().equals(PB_CHANNEL) && event.getSender() instanceof Server) {
4446
ByteArrayDataInput in = ByteStreams.newDataInput(event.getData());
4547
String request = in.readUTF();
4648
ServerInfo sender = ((Server) event.getSender()).getInfo();
@@ -91,7 +93,7 @@ public void onPluginMessage(PluginMessageEvent event) {
9193
e.printStackTrace();
9294
}
9395

94-
sender.sendData("PlayerBalancer", stream.toByteArray());
96+
sender.sendData(PB_CHANNEL, stream.toByteArray());
9597
break;
9698
}
9799

@@ -117,7 +119,7 @@ public void onPluginMessage(PluginMessageEvent event) {
117119
e.printStackTrace();
118120
}
119121

120-
sender.sendData("PlayerBalancer", stream.toByteArray());
122+
sender.sendData(PB_CHANNEL, stream.toByteArray());
121123
break;
122124
}
123125

@@ -140,7 +142,7 @@ public void onPluginMessage(PluginMessageEvent event) {
140142
e.printStackTrace();
141143
}
142144

143-
sender.sendData("PlayerBalancer", stream.toByteArray());
145+
sender.sendData(PB_CHANNEL, stream.toByteArray());
144146
}
145147
break;
146148
}
@@ -162,7 +164,7 @@ public void onPluginMessage(PluginMessageEvent event) {
162164
e.printStackTrace();
163165
}
164166

165-
sender.sendData("PlayerBalancer", stream.toByteArray());
167+
sender.sendData(PB_CHANNEL, stream.toByteArray());
166168
break;
167169
}
168170

@@ -184,7 +186,7 @@ public void onPluginMessage(PluginMessageEvent event) {
184186
e.printStackTrace();
185187
}
186188

187-
sender.sendData("PlayerBalancer", stream.toByteArray());
189+
sender.sendData(PB_CHANNEL, stream.toByteArray());
188190
}
189191

190192
case "ClearPlayerBypass": {

‎balancer/src/main/java/com/jaimemartz/playerbalancer/ping/StatusManager.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
import java.util.Map;
1818
import java.util.concurrent.TimeUnit;
1919

20+
import static com.jaimemartz.playerbalancer.PlayerBalancer.PB_CHANNEL;
21+
2022
public class StatusManager implements Listener {
2123
private final PlayerBalancer plugin;
2224
private final ServerCheckerProps props;
@@ -121,7 +123,7 @@ public boolean isAccessible(ServerInfo server) {
121123

122124
@EventHandler
123125
public void onPluginMessage(PluginMessageEvent event) {
124-
if (event.getTag().equals("PlayerBalancer") && event.getSender() instanceof Server) {
126+
if (event.getTag().equals(PB_CHANNEL) && event.getSender() instanceof Server) {
125127
ByteArrayDataInput in = ByteStreams.newDataInput(event.getData());
126128
String request = in.readUTF();
127129
ServerInfo sender = ((Server) event.getSender()).getInfo();

0 commit comments

Comments
 (0)