From d656a2f8460d56e5dbce2a39c66d995dff6d00ed Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 11 Jan 2022 23:12:59 +0000
Subject: [PATCH] System message adjustments. Contributed by Enryu.

---
 .../network/clientpackets/RequestExRemoveItemAttribute.java | 1 +
 .../network/clientpackets/RequestStopPledgeWar.java         | 6 +++++-
 .../network/clientpackets/RequestExRemoveItemAttribute.java | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index cd897f657b..5db2c55490 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -90,6 +90,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket
 				}
 				sm.addInt(targetItem.getEnchantLevel());
 				sm.addItemName(targetItem);
+				sm.addAttribute(realElement.getClientId());
 				if (targetItem.isArmor())
 				{
 					sm.addAttribute(realElement.getClientId());
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index 9bcea7e389..f9bf7da766 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.clan.ClanPrivilege;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
+import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
 
 public class RequestStopPledgeWar implements IClientIncomingPacket
@@ -82,7 +83,10 @@ public class RequestStopPledgeWar implements IClientIncomingPacket
 			}
 			if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(member.getPlayer()))
 			{
-				player.sendPacket(SystemMessageId.THE_CLAN_WAR_CANNOT_BE_STOPPED_BECAUSE_SOMEONE_FROM_YOUR_CLAN_IS_STILL_ENGAGED_IN_BATTLE_CLAN_MEMBERS_IN_BATTLE_S1);
+				final SystemMessage sm = new SystemMessage(SystemMessageId.THE_CLAN_WAR_CANNOT_BE_STOPPED_BECAUSE_SOMEONE_FROM_YOUR_CLAN_IS_STILL_ENGAGED_IN_BATTLE_CLAN_MEMBERS_IN_BATTLE_S1);
+				sm.addString(member.getName());
+				player.sendPacket(sm);
+				player.sendPacket(ActionFailed.STATIC_PACKET);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index ff77056b09..e207154960 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -90,6 +90,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket
 				}
 				sm.addInt(targetItem.getEnchantLevel());
 				sm.addItemName(targetItem);
+				sm.addAttribute(realElement.getClientId());
 				if (targetItem.isArmor())
 				{
 					sm.addAttribute(realElement.getClientId());