diff --git a/lib/FakeFStage.jar b/lib/FakeFStage.jar deleted file mode 100644 index 7b0affb..0000000 Binary files a/lib/FakeFStage.jar and /dev/null differ diff --git a/lib/Nukkit-PM1E_1.18.10.1993.jar b/lib/Nukkit-PM1E_1.18.10.1993.jar deleted file mode 100644 index 8748ea5..0000000 Binary files a/lib/Nukkit-PM1E_1.18.10.1993.jar and /dev/null differ diff --git a/pom.xml b/pom.xml index 665c60d..b918dda 100644 --- a/pom.xml +++ b/pom.xml @@ -144,14 +144,14 @@ cn.nukkit Nukkit - PM1E_1.19.62.2619 + PM1E_1.20.10.2933 provided cn.lanink MemoriesOfTime-GameCore - 1.6.8.0-PM1E + 1.6.11-PM1E provided @@ -170,14 +170,6 @@ ${project.basedir}/lib/SimpleScoreboards-2.6.1.jar - - FakeFStage - FakeFStage - 1.0.0 - system - ${project.basedir}/lib/FakeFStage.jar - - org.jetbrains annotations diff --git a/src/main/java/cn/lanink/murdermystery/MurderMystery.java b/src/main/java/cn/lanink/murdermystery/MurderMystery.java index 42c066f..b391869 100644 --- a/src/main/java/cn/lanink/murdermystery/MurderMystery.java +++ b/src/main/java/cn/lanink/murdermystery/MurderMystery.java @@ -22,7 +22,6 @@ import cn.lanink.murdermystery.room.classic.ClassicModeRoom; import cn.lanink.murdermystery.room.doubleMode.DoubleRoomMode; import cn.lanink.murdermystery.room.infected.InfectedModeRoom; -import cn.lanink.murdermystery.tasks.FStageTask; import cn.lanink.murdermystery.tasks.Watchdog; import cn.lanink.murdermystery.tasks.admin.SetRoomTask; import cn.lanink.murdermystery.utils.MetricsLite; @@ -52,7 +51,7 @@ */ public class MurderMystery extends PluginBase { - public static final String VERSION = "?"; + public static final String VERSION = "1.4.2-PM1E-SNAPSHOT git-f9f5181"; public static boolean debug = false; public static final Random RANDOM = new Random(); public static final ThreadPoolExecutor CHECK_ROOM_THREAD_POOL = new ThreadPoolExecutor( @@ -289,13 +288,6 @@ public void onEnable() { com.smallaswater.npc.variable.VariableManage.addVariableV2("MurderMysteryVariable", RsNpcVariable.class); } catch (Exception ignored) { - } - //检查FAP群组服插件 - try { - Class.forName("net.fap.stage.FStage"); - Server.getInstance().getScheduler().scheduleRepeatingTask(this, new FStageTask(this), 20, true); - } catch (Exception ignored) { - } this.loadResources(); diff --git a/src/main/java/cn/lanink/murdermystery/tasks/FStageTask.java b/src/main/java/cn/lanink/murdermystery/tasks/FStageTask.java deleted file mode 100644 index 955ef96..0000000 --- a/src/main/java/cn/lanink/murdermystery/tasks/FStageTask.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.lanink.murdermystery.tasks; - -import cn.lanink.murdermystery.MurderMystery; -import cn.lanink.murdermystery.room.base.BaseRoom; -import cn.lanink.murdermystery.room.base.RoomStatus; -import cn.nukkit.scheduler.PluginTask; -import net.fap.stage.FStage; - -/** - * @author LT_Name - */ -public class FStageTask extends PluginTask { - - public FStageTask(MurderMystery murderMystery) { - super(murderMystery); - } - - @Override - public void onRun(int i) { - for (BaseRoom room : this.owner.getRooms().values()) { - if (room.getStatus() == RoomStatus.TASK_NEED_INITIALIZED || room.getStatus() == RoomStatus.WAIT) { - FStage.setLocalStatus("free"); - return; - } - } - FStage.setLocalStatus("run"); - } - - @Override - public void onCancel() { - FStage.setLocalStatus("close"); - } - -}