lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make use of EnchantResult packets and Map values.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-11-17 03:01:21 +00:00
parent bb66fa5fd7
commit 8f91af3a5e
28 changed files with 148 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
View File

@@ -450,8 +450,7 @@ public class RequestEnchantItem implements ClientPacket
break;
}
}
player.sendItemList();
player.broadcastUserInfo();
request.setProcessing(false);
}
}

6
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java
View File

@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.enchant;
import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
import org.l2jmobius.gameserver.model.item.instance.Item;
@@ -30,11 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnch
*/
public class RequestExRemoveEnchantSupportItem implements ClientPacket
{
@Override
public void read(ReadablePacket packet)
{
}
@Override
public void run(GameClient client)
{

6
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java
View File

@@ -35,9 +35,11 @@ public class ExRequestFinishMultiEnchantScroll implements ClientPacket
return;
}
if (player.getRequest(EnchantItemRequest.class) != null)
if (player.getRequest(EnchantItemRequest.class) == null)
{
player.removeRequest(EnchantItemRequest.class);
return;
}
player.removeRequest(EnchantItemRequest.class);
}
}

4
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
View File

@@ -345,9 +345,9 @@ public class ExRequestMultiEnchantItemList implements ClientPacket
}
}
for (int i : _failureReward.keySet())
for (ItemHolder failure : _failureReward.values())
{
request.addMultiEnchantFailItems(_failureReward.get(i));
request.addMultiEnchantFailItems(failure);
}
request.setProcessing(false);

5
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java
View File

@@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.enchant.multi.ExResultMultiEnchantItemList;
/**
@@ -50,5 +51,9 @@ public class ExRequestViewMultiEnchantResult implements ClientPacket
final EnchantItemRequest request = player.getRequest(EnchantItemRequest.class);
player.sendPacket(new ExResultMultiEnchantItemList(player, request.getMultiSuccessEnchantList(), request.getMultiFailureEnchantList(), true));
player.sendItemList();
player.sendPacket(new ShortCutInit(player));
player.broadcastUserInfo();
}
}

18
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java
View File

@@ -16,11 +16,27 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.enchant.single;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
/**
* @author Index
* @author Mobius
*/
public class ExRequestViewEnchantResult implements ClientPacket
{
@Override
public void run(GameClient client)
{
final Player player = client.getPlayer();
if (player == null)
{
return;
}
player.sendItemList();
player.sendPacket(new ShortCutInit(player));
player.broadcastUserInfo();
}
}

18
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java
View File

@@ -92,11 +92,10 @@ public class ExResultMultiEnchantItemList extends ServerPacket
writeInt(_successEnchant.size());
if (_successEnchant.size() != 0)
{
for (int i : _successEnchant.keySet())
for (int[] success : _successEnchant.values())
{
int[] intArray = _successEnchant.get(i);
writeInt(intArray[0]);
writeInt(intArray[1]);
writeInt(success[0]);
writeInt(success[1]);
}
}
}
@@ -109,9 +108,9 @@ public class ExResultMultiEnchantItemList extends ServerPacket
writeInt(_failureEnchant.size());
if (_failureEnchant.size() != 0)
{
for (int i : _failureEnchant.keySet())
for (int failure : _failureEnchant.values())
{
writeInt(_failureEnchant.get(i));
writeInt(failure);
writeInt(0);
}
}
@@ -125,11 +124,10 @@ public class ExResultMultiEnchantItemList extends ServerPacket
{
writeInt(request.getMultiFailItemsCount());
_failureReward = request.getMultiEnchantFailItems();
for (int i : _failureReward.keySet())
for (ItemHolder failure : _failureReward.values())
{
ItemHolder itemHolder = _failureReward.get(i);
writeInt(itemHolder.getId());
writeInt((int) itemHolder.getCount());
writeInt(failure.getId());
writeInt((int) failure.getCount());
}
if (_isResult)
{

3
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
View File

@@ -450,8 +450,7 @@ public class RequestEnchantItem implements ClientPacket
break;
}
}
player.sendItemList();
player.broadcastUserInfo();
request.setProcessing(false);
}
}

6
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java
View File

@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.enchant;
import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
import org.l2jmobius.gameserver.model.item.instance.Item;
@@ -30,11 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnch
*/
public class RequestExRemoveEnchantSupportItem implements ClientPacket
{
@Override
public void read(ReadablePacket packet)
{
}
@Override
public void run(GameClient client)
{

6
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java
View File

@@ -35,9 +35,11 @@ public class ExRequestFinishMultiEnchantScroll implements ClientPacket
return;
}
if (player.getRequest(EnchantItemRequest.class) != null)
if (player.getRequest(EnchantItemRequest.class) == null)
{
player.removeRequest(EnchantItemRequest.class);
return;
}
player.removeRequest(EnchantItemRequest.class);
}
}

4
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
View File

