2
0
Эх сурвалжийг харах

This system messages are not used any more.

Charus 15 жил өмнө
parent
commit
b341fc7b39

+ 0 - 2
L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Npc.java

@@ -1664,11 +1664,9 @@ public class L2Npc extends L2Character
 				switch (cmdChoice)
 				switch (cmdChoice)
 				{
 				{
 					case 1:
 					case 1:
-						player.sendPacket(new SystemMessage(SystemMessageId.SELECT_THE_ITEM_TO_BE_AUGMENTED));
 						player.sendPacket(new ExShowVariationMakeWindow());
 						player.sendPacket(new ExShowVariationMakeWindow());
 						break;
 						break;
 					case 2:
 					case 2:
-						player.sendPacket(new SystemMessage(SystemMessageId.SELECT_THE_ITEM_FROM_WHICH_YOU_WISH_TO_REMOVE_AUGMENTATION));
 						player.sendPacket(new ExShowVariationCancelWindow());
 						player.sendPacket(new ExShowVariationCancelWindow());
 						break;
 						break;
 				}
 				}

+ 2 - 5
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestRefine.java

@@ -50,8 +50,7 @@ public final class RequestRefine extends AbstractRefinePacket
 	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
 	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
 	 */
 	 */
 	@Override
 	@Override
-	protected
-	void runImpl()
+	protected void runImpl()
 	{
 	{
 		final L2PcInstance activeChar = getClient().getActiveChar();
 		final L2PcInstance activeChar = getClient().getActiveChar();
 		if (activeChar == null)
 		if (activeChar == null)
@@ -76,6 +75,7 @@ public final class RequestRefine extends AbstractRefinePacket
 		final LifeStone ls = getLifeStone(refinerItem.getItemId());
 		final LifeStone ls = getLifeStone(refinerItem.getItemId());
 		if (ls == null)
 		if (ls == null)
 			return;
 			return;
+
 		final int lifeStoneLevel = ls.getLevel();
 		final int lifeStoneLevel = ls.getLevel();
 		final int lifeStoneGrade = ls.getGrade();
 		final int lifeStoneGrade = ls.getGrade();
 		if (_gemStoneCount != getGemStoneCount(targetItem.getItem().getItemGrade(), lifeStoneGrade))
 		if (_gemStoneCount != getGemStoneCount(targetItem.getItem().getItemGrade(), lifeStoneGrade))
@@ -91,9 +91,7 @@ public final class RequestRefine extends AbstractRefinePacket
 			L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
 			L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
 			InventoryUpdate iu = new InventoryUpdate();
 			InventoryUpdate iu = new InventoryUpdate();
 			for (L2ItemInstance itm : unequiped)
 			for (L2ItemInstance itm : unequiped)
-			{
 				iu.addModifiedItem(itm);
 				iu.addModifiedItem(itm);
-			}
 			activeChar.sendPacket(iu);
 			activeChar.sendPacket(iu);
 			activeChar.broadcastUserInfo();
 			activeChar.broadcastUserInfo();
 		}
 		}
@@ -112,7 +110,6 @@ public final class RequestRefine extends AbstractRefinePacket
 		final int stat12 = 0x0000FFFF & aug.getAugmentationId();
 		final int stat12 = 0x0000FFFF & aug.getAugmentationId();
 		final int stat34 = aug.getAugmentationId() >> 16;
 		final int stat34 = aug.getAugmentationId() >> 16;
 		activeChar.sendPacket(new ExVariationResult(stat12,stat34,1));
 		activeChar.sendPacket(new ExVariationResult(stat12,stat34,1));
-		activeChar.sendPacket(new SystemMessage(SystemMessageId.THE_ITEM_WAS_SUCCESSFULLY_AUGMENTED));
 
 
 		InventoryUpdate iu = new InventoryUpdate();
 		InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		iu.addModifiedItem(targetItem);

+ 6 - 10
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -47,9 +47,10 @@ public final class RequestRefineCancel extends L2GameClientPacket
 	protected void runImpl()
 	protected void runImpl()
 	{
 	{
 		L2PcInstance activeChar = getClient().getActiveChar();
 		L2PcInstance activeChar = getClient().getActiveChar();
-		L2ItemInstance targetItem = (L2ItemInstance)L2World.getInstance().findObject(_targetItemObjId);
+		if (activeChar == null)
+			return;
 
 
-		if (activeChar == null) return;
+		L2ItemInstance targetItem = (L2ItemInstance)L2World.getInstance().findObject(_targetItemObjId);
 		if (targetItem == null)
 		if (targetItem == null)
 		{
 		{
 			activeChar.sendPacket(new ExVariationCancelResult(0));
 			activeChar.sendPacket(new ExVariationCancelResult(0));
@@ -69,7 +70,7 @@ public final class RequestRefineCancel extends L2GameClientPacket
 		}
 		}
 
 
 		// get the price
 		// get the price
-		int price=0;
+		int price = 0;
 		switch (targetItem.getItem().getCrystalType())
 		switch (targetItem.getItem().getCrystalType())
 		{
 		{
 			case L2Item.CRYSTAL_C:
 			case L2Item.CRYSTAL_C:
@@ -111,7 +112,8 @@ public final class RequestRefineCancel extends L2GameClientPacket
 		if (!activeChar.reduceAdena("RequestRefineCancel", price, null, true)) return;
 		if (!activeChar.reduceAdena("RequestRefineCancel", price, null, true)) return;
 
 
 		// unequip item
 		// unequip item
-		if (targetItem.isEquipped()) activeChar.disarmWeapons();
+		if (targetItem.isEquipped())
+			activeChar.disarmWeapons();
 
 
 		// remove the augmentation
 		// remove the augmentation
 		targetItem.removeAugmentation();
 		targetItem.removeAugmentation();
@@ -123,11 +125,6 @@ public final class RequestRefineCancel extends L2GameClientPacket
 		InventoryUpdate iu = new InventoryUpdate();
 		InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		iu.addModifiedItem(targetItem);
 		activeChar.sendPacket(iu);
 		activeChar.sendPacket(iu);
-
-		// send system message
-		SystemMessage sm = new SystemMessage(SystemMessageId.AUGMENTATION_HAS_BEEN_SUCCESSFULLY_REMOVED_FROM_YOUR_S1);
-		sm.addString(targetItem.getItemName());
-		activeChar.sendPacket(sm);
 	}
 	}
 
 
 	/**
 	/**
@@ -138,5 +135,4 @@ public final class RequestRefineCancel extends L2GameClientPacket
 	{
 	{
 		return _C__D0_2E_REQUESTREFINECANCEL;
 		return _C__D0_2E_REQUESTREFINECANCEL;
 	}
 	}
-
 }
 }