EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 27 Wiki Activity

Tries to fix a stack trace when Dynmap fails to disable itself

Browse Source
This commit is contained in:
Kristian Knarvik
2023-06-27 13:47:35 +02:00
parent 6b6e9d007e
commit 3fcae6ca45
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/knarcraft/stargate/config/DynmapManager.java
View File

@@ -27,8 +27,9 @@ public final class DynmapManager {
* Initializes the dynmap manager * Initializes the dynmap manager
* *
* @param dynmapAPI <p>A reference</p> * @param dynmapAPI <p>A reference</p>
* @throws NullPointerException <p>If dynmap has an invalid state</p>
*/ */
public static void initialize(DynmapAPI dynmapAPI) { public static void initialize(DynmapAPI dynmapAPI) throws NullPointerException {
if (dynmapAPI == null || dynmapAPI.getMarkerAPI() == null) { if (dynmapAPI == null || dynmapAPI.getMarkerAPI() == null) {
markerSet = null; markerSet = null;
portalIcon = null; portalIcon = null;

9
src/main/java/net/knarcraft/stargate/config/StargateConfig.java
View File

@@ -108,8 +108,13 @@ public final class StargateConfig {
setupVaultEconomy(); setupVaultEconomy();
DynmapAPI dynmapAPI = (DynmapAPI) Bukkit.getPluginManager().getPlugin("dynmap"); DynmapAPI dynmapAPI = (DynmapAPI) Bukkit.getPluginManager().getPlugin("dynmap");
if (dynmapAPI != null) { if (dynmapAPI != null) {
DynmapManager.initialize(dynmapAPI); try {
DynmapManager.addAllPortalMarkers(); DynmapManager.initialize(dynmapAPI);
DynmapManager.addAllPortalMarkers();
} catch (NullPointerException exception) {
logger.warning("Dynmap started in an invalid state. Check your log/console for dynmap-related " +
"problems. Dynmap integration cannot be initialized.");
}
} }
this.isLoaded = true; this.isLoaded = true;