From 169584c9912ce2d020437467dbe7d15283a05bce Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 15 Jan 2022 04:33:13 +0000
Subject: [PATCH] System message adjustments. Thanks to Enryu.

---
 .../dist/game/data/html/teleporter/34594.htm         |  2 +-
 .../scripts/ai/areas/TalkingIsland/Raina/Raina.java  | 12 +++++++++---
 .../clientpackets/RequestExRemoveItemAttribute.java  |  1 -
 .../clientpackets/RequestExRemoveItemAttribute.java  |  1 -
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/html/teleporter/34594.htm b/L2J_Mobius_10.0_MasterClass/dist/game/data/html/teleporter/34594.htm
index 8f5eda21e1..178075721f 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/html/teleporter/34594.htm
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/html/teleporter/34594.htm
@@ -2,7 +2,7 @@
 The Platinum Tribe has taken over the 4th-6th floors of the Tower Of Insolence. They are hostile towards outsiders, so be careful.<br>
 If you leave the peace zones we have set, you will enter the battlefield.<br>
 In a battlefield, members of the same clan may be affected by AoE attacks.<br>
-But if you are in the  <font color="LEVEL">same party or alliance</font>, you won't be affected by AoE attacks of party members/alliance members. Keep this in mind.<br>
+But if you are in the <font color="LEVEL">same party or alliance</font>, you won't be affected by AoE attacks of party members/alliance members. Keep this in mind.<br>
 Which floor would you like to go to?<br>
 <Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_teleport OTHER 0">Tower of Insolence (4th Floor)</Button>
 <Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_teleport OTHER 1">Tower of Insolence (5th Floor)</Button>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
index 3f2a80df75..4437a2d288 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -489,7 +489,9 @@ public class Raina extends AbstractNpcAI
 				
 				player.setActiveClass(player.getTotalSubClasses());
 				player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.NEW_SLOT_USED));
-				player.sendPacket(SystemMessageId.THE_NEW_DUAL_CLASS_S1_HAS_BEEN_ADDED_CONGRATS);
+				final SystemMessage sm = new SystemMessage(SystemMessageId.THE_NEW_DUAL_CLASS_S1_HAS_BEEN_ADDED_CONGRATS);
+				sm.addItemName(player.getActiveClass());
+				player.sendPacket(sm);
 				player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
 				break;
 			}
@@ -553,7 +555,9 @@ public class Raina extends AbstractNpcAI
 					player.setActiveClass(classIndex);
 					player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 					player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
-					player.sendPacket(SystemMessageId.THE_NEW_DUAL_CLASS_S1_HAS_BEEN_ADDED_CONGRATS);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.THE_NEW_DUAL_CLASS_S1_HAS_BEEN_ADDED_CONGRATS);
+					sm.addItemName(player.getActiveClass());
+					player.sendPacket(sm);
 				}
 				break;
 			}
@@ -631,7 +635,9 @@ public class Raina extends AbstractNpcAI
 				{
 					player.setActiveClass(player.getTotalSubClasses());
 					player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.NEW_SLOT_USED));
-					player.sendPacket(SystemMessageId.THE_NEW_DUAL_CLASS_S1_HAS_BEEN_ADDED_CONGRATS);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.THE_NEW_DUAL_CLASS_S1_HAS_BEEN_ADDED_CONGRATS);
+					sm.addItemName(player.getActiveClass());
+					player.sendPacket(sm);
 					player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
 					player.restoreDualSkills();
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 5db2c55490..cce9fc4f8f 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
@@ -94,7 +94,6 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket
 				if (targetItem.isArmor())
 				{
 					sm.addAttribute(realElement.getClientId());
-					sm.addAttribute(realElement.getOpposite().getClientId());
 				}
 			}
 			else
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 e207154960..23c4f077b7 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
@@ -94,7 +94,6 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket
 				if (targetItem.isArmor())
 				{
 					sm.addAttribute(realElement.getClientId());
-					sm.addAttribute(realElement.getOpposite().getClientId());
 				}
 			}
 			else