Fix counter goal icon and cover persistence

Author: Drefvelin

src/main/java/net/tfminecraft/simplefactions/managers/inventory/WarView.java

@@ -197,7 +197,7 @@ private void counterGoalView(Player player, War war) {
 		if (vassalTypes != null && !vassalTypes.isEmpty()) {
 			for (RelationType type : vassalTypes) {
 				if (slot >= 17) break;
-				ItemStack option = goalOption(Material.CHAIN, "§eSubjugate: " + type.getName(),
+				ItemStack option = goalOption(Material.CHAINMAIL_CHESTPLATE, "§eSubjugate: " + type.getName(),
 						"§7Make the attacker your " + type.getName());
 				ItemMeta meta = option.getItemMeta();
 				meta.getPersistentDataContainer().set(

src/test/java/net/tfminecraft/simplefactions/war/core/WarMapperTest.java

@@ -823,6 +823,37 @@ void fromData_omittedInstallationPicksDefaultsEmpty() {
 		}
 	}
 
+	@Test
+	void fromData_restoresDefenderCounterGoalAndBattleLock() {
+		Faction attacker = mock(Faction.class);
+		Faction defender = mock(Faction.class);
+		when(attacker.getId()).thenReturn("faction_a");
+		when(defender.getId()).thenReturn("faction_b");
+		FactionManager.factions.add(attacker);
+		FactionManager.factions.add(defender);
+		try {
+			WarData data = minimalWarData();
+			data.defenderCounterGoal = "subjugate";
+			data.defenderCounterRelationTypeId = "march";
+			data.firstBattleStarted = true;
+
+			War war = WarMapper.fromData(data);
+			assertEquals(WarGoalType.SUBJUGATE, war.getDefenderCounterGoal());
+			assertEquals("march", war.getDefenderCounterRelationTypeId());
+			assertTrue(war.hasFirstBattleStarted());
+
+			war.setDefenderCounterGoal(WarGoalType.TRIBUTARY, null);
+			assertEquals(WarGoalType.SUBJUGATE, war.getDefenderCounterGoal());
+			WarData roundTripped = WarMapper.toData(war);
+			assertEquals("subjugate", roundTripped.defenderCounterGoal);
+			assertEquals("march", roundTripped.defenderCounterRelationTypeId);
+			assertTrue(roundTripped.firstBattleStarted);
+		} finally {
+			FactionManager.factions.remove(attacker);
+			FactionManager.factions.remove(defender);
+		}
+	}
+
 	private static WarData minimalWarData() {
 		WarData data = new WarData();
 		data.id = 9;

src/test/java/net/tfminecraft/simplefactions/war/resolution/WarOutcomeServiceTest.java

@@ -619,6 +619,21 @@ void defenderVictory_addsObligationOnAttacker() {
 		assertEquals(10, obligation.getDaysRemaining());
 	}
 
+	@Test
+	void defenderVictory_selectedCounterGoalAppliesAgainstAttackerInsteadOfReparations() {
+		Fixture fx = fixture();
+		fx.war.setDefenderCounterGoal(WarGoalType.TRIBUTARY, null);
+		RelationType tributary = mock(RelationType.class);
+		when(tributary.getId()).thenReturn("tributary");
+		try (MockedStatic<RelationLoader> loader = mockStatic(RelationLoader.class);
+				MockedStatic<RelationManager> relations = mockStatic(RelationManager.class)) {
+			loader.when(() -> RelationLoader.getType("tributary")).thenReturn(tributary);
+			WarOutcomeService.apply(fx.war, WarEndReason.DEFENDER_VICTORY);
+			relations.verify(() -> RelationManager.setRelationForced(tributary, fx.attacker, fx.defender));
+		}
+		assertTrue(fx.payerObligations.isEmpty());
+	}
+
 	@Test
 	void tickAfterDailySettlement_decrementsThenRemoves() {
 		Faction payer = mock(Faction.class);