Skip to content

Commit d0c221c

Browse files
committed
Fix: Add PlaceholderAPI dependency and ensure safe API initialization/deinitialization
1 parent bf529dc commit d0c221c

2 files changed

Lines changed: 11 additions & 0 deletions

File tree

eternalcombat-plugin/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@ paper {
9595
required = false
9696
load = PaperPluginDescription.RelativeLoadOrder.BEFORE
9797
}
98+
99+
register("PlaceholderAPI") {
100+
required = false
101+
load = PaperPluginDescription.RelativeLoadOrder.BEFORE
102+
}
98103
}
99104
}
100105

eternalcombat-plugin/src/main/java/com/eternalcode/combat/CombatPlugin.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ public final class CombatPlugin extends JavaPlugin implements EternalCombatApi {
9595
private RegionProvider regionProvider;
9696

9797
private LiteCommands<CommandSender> liteCommands;
98+
private boolean apiInitialized;
9899

99100

100101
@Override
@@ -217,6 +218,7 @@ public void onEnable() {
217218
);
218219

219220
EternalCombatProvider.initialize(this);
221+
this.apiInitialized = true;
220222

221223
long millis = started.elapsed(TimeUnit.MILLISECONDS);
222224
this.getLogger().info("Successfully loaded EternalCombat in " + millis + "ms");
@@ -230,7 +232,11 @@ public void onDisable() {
230232

231233
if (this.fightManager != null) {
232234
this.fightManager.untagAll();
235+
}
236+
237+
if (this.apiInitialized) {
233238
EternalCombatProvider.deinitialize();
239+
this.apiInitialized = false;
234240
}
235241
}
236242

0 commit comments

Comments
 (0)