@@ -345,9 +345,9 @@ public class ExRequestMultiEnchantItemList implements ClientPacket
}
}
for (int i : _failureReward.keySet())
for (ItemHolder failure : _failureReward.values())
{
request.addMultiEnchantFailItems(_failureReward.get(i));
request.addMultiEnchantFailItems(failure);
}
request.setProcessing(false);

5
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java
View File

@@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.enchant.multi.ExResultMultiEnchantItemList;
/**
@@ -50,5 +51,9 @@ public class ExRequestViewMultiEnchantResult implements ClientPacket
final EnchantItemRequest request = player.getRequest(EnchantItemRequest.class);
player.sendPacket(new ExResultMultiEnchantItemList(player, request.getMultiSuccessEnchantList(), request.getMultiFailureEnchantList(), true));
player.sendItemList();
player.sendPacket(new ShortCutInit(player));
player.broadcastUserInfo();
}
}

18
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java
View File

@@ -16,11 +16,27 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.enchant.single;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
/**
* @author Index
* @author Mobius
*/
public class ExRequestViewEnchantResult implements ClientPacket
{
@Override
public void run(GameClient client)
{
final Player player = client.getPlayer();
if (player == null)
{
return;
}
player.sendItemList();
player.sendPacket(new ShortCutInit(player));
player.broadcastUserInfo();
}
}

18
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java
View File

@@ -92,11 +92,10 @@ public class ExResultMultiEnchantItemList extends ServerPacket
writeInt(_successEnchant.size());
if (_successEnchant.size() != 0)
{
for (int i : _successEnchant.keySet())
for (int[] success : _successEnchant.values())
{
int[] intArray = _successEnchant.get(i);
writeInt(intArray[0]);
writeInt(intArray[1]);
writeInt(success[0]);
writeInt(success[1]);
}
}
}
@@ -109,9 +108,9 @@ public class ExResultMultiEnchantItemList extends ServerPacket
writeInt(_failureEnchant.size());
if (_failureEnchant.size() != 0)
{
for (int i : _failureEnchant.keySet())
for (int failure : _failureEnchant.values())
{
writeInt(_failureEnchant.get(i));
writeInt(failure);
writeInt(0);
}
}
@@ -125,11 +124,10 @@ public class ExResultMultiEnchantItemList extends ServerPacket
{
writeInt(request.getMultiFailItemsCount());
_failureReward = request.getMultiEnchantFailItems();
for (int i : _failureReward.keySet())
for (ItemHolder failure : _failureReward.values())
{
ItemHolder itemHolder = _failureReward.get(i);
writeInt(itemHolder.getId());
writeInt((int) itemHolder.getCount());
writeInt(failure.getId());
writeInt((int) failure.getCount());
}
if (_isResult)
{

3
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
View File

@@ -456,8 +456,7 @@ public class RequestEnchantItem implements ClientPacket
break;
}
}
player.sendItemList();
player.broadcastUserInfo();
request.setProcessing(false);
}
}

6
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java
View File

@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.enchant;
import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
import org.l2jmobius.gameserver.model.item.instance.Item;
@@ -30,11 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnch
*/
public class RequestExRemoveEnchantSupportItem implements ClientPacket
{
@Override
public void read(ReadablePacket packet)
{
}
@Override
public void run(GameClient client)
{

6
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java
View File

@@ -35,9 +35,11 @@ public class ExRequestFinishMultiEnchantScroll implements ClientPacket
return;
}
if (player.getRequest(EnchantItemRequest.class) != null)
if (player.getRequest(EnchantItemRequest.class) == null)
{
player.removeRequest(EnchantItemRequest.class);
return;
}
player.removeRequest(EnchantItemRequest.class);
}
}

4
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
View File

@@ -351,9 +351,9 @@ public class ExRequestMultiEnchantItemList implements ClientPacket
}
}
for (int i : _failureReward.keySet())
for (ItemHolder failure : _failureReward.values())
{
request.addMultiEnchantFailItems(_failureReward.get(i));
request.addMultiEnchantFailItems(failure);
}
request.setProcessing(false);

5
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java
View File

@@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.enchant.multi.ExResultMultiEnchantItemList;
/**
@@ -50,5 +51,9 @@ public class ExRequestViewMultiEnchantResult implements ClientPacket
final EnchantItemRequest request = player.getRequest(EnchantItemRequest.class);
player.sendPacket(new ExResultMultiEnchantItemList(player, request.getMultiSuccessEnchantList(), request.getMultiFailureEnchantList(), true));
player.sendItemList();
player.sendPacket(new ShortCutInit(player));
player.broadcastUserInfo();
}
}

18
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java
View File

@@ -16,11 +16,27 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.enchant.single;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
/**
* @author Index
* @author Mobius
*/
public class ExRequestViewEnchantResult implements ClientPacket
{
@Override
public void run(GameClient client)
{
final Player player = client.getPlayer();
if (player == null)
{
return;
}
player.sendItemList();
player.sendPacket(new ShortCutInit(player));
player.broadcastUserInfo();
}
}

18
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java
View File

