From a1a1ef79909ef10e63ba7191010761b1c3b07c35 Mon Sep 17 00:00:00 2001 From: zhangyuheng Date: Wed, 3 Jul 2024 16:06:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=BB=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/lunadeer/dominion/Cache.java | 5 +---- .../java/cn/lunadeer/dominion/dtos/ServerInfoDTO.java | 2 -- .../cn/lunadeer/dominion/managers/DatabaseTables.java | 4 ---- .../cn/lunadeer/dominion/managers/GlobalTeleport.java | 9 ++++++--- .../cn/lunadeer/dominion/tuis/dominion/DominionList.java | 1 - 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/main/java/cn/lunadeer/dominion/Cache.java b/src/main/java/cn/lunadeer/dominion/Cache.java index e400858..227e139 100644 --- a/src/main/java/cn/lunadeer/dominion/Cache.java +++ b/src/main/java/cn/lunadeer/dominion/Cache.java @@ -1,11 +1,8 @@ package cn.lunadeer.dominion; import cn.lunadeer.dominion.dtos.*; -import cn.lunadeer.dominion.utils.ResMigration; -import cn.lunadeer.dominion.dtos.DominionDTO; -import cn.lunadeer.dominion.dtos.Flag; -import cn.lunadeer.dominion.dtos.PlayerDTO; import cn.lunadeer.dominion.managers.GlobalTeleport; +import cn.lunadeer.dominion.utils.ResMigration; import cn.lunadeer.minecraftpluginutils.Notification; import cn.lunadeer.minecraftpluginutils.ParticleRender; import cn.lunadeer.minecraftpluginutils.Scheduler; diff --git a/src/main/java/cn/lunadeer/dominion/dtos/ServerInfoDTO.java b/src/main/java/cn/lunadeer/dominion/dtos/ServerInfoDTO.java index 5db23f6..7b2b9ac 100644 --- a/src/main/java/cn/lunadeer/dominion/dtos/ServerInfoDTO.java +++ b/src/main/java/cn/lunadeer/dominion/dtos/ServerInfoDTO.java @@ -5,8 +5,6 @@ import cn.lunadeer.minecraftpluginutils.XLogger; import cn.lunadeer.minecraftpluginutils.databse.DatabaseManager; import cn.lunadeer.minecraftpluginutils.databse.Field; import cn.lunadeer.minecraftpluginutils.databse.FieldType; -import cn.lunadeer.minecraftpluginutils.databse.TableColumn; -import cn.lunadeer.minecraftpluginutils.databse.syntax.CreateTable; import cn.lunadeer.minecraftpluginutils.databse.syntax.InsertRow; import com.alibaba.fastjson.JSONObject; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/main/java/cn/lunadeer/dominion/managers/DatabaseTables.java b/src/main/java/cn/lunadeer/dominion/managers/DatabaseTables.java index ca71a4f..67e758e 100644 --- a/src/main/java/cn/lunadeer/dominion/managers/DatabaseTables.java +++ b/src/main/java/cn/lunadeer/dominion/managers/DatabaseTables.java @@ -2,10 +2,6 @@ package cn.lunadeer.dominion.managers; import cn.lunadeer.dominion.Dominion; import cn.lunadeer.dominion.dtos.Flag; -import cn.lunadeer.minecraftpluginutils.databse.DatabaseManager; -import cn.lunadeer.minecraftpluginutils.databse.Field; -import cn.lunadeer.minecraftpluginutils.databse.FieldType; -import cn.lunadeer.minecraftpluginutils.databse.TableColumn; import cn.lunadeer.minecraftpluginutils.databse.*; import cn.lunadeer.minecraftpluginutils.databse.syntax.AddColumn; import cn.lunadeer.minecraftpluginutils.databse.syntax.CreateTable; diff --git a/src/main/java/cn/lunadeer/dominion/managers/GlobalTeleport.java b/src/main/java/cn/lunadeer/dominion/managers/GlobalTeleport.java index ec2478f..db3dfd3 100644 --- a/src/main/java/cn/lunadeer/dominion/managers/GlobalTeleport.java +++ b/src/main/java/cn/lunadeer/dominion/managers/GlobalTeleport.java @@ -1,7 +1,6 @@ package cn.lunadeer.dominion.managers; import cn.lunadeer.dominion.Dominion; -import cn.lunadeer.dominion.commands.DominionOperate; import cn.lunadeer.dominion.dtos.DominionDTO; import cn.lunadeer.dominion.dtos.ServerInfoDTO; import cn.lunadeer.minecraftpluginutils.Notification; @@ -10,6 +9,7 @@ import cn.lunadeer.minecraftpluginutils.XLogger; import cn.lunadeer.minecraftpluginutils.databse.DatabaseManager; import cn.lunadeer.minecraftpluginutils.databse.Field; import cn.lunadeer.minecraftpluginutils.databse.syntax.InsertRow; +import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import org.bukkit.Location; @@ -22,7 +22,6 @@ import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.messaging.PluginMessageListener; import org.jetbrains.annotations.NotNull; -import javax.xml.crypto.Data; import java.io.File; import java.sql.ResultSet; import java.util.Map; @@ -79,7 +78,11 @@ public class GlobalTeleport implements PluginMessageListener, Listener { */ @Override public void onPluginMessageReceived(@NotNull String channel, @NotNull Player player, @NotNull byte[] message) { - + if (!channel.equals("BungeeCord")) { + return; + } + ByteArrayDataInput in = ByteStreams.newDataInput(message); + String subChannel = in.readUTF(); } private void teleportToServer(Player player, DominionDTO dominionDTO) { diff --git a/src/main/java/cn/lunadeer/dominion/tuis/dominion/DominionList.java b/src/main/java/cn/lunadeer/dominion/tuis/dominion/DominionList.java index 499b949..beda477 100644 --- a/src/main/java/cn/lunadeer/dominion/tuis/dominion/DominionList.java +++ b/src/main/java/cn/lunadeer/dominion/tuis/dominion/DominionList.java @@ -15,7 +15,6 @@ import org.bukkit.entity.Player; import java.util.ArrayList; import java.util.List; -import java.util.Map; import static cn.lunadeer.dominion.commands.Apis.playerOnly; import static cn.lunadeer.dominion.commands.Helper.playerAdminDominions;