Make sure dynmap and WorldGuard are enabled before we are

recommended
Mike Primm 14 years ago committed by mikeprimm
parent 778ad11f0d
commit fe45f0fb5d
  1. 2
      pom.xml
  2. 17
      src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.dynmap</groupId> <groupId>org.dynmap</groupId>
<artifactId>Dynmap-WorldGuard</artifactId> <artifactId>Dynmap-WorldGuard</artifactId>
<version>0.10</version> <version>0.11</version>
<build> <build>
<resources> <resources>

@ -223,11 +223,19 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
} }
public void onEnable() { public void onEnable() {
info("initializing");
Plugin p = this.getServer().getPluginManager().getPlugin("dynmap"); /* Find dynmap */ Plugin p = this.getServer().getPluginManager().getPlugin("dynmap"); /* Find dynmap */
if(p == null) { if(p == null) {
severe("Error loading dynmap API!"); severe("Error loading Dynmap!");
return; return;
} }
if(!p.isEnabled()) { /* Make sure it's enabled before us */
getServer().getPluginManager().enablePlugin(p);
if(!p.isEnabled()) {
severe("Failed to enable Dynmap!");
return;
}
}
api = (DynmapAPI)p; /* Get API */ api = (DynmapAPI)p; /* Get API */
/* Now, get markers API */ /* Now, get markers API */
markerapi = api.getMarkerAPI(); markerapi = api.getMarkerAPI();
@ -241,6 +249,13 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
severe("Error loading WorldGuard"); severe("Error loading WorldGuard");
return; return;
} }
if(!p.isEnabled()) { /* Make sure it's enabled before us */
getServer().getPluginManager().enablePlugin(p);
if(!p.isEnabled()) {
severe("Failed to enable WorldGuard!");
return;
}
}
wg = (WorldGuardPlugin)p; wg = (WorldGuardPlugin)p;
/* Load configuration */ /* Load configuration */

Loading…
Cancel
Save