Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2025-02-20 05:11:21 +01:00
Code Issues Projects Releases Wiki Activity

Removed the SY as they are worthless now

Browse Source
This commit is contained in:
TimWolla 2011-07-10 14:36:56 +02:00
parent 84452d6654
commit 15d4497c5e
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ public class War extends JavaPlugin {
private boolean defaultAutoAssignOnly = false; private boolean defaultAutoAssignOnly = false;
private int defaultTeamCap = 7; private int defaultTeamCap = 7;
private int defaultScoreCap = 10; private int defaultScoreCap = 10;
private int defaultMonumentHeal = 5; //SY private int defaultMonumentHeal = 5;
private boolean defaultBlockHeads = true; private boolean defaultBlockHeads = true;
private boolean defaultDropLootOnDeath = false; private boolean defaultDropLootOnDeath = false;
private String defaultSpawnStyle = TeamSpawnStyles.BIG; private String defaultSpawnStyle = TeamSpawnStyles.BIG;
@ -1041,7 +1041,7 @@ public class War extends JavaPlugin {
if(namedParams.containsKey("lifepool")){ if(namedParams.containsKey("lifepool")){
warzone.setLifePool(Integer.parseInt(namedParams.get("lifepool"))); warzone.setLifePool(Integer.parseInt(namedParams.get("lifepool")));
} }
if(namedParams.containsKey("monumentheal")){ //SY if(namedParams.containsKey("monumentheal")){
warzone.setMonumentHeal(Integer.parseInt(namedParams.get("monumentheal"))); warzone.setMonumentHeal(Integer.parseInt(namedParams.get("monumentheal")));
} }
if(namedParams.containsKey("teamsize")){ if(namedParams.containsKey("teamsize")){
@ -1120,7 +1120,7 @@ public class War extends JavaPlugin {
if(namedParams.containsKey("lifepool")){ if(namedParams.containsKey("lifepool")){
setDefaultLifepool(Integer.parseInt(namedParams.get("lifepool"))); setDefaultLifepool(Integer.parseInt(namedParams.get("lifepool")));
} }
if(namedParams.containsKey("monumentheal")){ //SY if(namedParams.containsKey("monumentheal")){
setDefaultMonumentHeal(Integer.parseInt(namedParams.get("monumentheal"))); setDefaultMonumentHeal(Integer.parseInt(namedParams.get("monumentheal")));
} }
if(namedParams.containsKey("teamsize")){ if(namedParams.containsKey("teamsize")){
@ -1370,11 +1370,11 @@ public class War extends JavaPlugin {
return defaultLifepool; return defaultLifepool;
} }
public void setDefaultMonumentHeal(int defaultMonumentHeal) { //SY public void setDefaultMonumentHeal(int defaultMonumentHeal) {
this.defaultMonumentHeal = defaultMonumentHeal; this.defaultMonumentHeal = defaultMonumentHeal;
} }
public int getDefaultMonumentHeal() { //SY public int getDefaultMonumentHeal() {
return defaultMonumentHeal; return defaultMonumentHeal;
} }
@ -1631,4 +1631,4 @@ public class War extends JavaPlugin {
return loaded; return loaded;
} }
} }

2
war/src/main/java/bukkit/tommytony/war/WarPlayerListener.java
View File

@ -355,7 +355,7 @@ public class WarPlayerListener extends PlayerListener {
return; return;
} }
// Monuments //SY // Monuments
if(playerTeam != null if(playerTeam != null
&& playerWarzone.nearAnyOwnedMonument(playerLoc, playerTeam) && playerWarzone.nearAnyOwnedMonument(playerLoc, playerTeam)
&& player.getHealth() < 20 && player.getHealth() < 20

4
war/src/main/java/com/tommytony/war/Warzone.java
View File

@ -330,11 +330,11 @@ public class Warzone {
return lifePool; return lifePool;
} }
public void setMonumentHeal(int monumentHeal) { //SY public void setMonumentHeal(int monumentHeal) {
this.monumentHeal = monumentHeal; this.monumentHeal = monumentHeal;
} }
public int getMonumentHeal() { //SY public int getMonumentHeal() {
return monumentHeal; return monumentHeal;
} }

4
war/src/main/java/com/tommytony/war/mappers/WarMapper.java
View File

@ -79,7 +79,7 @@ public class WarMapper {
// defaultLifePool // defaultLifePool
war.setDefaultLifepool(warConfig.getInt("defaultLifePool")); war.setDefaultLifepool(warConfig.getInt("defaultLifePool"));
// defaultMonumentHeal //SY // defaultMonumentHeal
war.setDefaultLifepool(warConfig.getInt("defaultMonumentHeal")); war.setDefaultLifepool(warConfig.getInt("defaultMonumentHeal"));
// defaultFriendlyFire // defaultFriendlyFire
@ -187,7 +187,7 @@ public class WarMapper {
// defaultLifepool // defaultLifepool
warConfig.setInt("defaultLifePool", war.getDefaultLifepool()); warConfig.setInt("defaultLifePool", war.getDefaultLifepool());
// defaultMonumentHeal //SY // defaultMonumentHeal
warConfig.setInt("defaultMonumentHeal", war.getDefaultMonumentHeal()); warConfig.setInt("defaultMonumentHeal", war.getDefaultMonumentHeal());
// defaultFriendlyFire // defaultFriendlyFire

4
war/src/main/java/com/tommytony/war/mappers/WarzoneMapper.java
View File

@ -146,7 +146,7 @@ public class WarzoneMapper {
// life pool (always set after teams, so the teams' remaining lives get initialized properly by this setter) // life pool (always set after teams, so the teams' remaining lives get initialized properly by this setter)
warzone.setLifePool(warzoneConfig.getInt("lifePool")); warzone.setLifePool(warzoneConfig.getInt("lifePool"));
// monument heal //SY // monument heal
warzone.setMonumentHeal(warzoneConfig.getInt("monumentHeal")); warzone.setMonumentHeal(warzoneConfig.getInt("monumentHeal"));
// drawZoneOutline // drawZoneOutline
@ -353,7 +353,7 @@ public class WarzoneMapper {
// life pool // life pool
warzoneConfig.setInt("lifePool", warzone.getLifePool()); warzoneConfig.setInt("lifePool", warzone.getLifePool());
// monument heal //SY // monument heal
warzoneConfig.setInt("monumentHeal", warzone.getMonumentHeal()); warzoneConfig.setInt("monumentHeal", warzone.getMonumentHeal());
// drawZoneOutline // drawZoneOutline