Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2024-11-27 20:59:39 +01:00
Code Issues Projects Releases Wiki Activity

Resolving conflicts while merging Tim's printConfig.

Browse Source
This commit is contained in:
taoneill 2011-08-31 20:14:00 -04:00
commit fa2be3d357
1 changed files with 36 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
war/src/main/java/bukkit/tommytony/war/War.java
View File

@ -434,50 +434,41 @@ public class War extends JavaPlugin {
public String printConfig(Warzone zone) { public String printConfig(Warzone zone) {
return "Warzone " + zone.getName() + " config -" return "Warzone " + zone.getName() + " config -"
+ "lifepool:" + zone.getLifePool() + " " + " lifepool:" + zone.getLifePool()
+ "teamsize:" + zone.getTeamCap() + " " + " teamsize:" + zone.getTeamCap()
+ "maxscore:" + zone.getScoreCap() + " " + " maxscore:" + zone.getScoreCap()
+ "ff:" + this.onOffStr(zone.getFriendlyFire()) + " ff:" + String.valueOf(zone.getFriendlyFire())
+ "autoassign:" + this.onOffStr(zone.getAutoAssignOnly()) + " autoassign:" + String.valueOf(zone.getAutoAssignOnly())
+ "blockheads:" + this.onOffStr(zone.isBlockHeads()) + " blockheads:" + String.valueOf(zone.isBlockHeads())
+ "spawnstyle:" + zone.getSpawnStyle() + " " + " spawnstyle:" + zone.getSpawnStyle()
+ "monumentheal:" + zone.getMonumentHeal() + " " + " monumentheal:" + zone.getMonumentHeal()
+ "unbreakable:" + this.onOffStr(zone.isUnbreakableZoneBlocks()) + " unbreakable:" + String.valueOf(zone.isUnbreakableZoneBlocks())
+ "disabled:" + this.onOffStr(zone.isDisabled()) + " disabled:" + String.valueOf(zone.isDisabled())
+ "nocreatures:" + this.onOffStr(zone.isNoCreatures()) + " nocreatures:" + String.valueOf(zone.isNoCreatures())
+ "resetonempty:" + this.onOffStr(zone.isResetOnEmpty()) + " resetonempty:" + String.valueOf(zone.isResetOnEmpty())
+ "resetonload:" + this.onOffStr(zone.isResetOnLoad()) + " resetonload:" + String.valueOf(zone.isResetOnLoad())
+ "resetonunload:" + this.onOffStr(zone.isResetOnUnload()); + " resetonunload:" + String.valueOf(zone.isResetOnUnload());
} }
public String printConfig() { public String printConfig() {
return "War config -" return "War config -"
+ "pvpinzonesonly:" + this.onOffStr(War.war.isPvpInZonesOnly()) + " pvpinzonesonly:" + String.valueOf(War.war.isPvpInZonesOnly())
+ "disablepvpmessage:" + this.onOffStr(War.war.isDisablePvpMessage()) + " disablepvpmessage:" + String.valueOf(War.war.isDisablePvpMessage())
+ "buildinzonesonly:" + this.onOffStr(War.war.isBuildInZonesOnly()) + " buildinzonesonly:" + String.valueOf(War.war.isBuildInZonesOnly())
+ " - Warzone defaults -" + " - Warzone defaults -"
+ "lifepool:" + War.war.getDefaultLifepool() + " " + " lifepool:" + War.war.getDefaultLifepool()
+ "teamsize:" + War.war.getDefaultTeamCap() + " " + " teamsize:" + War.war.getDefaultTeamCap()
+ "maxscore:" + War.war.getDefaultScoreCap() + " " + " maxscore:" + War.war.getDefaultScoreCap()
+ "ff:" + this.onOffStr(War.war.isDefaultFriendlyFire()) + " ff:" + String.valueOf(War.war.isDefaultFriendlyFire())
+ "autoassign:" + this.onOffStr(War.war.isDefaultAutoAssignOnly()) + " autoassign:" + String.valueOf(War.war.isDefaultAutoAssignOnly())
+ "blockheads:" + this.onOffStr(War.war.isDefaultBlockHeads()) + " blockheads:" + String.valueOf(War.war.isDefaultBlockHeads())
+ "spawnstyle:" + War.war.getDefaultSpawnStyle() + " " + " spawnstyle:" + War.war.getDefaultSpawnStyle()
+ "monumentheal:" + War.war.getDefaultMonumentHeal() + " " + " monumentheal:" + War.war.getDefaultMonumentHeal()
+ "unbreakable:" + this.onOffStr(War.war.isDefaultUnbreakableZoneBlocks()) + " unbreakable:" + String.valueOf(War.war.isDefaultUnbreakableZoneBlocks())
+ "nocreatures:" + this.onOffStr(War.war.isDefaultNoCreatures()) + " nocreatures:" + String.valueOf(War.war.isDefaultNoCreatures())
+ "resetonempty:" + this.onOffStr(War.war.isDefaultResetOnEmpty()) + " resetonempty:" + String.valueOf(War.war.isDefaultResetOnEmpty())
+ "resetonload:" + this.onOffStr(War.war.isDefaultResetOnLoad()) + " resetonload:" + String.valueOf(War.war.isDefaultResetOnLoad())
+ "resetonunload:" + this.onOffStr(War.war.isDefaultResetOnUnload()); + " resetonunload:" + String.valueOf(War.war.isDefaultResetOnUnload());
}
private String onOffStr(boolean makeThisAString) {
if (makeThisAString) {
return "on ";
} else {
return "off ";
}
} }
private void setZoneRallyPoint(String warzoneName, Player player) { private void setZoneRallyPoint(String warzoneName, Player player) {
@ -519,6 +510,9 @@ public class War extends JavaPlugin {
/** /**
* Colors the teams and examples in messages * Colors the teams and examples in messages
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e1b895a966e461402a178315162fcb3ae12d3d9d
* *
* @param str message-string * @param str message-string
* @param msgColor current message-color * @param msgColor current message-color