Sulkta-OSS/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bogus warning message on markers component

Browse source
This commit is contained in:
Mike Primm 2011-09-17 06:52:23 +08:00 • committed by mikeprimm
parent 8524eecad5
commit 7d89fe094a
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/dynmap/DynmapPlugin.java
View file

@ -1254,7 +1254,9 @@ public class DynmapPlugin extends JavaPlugin {
} }
return markerapi; return markerapi;
} }
public boolean markerAPIInitialized() {
return (markerapi != null);
}
/** /**
* Register markers API - used by component to supply marker API to plugin * Register markers API - used by component to supply marker API to plugin
*/ */

5
src/main/java/org/dynmap/MarkersComponent.java
View file

@ -24,7 +24,10 @@ public class MarkersComponent extends ClientComponent {
super(plugin, configuration); super(plugin, configuration);
/* Register API with plugin, if needed */ /* Register API with plugin, if needed */
api = (MarkerAPIImpl)plugin.getMarkerAPI(); api = (MarkerAPIImpl)plugin.getMarkerAPI();
if(api == null) { if(plugin.markerAPIInitialized()) {
api = (MarkerAPIImpl)plugin.getMarkerAPI();
}
else {
api = MarkerAPIImpl.initializeMarkerAPI(plugin); api = MarkerAPIImpl.initializeMarkerAPI(plugin);
plugin.registerMarkerAPI(api); plugin.registerMarkerAPI(api);
} }