diff --git a/Factions-2.3.0.jar b/Factions-2.3.0.jar deleted file mode 100644 index 4a353a1..0000000 Binary files a/Factions-2.3.0.jar and /dev/null differ diff --git a/Factions-2.5.0.jar b/Factions-2.5.0.jar new file mode 100644 index 0000000..cdb9ebe Binary files /dev/null and b/Factions-2.5.0.jar differ diff --git a/MassiveCore-7.3.0.jar b/MassiveCore-7.3.0.jar new file mode 100644 index 0000000..02ebe0e Binary files /dev/null and b/MassiveCore-7.3.0.jar differ diff --git a/mcore-7.0.1.jar b/mcore-7.0.1.jar deleted file mode 100644 index bcd0263..0000000 Binary files a/mcore-7.0.1.jar and /dev/null differ diff --git a/pom.xml b/pom.xml index dfdb8be..f9a38ed 100644 --- a/pom.xml +++ b/pom.xml @@ -70,21 +70,21 @@ org.bukkit bukkit - 1.7.2-R0.2 + 1.7.10-R0.1-SNAPSHOT com.massivecraft Factions - 2.3.0 + 2.5.0 system - ${project.basedir}/Factions-2.3.0.jar + ${project.basedir}/Factions-2.5.0.jar com.massivecraft - mcore - 7.0.1 + MassiveCore + 7.3.0 system - ${project.basedir}/mcore-7.0.1.jar + ${project.basedir}/MassiveCore-7.3.0.jar \ No newline at end of file diff --git a/src/main/java/org/dynmap/factions/DynmapFactionsPlugin.java b/src/main/java/org/dynmap/factions/DynmapFactionsPlugin.java index 8b671e7..7b708d5 100644 --- a/src/main/java/org/dynmap/factions/DynmapFactionsPlugin.java +++ b/src/main/java/org/dynmap/factions/DynmapFactionsPlugin.java @@ -38,13 +38,13 @@ import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.entity.FactionColls; import com.massivecraft.factions.entity.UPlayer; -import com.massivecraft.factions.event.FactionsEventChunkChange; -import com.massivecraft.factions.event.FactionsEventCreate; -import com.massivecraft.factions.event.FactionsEventDisband; -import com.massivecraft.factions.event.FactionsEventHomeChange; -import com.massivecraft.factions.event.FactionsEventMembershipChange; -import com.massivecraft.factions.event.FactionsEventNameChange; -import com.massivecraft.mcore.ps.PS; +import com.massivecraft.factions.event.EventFactionsChunkChange; +import com.massivecraft.factions.event.EventFactionsCreate; +import com.massivecraft.factions.event.EventFactionsDisband; +import com.massivecraft.factions.event.EventFactionsHomeChange; +import com.massivecraft.factions.event.EventFactionsMembershipChange; +import com.massivecraft.factions.event.EventFactionsNameChange; +import com.massivecraft.massivecore.ps.PS; public class DynmapFactionsPlugin extends JavaPlugin { private static Logger log; @@ -574,7 +574,7 @@ public class DynmapFactionsPlugin extends JavaPlugin { } } @EventHandler(priority=EventPriority.MONITOR) - public void onFPlayerJoin(FactionsEventMembershipChange event) { + public void onFPlayerJoin(EventFactionsMembershipChange event) { if(event.isCancelled()) return; if(playersets) { @@ -583,7 +583,7 @@ public class DynmapFactionsPlugin extends JavaPlugin { } } @EventHandler(priority=EventPriority.MONITOR) - public void onFactionCreate(FactionsEventCreate event) { + public void onFactionCreate(EventFactionsCreate event) { if(event.isCancelled()) return; if(playersets) @@ -591,7 +591,7 @@ public class DynmapFactionsPlugin extends JavaPlugin { requestUpdateFactions(); } @EventHandler(priority=EventPriority.MONITOR) - public void onFactionDisband(FactionsEventDisband event) { + public void onFactionDisband(EventFactionsDisband event) { if(event.isCancelled()) return; if(playersets) { @@ -601,19 +601,19 @@ public class DynmapFactionsPlugin extends JavaPlugin { requestUpdateFactions(); } @EventHandler(priority=EventPriority.MONITOR) - public void onFactionRename(FactionsEventNameChange event) { + public void onFactionRename(EventFactionsNameChange event) { if(event.isCancelled()) return; requestUpdateFactions(); } @EventHandler(priority=EventPriority.MONITOR) - public void onFactionRename(FactionsEventHomeChange event) { + public void onFactionRename(EventFactionsHomeChange event) { if(event.isCancelled()) return; requestUpdateFactions(); } @EventHandler(priority=EventPriority.MONITOR) - public void onFactionRename(FactionsEventChunkChange event) { + public void onFactionRename(EventFactionsChunkChange event) { if(event.isCancelled()) return; requestUpdateFactions(); diff --git a/src/main/java/org/dynmap/factions/MetricsLite.java b/src/main/java/org/dynmap/factions/MetricsLite.java index 0f98d9d..79e0ad2 100644 --- a/src/main/java/org/dynmap/factions/MetricsLite.java +++ b/src/main/java/org/dynmap/factions/MetricsLite.java @@ -282,7 +282,7 @@ public class MetricsLite { boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled String pluginVersion = description.getVersion(); String serverVersion = Bukkit.getVersion(); - int playersOnline = Bukkit.getServer().getOnlinePlayers().length; + int playersOnline = Bukkit.getServer().getOnlinePlayers().size(); // END server software specific section -- all code below does not use any code outside of this class / Java