Skip to content

Commit 5f351e2

Browse files
committed
修改实现
1 parent bba312b commit 5f351e2

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

src/main/java/com/hzzz/points/Points.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,8 @@ public void onEnable() {
120120
}
121121
}
122122
}
123-
124-
if (isLoadDepend("PlaceholderAPI") && isLoadDepend("AureliumSkills")) {
125-
if (config.getBoolean("fair-pvp.enable", false)) {
126-
setExecutor("fair-pvp", FairPVP.getInstance());
127-
}
123+
if (config.getBoolean("fair-pvp.enable", false) && (isLoadDepend("PlaceholderAPI") && isLoadDepend("AureliumSkills"))) {
124+
setExecutor("fair-pvp", FairPVP.getInstance());
128125

129126
}
130127

@@ -218,7 +215,13 @@ private void disableExecutor() {
218215
* @return 是否加载
219216
*/
220217
private boolean isLoadDepend(String pluginName) {
221-
return Bukkit.getPluginManager().isPluginEnabled(pluginName);
218+
if (Bukkit.getPluginManager().isPluginEnabled(pluginName)) {
219+
logInfo(getMessage(LOADED_DEPEND) + pluginName);
220+
return true;
221+
} else {
222+
logError(getMessage(NO_DEPEND) + pluginName);
223+
return false;
224+
}
222225
}
223226

224227
/**

src/main/java/com/hzzz/points/utils/message/Lang.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,9 @@ public static void loadText() {
158158
messageMap.put(MsgKey.HELP_WHERE, getLang("commands.where.help", "使用方法: §e/where 玩家名 §f或 §e/where"));
159159
messageMap.put(MsgKey.HELP_ENDERCHEST, getLang("commands.enderchest.help", "使用方法: §e/enderchest 玩家名 §f或 §e/enderchest"));
160160
messageMap.put(MsgKey.HELP_FAIR_PVP, getLang("commands.fair-pvp.help", "使用方法: §e/fair-pvp [on, off] §f或 §e/fair-pvp [on, off] 玩家名"));
161-
messageMap.put(MsgKey.ENABLE_FAIR_PVP, getLang("message.fair-pvp.enable", "§e已启动公平PVP模式"));
162-
messageMap.put(MsgKey.DISABLE_FAIR_PVP, getLang("message.fair-pvp.disable", "§e已关闭公平PVP模式"));
161+
messageMap.put(MsgKey.ENABLE_FAIR_PVP, getLang("commands.fair-pvp.enable", "§e已启动公平PVP模式"));
162+
messageMap.put(MsgKey.DISABLE_FAIR_PVP, getLang("commands.fair-pvp.disable", "§e已关闭公平PVP模式"));
163+
messageMap.put(MsgKey.NO_DEPEND, getLang("message.no-depend", "缺少依赖§e"));
164+
messageMap.put(MsgKey.LOADED_DEPEND, getLang("message.loaded-depend", "已检测到依赖§e"));
163165
}
164166
}

src/main/java/com/hzzz/points/utils/message/MsgKey.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,6 @@ public enum MsgKey {
5555
HELP_WHERE,
5656
HELP_ENDERCHEST,
5757
HELP_FAIR_PVP,
58+
NO_DEPEND,
59+
LOADED_DEPEND,
5860
}

src/main/resources/lang/zh_cn.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ message:
3434
canceled:
3535
enter_bed: "你尝试进入梦乡,但是被未知力量阻止了"
3636
use_respawn_anchor: "你尝试使用重生锚,但是被未知力量阻止了"
37-
fair-pvp:
38-
enable: "§e已启动公平PVP模式"
39-
disable: "§e已关闭公平PVP模式"
37+
no-depend: "缺少依赖§e"
38+
loaded-depend: "已检测到依赖§e"
4039
commands:
4140
global:
4241
frequency_limit: "你使用的太快了! 请稍后再试"
@@ -85,4 +84,6 @@ commands:
8584
§e/death §f: 死亡模块相关的指令帮助
8685
§6================================
8786
fair-pvp:
87+
enable: "§e已启动公平PVP模式"
88+
disable: "§e已关闭公平PVP模式"
8889
help: "使用方法: §e/fair-pvp [on, off] §f或 §e/fair-pvp [on, off] 玩家名"

0 commit comments

Comments
 (0)