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

Update to 1.7.10 with Factions 2.5.0 and MassiveCore 7.3.0

Browse Source
This commit is contained in:
Mike Primm 2014-08-19 22:03:16 -05:00
parent 19892eba38
commit ee08b79d08
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Factions-2.3.0.jar
View File

Binary file not shown.

BIN
Factions-2.5.0.jar Normal file
View File

Binary file not shown.

BIN
MassiveCore-7.3.0.jar Normal file
View File

Binary file not shown.

BIN
mcore-7.0.1.jar
View File

Binary file not shown.

12
pom.xml
View File

@ -70,21 +70,21 @@
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId> <artifactId>bukkit</artifactId>
<version>1.7.2-R0.2</version> <version>1.7.10-R0.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.massivecraft</groupId> <groupId>com.massivecraft</groupId>
<artifactId>Factions</artifactId> <artifactId>Factions</artifactId>
<version>2.3.0</version> <version>2.5.0</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${project.basedir}/Factions-2.3.0.jar</systemPath> <systemPath>${project.basedir}/Factions-2.5.0.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.massivecraft</groupId> <groupId>com.massivecraft</groupId>
<artifactId>mcore</artifactId> <artifactId>MassiveCore</artifactId>
<version>7.0.1</version> <version>7.3.0</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${project.basedir}/mcore-7.0.1.jar</systemPath> <systemPath>${project.basedir}/MassiveCore-7.3.0.jar</systemPath>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

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

@ -38,13 +38,13 @@ import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.entity.FactionColl;
import com.massivecraft.factions.entity.FactionColls; import com.massivecraft.factions.entity.FactionColls;
import com.massivecraft.factions.entity.UPlayer; import com.massivecraft.factions.entity.UPlayer;
import com.massivecraft.factions.event.FactionsEventChunkChange; import com.massivecraft.factions.event.EventFactionsChunkChange;
import com.massivecraft.factions.event.FactionsEventCreate; import com.massivecraft.factions.event.EventFactionsCreate;
import com.massivecraft.factions.event.FactionsEventDisband; import com.massivecraft.factions.event.EventFactionsDisband;
import com.massivecraft.factions.event.FactionsEventHomeChange; import com.massivecraft.factions.event.EventFactionsHomeChange;
import com.massivecraft.factions.event.FactionsEventMembershipChange; import com.massivecraft.factions.event.EventFactionsMembershipChange;
import com.massivecraft.factions.event.FactionsEventNameChange; import com.massivecraft.factions.event.EventFactionsNameChange;
import com.massivecraft.mcore.ps.PS; import com.massivecraft.massivecore.ps.PS;
public class DynmapFactionsPlugin extends JavaPlugin { public class DynmapFactionsPlugin extends JavaPlugin {
private static Logger log; private static Logger log;
@ -574,7 +574,7 @@ public class DynmapFactionsPlugin extends JavaPlugin {
} }
} }
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onFPlayerJoin(FactionsEventMembershipChange event) { public void onFPlayerJoin(EventFactionsMembershipChange event) {
if(event.isCancelled()) if(event.isCancelled())
return; return;
if(playersets) { if(playersets) {
@ -583,7 +583,7 @@ public class DynmapFactionsPlugin extends JavaPlugin {
} }
} }
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onFactionCreate(FactionsEventCreate event) { public void onFactionCreate(EventFactionsCreate event) {
if(event.isCancelled()) if(event.isCancelled())
return; return;
if(playersets) if(playersets)
@ -591,7 +591,7 @@ public class DynmapFactionsPlugin extends JavaPlugin {
requestUpdateFactions(); requestUpdateFactions();
} }
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onFactionDisband(FactionsEventDisband event) { public void onFactionDisband(EventFactionsDisband event) {
if(event.isCancelled()) if(event.isCancelled())
return; return;
if(playersets) { if(playersets) {
@ -601,19 +601,19 @@ public class DynmapFactionsPlugin extends JavaPlugin {
requestUpdateFactions(); requestUpdateFactions();
} }
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onFactionRename(FactionsEventNameChange event) { public void onFactionRename(EventFactionsNameChange event) {
if(event.isCancelled()) if(event.isCancelled())
return; return;
requestUpdateFactions(); requestUpdateFactions();
} }
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onFactionRename(FactionsEventHomeChange event) { public void onFactionRename(EventFactionsHomeChange event) {
if(event.isCancelled()) if(event.isCancelled())
return; return;
requestUpdateFactions(); requestUpdateFactions();
} }
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onFactionRename(FactionsEventChunkChange event) { public void onFactionRename(EventFactionsChunkChange event) {
if(event.isCancelled()) if(event.isCancelled())
return; return;
requestUpdateFactions(); requestUpdateFactions();

2
src/main/java/org/dynmap/factions/MetricsLite.java
View File

@ -282,7 +282,7 @@ public class MetricsLite {
boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled
String pluginVersion = description.getVersion(); String pluginVersion = description.getVersion();
String serverVersion = Bukkit.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 // END server software specific section -- all code below does not use any code outside of this class / Java