diff --git a/pom.xml b/pom.xml index 19e39c9..883302d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ cn.lunadeer Dominion - 1.38.0-beta + 1.38.1-beta jar Dominion diff --git a/src/main/java/cn/lunadeer/dominion/Dominion.java b/src/main/java/cn/lunadeer/dominion/Dominion.java index b895667..477be07 100644 --- a/src/main/java/cn/lunadeer/dominion/Dominion.java +++ b/src/main/java/cn/lunadeer/dominion/Dominion.java @@ -5,7 +5,6 @@ import cn.lunadeer.dominion.events.PlayerEvents; import cn.lunadeer.dominion.events.SelectPointEvents; import cn.lunadeer.dominion.managers.ConfigManager; import cn.lunadeer.dominion.managers.DatabaseTables; -import cn.lunadeer.dominion.utils.BlueMapConnect; import cn.lunadeer.dominion.utils.DynmapConnect; import cn.lunadeer.dominion.utils.MapRender; import cn.lunadeer.minecraftpluginutils.*; @@ -15,7 +14,6 @@ import cn.lunadeer.minecraftpluginutils.scui.CuiManager; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.plugin.java.JavaPlugin; -import org.dynmap.DynmapCommonAPIListener; import java.util.HashMap; import java.util.Map; @@ -75,7 +73,7 @@ public final class Dominion extends JavaPlugin { XLogger.info(" |_____/ \\___/|_| |_| |_|_|_| |_|_|\\___/|_| |_|"); XLogger.info(" "); - if (config.getDynmap()) DynmapCommonAPIListener.register(new DynmapConnect()); // 注册 Dynmap API + if (config.getDynmap()) new DynmapConnect(); // 注册 Dynmap API Scheduler.runTaskLaterAsync(MapRender::render, 40 * 20); } diff --git a/src/main/java/cn/lunadeer/dominion/utils/BlueMapConnect.java b/src/main/java/cn/lunadeer/dominion/utils/BlueMapConnect.java index c107c92..f75eee1 100644 --- a/src/main/java/cn/lunadeer/dominion/utils/BlueMapConnect.java +++ b/src/main/java/cn/lunadeer/dominion/utils/BlueMapConnect.java @@ -1,7 +1,6 @@ package cn.lunadeer.dominion.utils; import cn.lunadeer.dominion.Cache; -import cn.lunadeer.dominion.Dominion; import cn.lunadeer.dominion.dtos.DominionDTO; import cn.lunadeer.minecraftpluginutils.Scheduler; import cn.lunadeer.minecraftpluginutils.XLogger; diff --git a/src/main/java/cn/lunadeer/dominion/utils/DynmapConnect.java b/src/main/java/cn/lunadeer/dominion/utils/DynmapConnect.java index c337e92..9d3f0c3 100644 --- a/src/main/java/cn/lunadeer/dominion/utils/DynmapConnect.java +++ b/src/main/java/cn/lunadeer/dominion/utils/DynmapConnect.java @@ -16,10 +16,11 @@ public class DynmapConnect extends DynmapCommonAPIListener { public static DynmapConnect instance; - private MarkerSet markerSet_dominion; - private MarkerSet markerSet_mca; + private MarkerSet markerSet_dominion = null; + private MarkerSet markerSet_mca = null; public DynmapConnect() { + DynmapCommonAPIListener.register(this); instance = this; } @@ -30,9 +31,11 @@ public class DynmapConnect extends DynmapCommonAPIListener { if (this.markerSet_dominion == null) { this.markerSet_dominion = markerAPI.createMarkerSet("dominion", "Dominion领地", null, false); } + this.markerSet_mca = markerAPI.getMarkerSet("mca"); if (this.markerSet_mca == null) { this.markerSet_mca = markerAPI.createMarkerSet("mca", "MCA文件", null, false); } + XLogger.info("Dynmap 成功注册"); } private void setDominionMarker(DominionDTO dominion) {