Apply item skills before sending item list.

This commit is contained in:
MobiusDevelopment
2021-10-30 12:47:27 +00:00
parent 51541e68b0
commit 4df8d007bd
21 changed files with 63 additions and 21 deletions

View File

@ -318,6 +318,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Teleport Bookmark List // Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player)); client.sendPacket(new ExGetBookMarkInfoPacket(player));
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(player, false)); client.sendPacket(new ItemList(player, false));
@ -416,7 +419,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
if (player.isCursedWeaponEquipped()) if (player.isCursedWeaponEquipped())
{ {

View File

@ -323,6 +323,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Teleport Bookmark List // Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player)); client.sendPacket(new ExGetBookMarkInfoPacket(player));
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(player, false)); client.sendPacket(new ItemList(player, false));
@ -421,7 +424,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
if (player.isCursedWeaponEquipped()) if (player.isCursedWeaponEquipped())
{ {

View File

@ -323,6 +323,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Teleport Bookmark List // Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player)); client.sendPacket(new ExGetBookMarkInfoPacket(player));
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(player, false)); client.sendPacket(new ItemList(player, false));
@ -421,7 +424,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
if (player.isCursedWeaponEquipped()) if (player.isCursedWeaponEquipped())
{ {

View File

@ -323,6 +323,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Teleport Bookmark List // Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player)); client.sendPacket(new ExGetBookMarkInfoPacket(player));
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(player, false)); client.sendPacket(new ItemList(player, false));
@ -421,7 +424,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
if (player.isCursedWeaponEquipped()) if (player.isCursedWeaponEquipped())
{ {

View File

@ -322,6 +322,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Teleport Bookmark List // Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player)); client.sendPacket(new ExGetBookMarkInfoPacket(player));
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(1, player)); client.sendPacket(new ItemList(1, player));
client.sendPacket(new ItemList(2, player)); client.sendPacket(new ItemList(2, player));
@ -422,7 +425,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
if (player.isCursedWeaponEquipped()) if (player.isCursedWeaponEquipped())
{ {

View File

@ -322,6 +322,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Teleport Bookmark List // Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player)); client.sendPacket(new ExGetBookMarkInfoPacket(player));
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(1, player)); client.sendPacket(new ItemList(1, player));
client.sendPacket(new ItemList(2, player)); client.sendPacket(new ItemList(2, player));
@ -422,7 +425,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
if (player.isCursedWeaponEquipped()) if (player.isCursedWeaponEquipped())
{ {

View File

@ -322,6 +322,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Teleport Bookmark List // Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player)); client.sendPacket(new ExGetBookMarkInfoPacket(player));
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(1, player)); client.sendPacket(new ItemList(1, player));
client.sendPacket(new ItemList(2, player)); client.sendPacket(new ItemList(2, player));
@ -422,7 +425,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
if (player.isCursedWeaponEquipped()) if (player.isCursedWeaponEquipped())
{ {

View File

@ -326,6 +326,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Teleport Bookmark List // Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player)); client.sendPacket(new ExGetBookMarkInfoPacket(player));
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(1, player)); client.sendPacket(new ItemList(1, player));
client.sendPacket(new ItemList(2, player)); client.sendPacket(new ItemList(2, player));
@ -426,7 +429,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
if (player.isCursedWeaponEquipped()) if (player.isCursedWeaponEquipped())
{ {

View File

@ -336,6 +336,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Teleport Bookmark List // Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player)); client.sendPacket(new ExGetBookMarkInfoPacket(player));
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(1, player)); client.sendPacket(new ItemList(1, player));
client.sendPacket(new ItemList(2, player)); client.sendPacket(new ItemList(2, player));
@ -433,7 +436,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
if (player.isCursedWeaponEquipped()) if (player.isCursedWeaponEquipped())
{ {

View File

@ -338,6 +338,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Teleport Bookmark List // Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player)); client.sendPacket(new ExGetBookMarkInfoPacket(player));
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(1, player)); client.sendPacket(new ItemList(1, player));
client.sendPacket(new ItemList(2, player)); client.sendPacket(new ItemList(2, player));
@ -438,7 +441,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
if (player.isCursedWeaponEquipped()) if (player.isCursedWeaponEquipped())
{ {

View File

@ -372,6 +372,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Macro List // Send Macro List
player.getMacros().sendUpdate(); player.getMacros().sendUpdate();
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(player, false)); client.sendPacket(new ItemList(player, false));
@ -425,7 +428,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
// player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); // player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
// Wedding Checks // Wedding Checks
if (Config.ALLOW_WEDDING) if (Config.ALLOW_WEDDING)

View File

@ -378,6 +378,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Macro List // Send Macro List
player.getMacros().sendUpdate(); player.getMacros().sendUpdate();
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(player, false)); client.sendPacket(new ItemList(player, false));
@ -431,7 +434,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
// Wedding Checks // Wedding Checks
if (Config.ALLOW_WEDDING) if (Config.ALLOW_WEDDING)

View File

@ -321,6 +321,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Teleport Bookmark List // Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player)); client.sendPacket(new ExGetBookMarkInfoPacket(player));
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(player, false)); client.sendPacket(new ItemList(player, false));
@ -422,7 +425,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
if (player.isCursedWeaponEquipped()) if (player.isCursedWeaponEquipped())
{ {

View File

@ -321,6 +321,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Teleport Bookmark List // Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player)); client.sendPacket(new ExGetBookMarkInfoPacket(player));
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(player, false)); client.sendPacket(new ItemList(player, false));
@ -422,7 +425,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
if (player.isCursedWeaponEquipped()) if (player.isCursedWeaponEquipped())
{ {

View File

@ -322,6 +322,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Teleport Bookmark List // Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player)); client.sendPacket(new ExGetBookMarkInfoPacket(player));
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(1, player)); client.sendPacket(new ItemList(1, player));
client.sendPacket(new ItemList(2, player)); client.sendPacket(new ItemList(2, player));
@ -425,7 +428,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
if (player.isCursedWeaponEquipped()) if (player.isCursedWeaponEquipped())
{ {

View File

@ -322,6 +322,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Teleport Bookmark List // Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player)); client.sendPacket(new ExGetBookMarkInfoPacket(player));
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(1, player)); client.sendPacket(new ItemList(1, player));
client.sendPacket(new ItemList(2, player)); client.sendPacket(new ItemList(2, player));
@ -425,7 +428,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
if (player.isCursedWeaponEquipped()) if (player.isCursedWeaponEquipped())
{ {

View File

@ -322,6 +322,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Teleport Bookmark List // Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player)); client.sendPacket(new ExGetBookMarkInfoPacket(player));
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(1, player)); client.sendPacket(new ItemList(1, player));
client.sendPacket(new ItemList(2, player)); client.sendPacket(new ItemList(2, player));
@ -425,7 +428,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
if (player.isCursedWeaponEquipped()) if (player.isCursedWeaponEquipped())
{ {

View File

@ -326,6 +326,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Teleport Bookmark List // Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player)); client.sendPacket(new ExGetBookMarkInfoPacket(player));
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(1, player)); client.sendPacket(new ItemList(1, player));
client.sendPacket(new ItemList(2, player)); client.sendPacket(new ItemList(2, player));
@ -429,7 +432,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
if (player.isCursedWeaponEquipped()) if (player.isCursedWeaponEquipped())
{ {

View File

@ -319,6 +319,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Teleport Bookmark List // Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player)); client.sendPacket(new ExGetBookMarkInfoPacket(player));
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(player, false)); client.sendPacket(new ItemList(player, false));
@ -417,7 +420,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
if (player.isCursedWeaponEquipped()) if (player.isCursedWeaponEquipped())
{ {

View File

@ -326,6 +326,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Teleport Bookmark List // Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player)); client.sendPacket(new ExGetBookMarkInfoPacket(player));
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(1, player)); client.sendPacket(new ItemList(1, player));
client.sendPacket(new ItemList(2, player)); client.sendPacket(new ItemList(2, player));
@ -429,7 +432,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
if (player.isCursedWeaponEquipped()) if (player.isCursedWeaponEquipped())
{ {

View File

@ -330,6 +330,9 @@ public class EnterWorld implements IClientIncomingPacket
// Send Teleport Bookmark List // Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player)); client.sendPacket(new ExGetBookMarkInfoPacket(player));
// Apply item skills.
player.getInventory().applyItemSkills();
// Send Item List // Send Item List
client.sendPacket(new ItemList(1, player)); client.sendPacket(new ItemList(1, player));
client.sendPacket(new ItemList(2, player)); client.sendPacket(new ItemList(2, player));
@ -436,7 +439,6 @@ public class EnterWorld implements IClientIncomingPacket
player.spawnMe(player.getX(), player.getY(), player.getZ()); player.spawnMe(player.getX(), player.getY(), player.getZ());
player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading())); player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
player.getInventory().applyItemSkills();
if (player.isCursedWeaponEquipped()) if (player.isCursedWeaponEquipped())
{ {