From 9ff98d0bbfcc3579f78c22cb1cd4b2611ae5441c Mon Sep 17 00:00:00 2001 From: taoneill Date: Sun, 8 Jan 2012 21:02:57 -0500 Subject: [PATCH] Fixed mapping bug where FLAGMUSTBEHOME and LIFEPOOL would get mixed up, causing chaos. --- war/src/main/java/com/tommytony/war/config/TeamConfig.java | 2 +- war/src/main/java/com/tommytony/war/mappers/WarTxtMapper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/war/src/main/java/com/tommytony/war/config/TeamConfig.java b/war/src/main/java/com/tommytony/war/config/TeamConfig.java index a22def8..87dfb8c 100644 --- a/war/src/main/java/com/tommytony/war/config/TeamConfig.java +++ b/war/src/main/java/com/tommytony/war/config/TeamConfig.java @@ -4,7 +4,7 @@ import com.tommytony.war.FlagReturn; import com.tommytony.war.TeamSpawnStyle; public enum TeamConfig { - FLAGMUSTBEHOME (Integer.class), + FLAGMUSTBEHOME (Boolean.class), FLAGPOINTSONLY (Boolean.class), FLAGRETURN (FlagReturn.class), LIFEPOOL (Integer.class), diff --git a/war/src/main/java/com/tommytony/war/mappers/WarTxtMapper.java b/war/src/main/java/com/tommytony/war/mappers/WarTxtMapper.java index c43bae9..8f4581e 100644 --- a/war/src/main/java/com/tommytony/war/mappers/WarTxtMapper.java +++ b/war/src/main/java/com/tommytony/war/mappers/WarTxtMapper.java @@ -133,7 +133,7 @@ public class WarTxtMapper { // defaultFlagPointsOnly if (warConfig.keyExists("defaultFlagPointsOnly")) { - War.war.getTeamDefaultConfig().put(TeamConfig.LIFEPOOL, warConfig.getBoolean("defaultFlagPointsOnly")); + War.war.getTeamDefaultConfig().put(TeamConfig.FLAGPOINTSONLY, warConfig.getBoolean("defaultFlagPointsOnly")); } // defaultFlagMustBeHome