Merge remote branch 'Evil-Code/fixMonumentHeal' into tim

This commit is contained in:
taoneill 2011-07-14 19:52:29 -04:00
commit 311a5ea4e8

View File

@ -80,7 +80,7 @@ public class WarMapper {
war.setDefaultLifepool(warConfig.getInt("defaultLifePool")); war.setDefaultLifepool(warConfig.getInt("defaultLifePool"));
// defaultMonumentHeal // defaultMonumentHeal
war.setDefaultLifepool(warConfig.getInt("defaultMonumentHeal")); war.setDefaultMonumentHeal(warConfig.getInt("defaultMonumentHeal"));
// defaultFriendlyFire // defaultFriendlyFire
war.setDefaultFriendlyFire(warConfig.getBoolean("defaultFriendlyFire")); war.setDefaultFriendlyFire(warConfig.getBoolean("defaultFriendlyFire"));