From 911c0ec52f2d3abfe165c4666143ae46cc7c45f3 Mon Sep 17 00:00:00 2001 From: Ziggy Date: Sun, 14 Mar 2021 15:45:19 +0100 Subject: [PATCH] Reset player PvP status when changing factions to prevent the old status from carrying over #343 --- .../holocore/services/gameplay/faction/FactionFlagService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/projectswg/holocore/services/gameplay/faction/FactionFlagService.java b/src/main/java/com/projectswg/holocore/services/gameplay/faction/FactionFlagService.java index 4440ec912..3210dbeac 100644 --- a/src/main/java/com/projectswg/holocore/services/gameplay/faction/FactionFlagService.java +++ b/src/main/java/com/projectswg/holocore/services/gameplay/faction/FactionFlagService.java @@ -178,6 +178,7 @@ public class FactionFlagService extends Service { Faction newFaction = fi.getNewFaction(); target.setFaction(newFaction); + target.setPvpStatus(PvpStatus.COMBATANT); // Reset status to default, preventing special forces state from carrying over handleFlagChange(target); }