EpicKnarvik97/Dynmap-Factions
EpicKnarvik97/Dynmap-Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to CB 1.1 event model (1.1-R5 READY)

Browse Source
This commit is contained in:
Mike Primm 2012-02-20 21:09:30 -06:00
parent 5c30f733bb
commit 9651103ba9
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -56,13 +56,13 @@
<dependency>
<groupId>org.dynmap</groupId>
<artifactId>dynmap-api</artifactId>
<version>[0.29,)</version>
<version>[0.32,)</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>[1.0.1-R1-SNAPSHOT,)</version>
<version>1.1-R5-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>

20
src/main/java/org/dynmap/factions/DynmapFactionsPlugin.java
View File

@ -16,10 +16,9 @@ import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.event.Event.Priority;
import org.bukkit.event.Event.Type;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.event.server.ServerListener;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager;
@ -466,8 +465,9 @@ public class DynmapFactionsPlugin extends JavaPlugin {
}
private class OurServerListener extends ServerListener {
@Override
private class OurServerListener implements Listener {
@SuppressWarnings("unused")
@EventHandler
public void onPluginEnable(PluginEnableEvent event) {
Plugin p = event.getPlugin();
String name = p.getDescription().getName();
@ -495,12 +495,12 @@ public class DynmapFactionsPlugin extends JavaPlugin {
return;
}
factions = p;
getServer().getPluginManager().registerEvents(new OurServerListener(), this);
/* If both enabled, activate */
if(dynmap.isEnabled() && factions.isEnabled())
activate();
else
getServer().getPluginManager().registerEvent(Type.PLUGIN_ENABLE, new OurServerListener(), Priority.Monitor, this);
}
private void activate() {
@ -548,11 +548,11 @@ public class DynmapFactionsPlugin extends JavaPlugin {
cusstyle.put(id, new AreaStyle(cfg, "custstyle." + id, defstyle));
}
}
List vis = cfg.getList("visibleregions");
List<String> vis = cfg.getStringList("visibleregions");
if(vis != null) {
visible = new HashSet<String>(vis);
}
List hid = cfg.getList("hiddenregions");
List<String> hid = cfg.getStringList("hiddenregions");
if(hid != null) {
hidden = new HashSet<String>(hid);
}

2
src/main/resources/plugin.yml
View File

@ -2,5 +2,5 @@ name: Dynmap-Factions
main: org.dynmap.factions.DynmapFactionsPlugin
version: "${project.version}"
author: mikeprimm
softdepend: [dynmap,Factions]
depend: [ dynmap, Factions ]