Browse Source

Fix for skill remove on castle/fort lose, oly start.

JIV 15 years ago
parent
commit
7f03f6d22b

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/L2Clan.java

@@ -436,7 +436,7 @@ public class L2Clan
 			}
 			// remove Clanskills from Player
 			for (L2Skill skill : player.getClan().getAllSkills())
-				player.removeSkill(skill, false);
+				player.removeSkill(skill, false, true);
 			// remove Residential skills
 			if (player.getClan().getHasCastle() > 0)
 				CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);

+ 2 - 2
L2_GameServer/java/com/l2jserver/gameserver/model/entity/Castle.java

@@ -1546,13 +1546,13 @@ public class Castle
 		if (_residentialSkills != null && !_residentialSkills.isEmpty())
 		{
 			for (L2Skill sk : _residentialSkills)
-				player.removeSkill(sk, false);
+				player.removeSkill(sk, false, true);
 		}
 		if (TerritoryWarManager.getInstance().getTerritory(getCastleId()) != null)
 			for(int wardId : TerritoryWarManager.getInstance().getTerritory(getCastleId()).getOwnedWardIds())
 				if (ResidentialSkillTable.getInstance().getSkills(wardId) != null)
 					for (L2Skill sk : ResidentialSkillTable.getInstance().getSkills(wardId))
-						player.removeSkill(sk, false);
+						player.removeSkill(sk, false, true);
 	}
 	
 	/**

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/entity/Fort.java

@@ -1391,7 +1391,7 @@ public class Fort
 		if (_residentialSkills != null && !_residentialSkills.isEmpty())
 		{
 			for (L2Skill sk : _residentialSkills)
-				player.removeSkill(sk, false);
+				player.removeSkill(sk, false, true);
 		}
 	}
 }

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/olympiad/OlympiadGame.java

@@ -214,7 +214,7 @@ class OlympiadGame
 				if (player.getClan() != null)
 				{
 					for (L2Skill skill : player.getClan().getAllSkills())
-						player.removeSkill(skill, false);
+						player.removeSkill(skill, false, true);
 					if (player.getClan().getHasCastle() > 0)
 						CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
 					if (player.getClan().getHasFort() > 0)