Skip to content

Commit 6c7447e

Browse files
committed
🔥 Plugin Message system removed
1 parent 98cc62c commit 6c7447e

4 files changed

Lines changed: 4 additions & 27 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
33
apply plugin: 'java'
44

55
group = 'fr.customentity'
6-
version = '0.3'
6+
version = '0.3.1'
77

88
sourceCompatibility = '1.8'
99
targetCompatibility = '1.8'

src/main/java/fr/customentity/advancedbungeequeue/bungee/AdvancedBungeeQueue.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ public void onEnable() {
4242
this.getProxy().getPluginManager().registerCommand(this, new QueueCommand(this));
4343
this.getProxy().getPluginManager().registerListener(this, new QueueListener(this));
4444

45-
this.getProxy().registerChannel("AdvancedBungeeQueue");
46-
4745
this.getProxy().getScheduler().schedule(this, () -> queueManager.getQueues().forEach((serverInfo, queuedPlayers) -> queuedPlayers.forEach(queuedPlayer -> this.sendConfigMessage(queuedPlayer.getProxiedPlayer(), "general.repeating-position-message",
4846
"%all%", queuedPlayers.size() + "",
4947
"%position%", queuedPlayers.indexOf(queuedPlayer) + 1 + "",
Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
package fr.customentity.advancedbungeequeue.bungee.listener;
22

3-
import com.google.common.io.ByteArrayDataInput;
4-
import com.google.common.io.ByteStreams;
53
import fr.customentity.advancedbungeequeue.bungee.AdvancedBungeeQueue;
64
import fr.customentity.advancedbungeequeue.bungee.data.QueuedPlayer;
7-
import net.md_5.bungee.api.CommandSender;
8-
import net.md_5.bungee.api.ProxyServer;
95
import net.md_5.bungee.api.config.ServerInfo;
106
import net.md_5.bungee.api.connection.ProxiedPlayer;
11-
import net.md_5.bungee.api.connection.Server;
127
import net.md_5.bungee.api.event.PlayerDisconnectEvent;
13-
import net.md_5.bungee.api.event.PluginMessageEvent;
148
import net.md_5.bungee.api.event.ServerSwitchEvent;
159
import net.md_5.bungee.api.plugin.Listener;
1610
import net.md_5.bungee.event.EventHandler;
@@ -35,29 +29,15 @@ public void onDisconnect(PlayerDisconnectEvent event) {
3529
@EventHandler
3630
public void onSwitch(ServerSwitchEvent event) {
3731
ServerInfo from = event.getFrom();
38-
if(from == null)return;
32+
if (from == null) return;
3933
if (plugin.getConfigFile().getStringList("default-servers").stream().noneMatch(s -> from.getName().contains(s))) {
4034
return;
4135
}
4236
Optional<QueuedPlayer> queuedPlayer = QueuedPlayer.get(event.getPlayer());
43-
if(!queuedPlayer.isPresent())return;
37+
if (!queuedPlayer.isPresent()) return;
4438

45-
if(!queuedPlayer.get().isConnecting()) {
39+
if (!queuedPlayer.get().isConnecting()) {
4640
plugin.getQueueManager().removePlayerFromQueue(queuedPlayer.get());
4741
}
4842
}
49-
50-
@EventHandler
51-
public void onReceive(PluginMessageEvent event) {
52-
if(!(event.getSender() instanceof Server))return;
53-
String channel = event.getTag();
54-
if(channel.equalsIgnoreCase("AdvancedBungeeQueue")) {
55-
ByteArrayDataInput in = ByteStreams.newDataInput(event.getData());
56-
String subChannel = in.readUTF();
57-
String command = in.readUTF();
58-
if(subChannel.equalsIgnoreCase("ExecuteCommand")) {
59-
plugin.getProxy().getPluginManager().dispatchCommand((CommandSender) event.getReceiver(), command);
60-
}
61-
}
62-
}
6343
}

src/main/java/fr/customentity/advancedbungeequeue/spigot/AdvancedSpigotQueue.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public void onEnable() {
2525

2626
Bukkit.getPluginManager().registerEvents(this, this);
2727

28-
Bukkit.getMessenger().registerOutgoingPluginChannel(this, "AdvancedBungeeQueue");
2928
this.socketManager = new SocketManager(this);
3029
}
3130

0 commit comments

Comments
 (0)