@@ -92,11 +92,10 @@ public class ExResultMultiEnchantItemList extends ServerPacket
writeInt(_successEnchant.size());
if (_successEnchant.size() != 0)
{
for (int i : _successEnchant.keySet())
for (int[] success : _successEnchant.values())
{
int[] intArray = _successEnchant.get(i);
writeInt(intArray[0]);
writeInt(intArray[1]);
writeInt(success[0]);
writeInt(success[1]);
}
}
}
@@ -109,9 +108,9 @@ public class ExResultMultiEnchantItemList extends ServerPacket
writeInt(_failureEnchant.size());
if (_failureEnchant.size() != 0)
{
for (int i : _failureEnchant.keySet())
for (int failure : _failureEnchant.values())
{
writeInt(_failureEnchant.get(i));
writeInt(failure);
writeInt(0);
}
}
@@ -125,11 +124,10 @@ public class ExResultMultiEnchantItemList extends ServerPacket
{
writeInt(request.getMultiFailItemsCount());
_failureReward = request.getMultiEnchantFailItems();
for (int i : _failureReward.keySet())
for (ItemHolder failure : _failureReward.values())
{
ItemHolder itemHolder = _failureReward.get(i);
writeInt(itemHolder.getId());
writeInt((int) itemHolder.getCount());
writeInt(failure.getId());
writeInt((int) failure.getCount());
}
if (_isResult)
{

3
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
View File

@@ -456,8 +456,7 @@ public class RequestEnchantItem implements ClientPacket
break;
}
}
player.sendItemList();
player.broadcastUserInfo();
request.setProcessing(false);
}
}

6
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java
View File

@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.enchant;
import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
import org.l2jmobius.gameserver.model.item.instance.Item;
@@ -30,11 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnch
*/
public class RequestExRemoveEnchantSupportItem implements ClientPacket
{
@Override
public void read(ReadablePacket packet)
{
}
@Override
public void run(GameClient client)
{

6
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java
View File

@@ -35,9 +35,11 @@ public class ExRequestFinishMultiEnchantScroll implements ClientPacket
return;
}
if (player.getRequest(EnchantItemRequest.class) != null)
if (player.getRequest(EnchantItemRequest.class) == null)
{
player.removeRequest(EnchantItemRequest.class);
return;
}
player.removeRequest(EnchantItemRequest.class);
}
}

4
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
View File

@@ -351,9 +351,9 @@ public class ExRequestMultiEnchantItemList implements ClientPacket
}
}
for (int i : _failureReward.keySet())
for (ItemHolder failure : _failureReward.values())
{
request.addMultiEnchantFailItems(_failureReward.get(i));
request.addMultiEnchantFailItems(failure);
}
request.setProcessing(false);

5
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java
View File

@@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.enchant.multi.ExResultMultiEnchantItemList;
/**
@@ -50,5 +51,9 @@ public class ExRequestViewMultiEnchantResult implements ClientPacket
final EnchantItemRequest request = player.getRequest(EnchantItemRequest.class);
player.sendPacket(new ExResultMultiEnchantItemList(player, request.getMultiSuccessEnchantList(), request.getMultiFailureEnchantList(), true));
player.sendItemList();
player.sendPacket(new ShortCutInit(player));
player.broadcastUserInfo();
}
}

18
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java
View File

@@ -16,11 +16,27 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.enchant.single;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
/**
* @author Index
* @author Mobius
*/
public class ExRequestViewEnchantResult implements ClientPacket
{
@Override
public void run(GameClient client)
{
final Player player = client.getPlayer();
if (player == null)
{
return;
}
player.sendItemList();
player.sendPacket(new ShortCutInit(player));
player.broadcastUserInfo();
}
}

18
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java
View File

@@ -92,11 +92,10 @@ public class ExResultMultiEnchantItemList extends ServerPacket
writeInt(_successEnchant.size());
if (_successEnchant.size() != 0)
{
for (int i : _successEnchant.keySet())
for (int[] success : _successEnchant.values())
{
int[] intArray = _successEnchant.get(i);
writeInt(intArray[0]);
writeInt(intArray[1]);
writeInt(success[0]);
writeInt(success[1]);
}
}
}
@@ -109,9 +108,9 @@ public class ExResultMultiEnchantItemList extends ServerPacket
writeInt(_failureEnchant.size());
if (_failureEnchant.size() != 0)
{
for (int i : _failureEnchant.keySet())
for (int failure : _failureEnchant.values())
{
writeInt(_failureEnchant.get(i));
writeInt(failure);
writeInt(0);
}
}
@@ -125,11 +124,10 @@ public class ExResultMultiEnchantItemList extends ServerPacket
{
writeInt(request.getMultiFailItemsCount());
_failureReward = request.getMultiEnchantFailItems();
for (int i : _failureReward.keySet())
for (ItemHolder failure : _failureReward.values())
{
ItemHolder itemHolder = _failureReward.get(i);
writeInt(itemHolder.getId());
writeInt((int) itemHolder.getCount());
writeInt(failure.getId());
writeInt((int) failure.getCount());
}
if (_isResult)
{