Fix handling of 1.6.8 versus latest 1.7.5 (API changes)
This commit is contained in:
parent
1667d1072b
commit
36d7f22b9b
2
pom.xml
2
pom.xml
@ -2,7 +2,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.dynmap</groupId>
|
||||
<artifactId>Dynmap-Factions</artifactId>
|
||||
<version>0.30</version>
|
||||
<version>0.21</version>
|
||||
|
||||
<build>
|
||||
<resources>
|
||||
|
@ -193,24 +193,36 @@ public class DynmapFactionsPlugin extends JavaPlugin {
|
||||
|
||||
private String formatInfoWindow(Faction fact) {
|
||||
String v = "<div class=\"regioninfo\">"+infowindow+"</div>";
|
||||
v = v.replaceAll("%regionname%", ChatColor.stripColor(fact.getTag()));
|
||||
FPlayer adm = fact.getFPlayerLeader();
|
||||
v = v.replaceAll("%playerowners%", (adm!=null)?adm.getName():"");
|
||||
v = v.replace("%regionname%", ChatColor.stripColor(fact.getTag()));
|
||||
FPlayer adm;
|
||||
try {
|
||||
adm = fact.getFPlayerAdmin();
|
||||
} catch (NoSuchMethodError nsme) {
|
||||
adm = fact.getFPlayerLeader();
|
||||
}
|
||||
v = v.replace("%playerowners%", (adm!=null)?adm.getName():"");
|
||||
String res = "";
|
||||
for(FPlayer r : fact.getFPlayers()) {
|
||||
if(res.length()>0) res += ", ";
|
||||
res += r.getName();
|
||||
}
|
||||
v = v.replaceAll("%playermembers%", res);
|
||||
v = v.replace("%playermembers%", res);
|
||||
|
||||
v = v.replaceAll("%nation%", ChatColor.stripColor(fact.getTag()));
|
||||
v = v.replace("%nation%", ChatColor.stripColor(fact.getTag()));
|
||||
/* Build flags */
|
||||
String flgs = "open: " + fact.getOpen();
|
||||
for(FFlag ff : FFlag.values()) {
|
||||
flgs += "<br/>" + ff.getNicename() + ": " + fact.getFlag(ff);
|
||||
v = v.replaceAll("%flag." + ff.name() + "%", fact.getFlag(ff)?"true":"false");
|
||||
try {
|
||||
for(FFlag ff : FFlag.values()) {
|
||||
flgs += "<br/>" + ff.getNicename() + ": " + fact.getFlag(ff);
|
||||
v = v.replace("%flag." + ff.name() + "%", fact.getFlag(ff)?"true":"false");
|
||||
}
|
||||
} catch (NoClassDefFoundError ncdfe) {
|
||||
flgs += "<br/>peaceful: " + fact.isPeaceful();
|
||||
v = v.replace("%flag.PEACEFUL%", fact.isPeaceful()?"true":"false");
|
||||
flgs += "<br/>peacefulExplosionsEnabled: " + fact.getPeacefulExplosionsEnabled();
|
||||
v = v.replace("%flag.EXPLOSIONS%", fact.getPeacefulExplosionsEnabled()?"true":"false");
|
||||
}
|
||||
v = v.replaceAll("%flags%", flgs);
|
||||
v = v.replace("%flags%", flgs);
|
||||
return v;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user