fix Eredrim#61 Limit "non original" infected lives

Oruss7 · Jan 9, 2021 · 9f6c4b9 · 9f6c4b9
1 parent 6eacc26
commit 9f6c4b9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/net/slipcor/pvparena/core/Config.java b/src/net/slipcor/pvparena/core/Config.java
@@ -211,8 +211,9 @@ public enum CFG {
         GOAL_FOOD_FPLAYERITEMS("goal.food.fplayeritems", 10, "Food"),
         GOAL_FOOD_FTEAMITEMS("goal.food.fteamitems", 100, "Food"),
 
-        GOAL_INFECTED_ILIVES("goal.infected.iilives", 1, "Infect"),
-        GOAL_INFECTED_NLIVES("goal.infected.inlives", 1, "Infect"),
+        GOAL_INFECTED_STARTING_INFECTED_LIVES("goal.infected.iilives", 1, "Infect"),
+        GOAL_INFECTED_NORMAL_INFECTED_LIVES("goal.infected.wheninfectedlives", 1, "Infect"),
+        GOAL_INFECTED_NORMAL_LIVES("goal.infected.inlives", 1, "Infect"),
         GOAL_INFECTED_PPROTECTS("goal.infected.iplayerprotect", 0, "Infect"),
 
         GOAL_LIBERATION_JAILEDSCOREBOARD("goal.liberation.jailedscoreboard", false, "Liberation"),

diff --git a/src/net/slipcor/pvparena/goals/GoalInfect.java b/src/net/slipcor/pvparena/goals/GoalInfect.java
@@ -463,7 +463,7 @@ public void commitPlayerDeath(final Player player, final boolean doesRespawn,
                 PAGoalEvent gEvent = new PAGoalEvent(this.arena, this, "playerDeath:" + player.getName());
                 Bukkit.getPluginManager().callEvent(gEvent);
                 // dying player -> infected
-                this.getLifeMap().put(player.getName(), this.arena.getArenaConfig().getInt(CFG.GOAL_INFECTED_ILIVES));
+                this.getLifeMap().put(player.getName(), this.arena.getArenaConfig().getInt(CFG.GOAL_INFECTED_NORMAL_INFECTED_LIVES));
                 this.arena.msg(player, Language.parse(this.arena, MSG.GOAL_INFECTED_YOU));
                 this.arena.broadcast(Language.parse(this.arena, MSG.GOAL_INFECTED_PLAYER, player.getName()));
 
@@ -568,10 +568,10 @@ public void commitStart() {
 
     @Override
     public void displayInfo(final CommandSender sender) {
-        sender.sendMessage("normal lives: "
-                + this.arena.getArenaConfig().getInt(CFG.GOAL_INFECTED_NLIVES) + " || " +
-                "infected lives: "
-                + this.arena.getArenaConfig().getInt(CFG.GOAL_INFECTED_ILIVES));
+        sender.sendMessage(String.format("normal lives: %s || start infected lives: %s || when infected lives: %s",
+                this.arena.getArenaConfig().getInt(CFG.GOAL_INFECTED_NORMAL_LIVES),
+                this.arena.getArenaConfig().getInt(CFG.GOAL_INFECTED_STARTING_INFECTED_LIVES),
+                this.arena.getArenaConfig().getInt(CFG.GOAL_INFECTED_NORMAL_INFECTED_LIVES)));
     }
 
     @Override
@@ -609,7 +609,7 @@ public boolean hasSpawn(final String string) {
 
     @Override
     public void initate(final Player player) {
-        this.updateLives(player, this.arena.getArenaConfig().getInt(CFG.GOAL_INFECTED_NLIVES));
+        this.updateLives(player, this.arena.getArenaConfig().getInt(CFG.GOAL_INFECTED_NORMAL_LIVES));
     }
 
     @Override
@@ -640,11 +640,11 @@ public void parseStart() {
             for (final ArenaPlayer ap : team.getTeamMembers()) {
                 this.arena.getDebugger().i("#" + pos + ": " + ap, ap.getName());
                 this.getLifeMap().put(ap.getName(),
-                        this.arena.getArenaConfig().getInt(CFG.GOAL_INFECTED_NLIVES));
+                        this.arena.getArenaConfig().getInt(CFG.GOAL_INFECTED_NORMAL_LIVES));
                 if (pos-- == 0) {
                     infected = ap;
                     this.getLifeMap().put(ap.getName(),
-                            this.arena.getArenaConfig().getInt(CFG.GOAL_INFECTED_ILIVES));
+                            this.arena.getArenaConfig().getInt(CFG.GOAL_INFECTED_STARTING_INFECTED_LIVES));
                 }
                 //break;
             }