feat: 支持新版仓鼠球
This commit is contained in:
@@ -22,8 +22,8 @@ public class LobbyPlugin extends JavaPlugin {
|
||||
@Override
|
||||
public void onEnable() {
|
||||
Bukkit.getPluginManager().registerEvents(MainListener.INSTANCE, this);
|
||||
Bukkit.getPluginManager().registerEvents(ServiceListener.INSTANCE, this);
|
||||
Bukkit.getPluginManager().registerEvents(ProtectListener.INSTANCE, this);
|
||||
BallAPI.getInstance().getEventBus().register(ServiceListener.INSTANCE);
|
||||
BallAPI.getInstance().sendBallMessage("HamsterLobby", "registerLobby");
|
||||
}
|
||||
}
|
||||
|
@@ -1,20 +1,19 @@
|
||||
package cn.hamster3.mc.plugin.lobby.bukkit.listener;
|
||||
|
||||
import cn.hamster3.mc.plugin.ball.bukkit.event.server.ServerOnlineEvent;
|
||||
import cn.hamster3.mc.plugin.ball.common.api.BallAPI;
|
||||
import cn.hamster3.mc.plugin.ball.common.entity.BallServerInfo;
|
||||
import cn.hamster3.mc.plugin.ball.common.entity.BallServerType;
|
||||
import cn.hamster3.mc.plugin.ball.common.event.server.ServerOnlineEvent;
|
||||
import cn.hamster3.mc.plugin.lobby.bukkit.LobbyPlugin;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import com.google.common.eventbus.Subscribe;
|
||||
|
||||
public class ServiceListener implements Listener {
|
||||
public class ServiceListener {
|
||||
public static final ServiceListener INSTANCE = new ServiceListener();
|
||||
|
||||
private ServiceListener() {
|
||||
}
|
||||
|
||||
@EventHandler(ignoreCancelled = true)
|
||||
@Subscribe
|
||||
public void onServerOnline(ServerOnlineEvent event) {
|
||||
BallServerInfo info = event.getServerInfo();
|
||||
if (info.getType() != BallServerType.PROXY) {
|
||||
|
@@ -24,9 +24,9 @@ public class LobbyPlugin extends Plugin {
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
BallAPI.getInstance().getEventBus().register(ServiceListener.INSTANCE);
|
||||
BallAPI.getInstance().subscribe("HamsterLobby");
|
||||
ProxyServer.getInstance().setReconnectHandler(LobbyReconnectHandler.INSTANCE);
|
||||
ProxyServer.getInstance().getPluginManager().registerListener(this, ServiceListener.INSTANCE);
|
||||
ProxyServer.getInstance().getPluginManager().registerListener(this, MainListener.INSTANCE);
|
||||
}
|
||||
}
|
||||
|
@@ -1,11 +1,11 @@
|
||||
package cn.hamster3.mc.plugin.lobby.bungee.listener;
|
||||
|
||||
import cn.hamster3.mc.plugin.ball.bungee.event.MessageReceiveEvent;
|
||||
import cn.hamster3.mc.plugin.ball.bungee.event.server.ServerOfflineEvent;
|
||||
import cn.hamster3.mc.plugin.ball.common.data.BallMessage;
|
||||
import cn.hamster3.mc.plugin.ball.common.event.message.MessageReceivedEvent;
|
||||
import cn.hamster3.mc.plugin.ball.common.event.server.ServerOfflineEvent;
|
||||
import cn.hamster3.mc.plugin.lobby.bungee.LobbyPlugin;
|
||||
import com.google.common.eventbus.Subscribe;
|
||||
import net.md_5.bungee.api.plugin.Listener;
|
||||
import net.md_5.bungee.event.EventHandler;
|
||||
|
||||
public class ServiceListener implements Listener {
|
||||
public static final ServiceListener INSTANCE = new ServiceListener();
|
||||
@@ -13,9 +13,8 @@ public class ServiceListener implements Listener {
|
||||
private ServiceListener() {
|
||||
}
|
||||
|
||||
|
||||
@EventHandler
|
||||
public void onMessageReceive(MessageReceiveEvent event) {
|
||||
@Subscribe
|
||||
public void onMessageReceived(MessageReceivedEvent event) {
|
||||
if (!"HamsterLobby".equals(event.getChannel())) {
|
||||
return;
|
||||
}
|
||||
@@ -33,7 +32,7 @@ public class ServiceListener implements Listener {
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
@Subscribe
|
||||
public void onServerOffline(ServerOfflineEvent event) {
|
||||
String serverID = event.getServerInfo().getId();
|
||||
if (LobbyPlugin.LOBBY_SERVERS.remove(serverID)) {
|
||||
|
Reference in New Issue
Block a user