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

Fixed redundant removeBonus after weapon disarm.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-01-18 05:50:51 +00:00
parent 8fc3e43a4d
commit 495fb6a45a
2 changed files with 22 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
View File

@@ -149,7 +149,6 @@ public class UseItem implements IClientIncomingPacket
return; return;
} }
final int itemId = item.getItemId();
/* /*
* Alt game - Karma punishment // SOE 736 Scroll of Escape 1538 Blessed Scroll of Escape 1829 Scroll of Escape: Clan Hall 1830 Scroll of Escape: Castle 3958 L2Day - Blessed Scroll of Escape 5858 Blessed Scroll of Escape: Clan Hall 5859 Blessed Scroll of Escape: Castle 6663 Scroll of Escape: * Alt game - Karma punishment // SOE 736 Scroll of Escape 1538 Blessed Scroll of Escape 1829 Scroll of Escape: Clan Hall 1830 Scroll of Escape: Castle 3958 L2Day - Blessed Scroll of Escape 5858 Blessed Scroll of Escape: Clan Hall 5859 Blessed Scroll of Escape: Castle 6663 Scroll of Escape:
* Orc Village 6664 Scroll of Escape: Silenos Village 7117 Scroll of Escape to Talking Island 7118 Scroll of Escape to Elven Village 7119 Scroll of Escape to Dark Elf Village 7120 Scroll of Escape to Orc Village 7121 Scroll of Escape to Dwarven Village 7122 Scroll of Escape to Gludin Village * Orc Village 6664 Scroll of Escape: Silenos Village 7117 Scroll of Escape to Talking Island 7118 Scroll of Escape to Elven Village 7119 Scroll of Escape to Dark Elf Village 7120 Scroll of Escape to Orc Village 7121 Scroll of Escape to Dwarven Village 7122 Scroll of Escape to Gludin Village
@@ -158,6 +157,7 @@ public class UseItem implements IClientIncomingPacket
* Island 7555 Scroll of Escape to Elven Village 7556 Scroll of Escape to Dark Elf Village 7557 Scroll of Escape to Orc Village 7558 Scroll of Escape to Dwarven Village 7559 Scroll of Escape to Giran Castle Town 7618 Scroll of Escape - Ketra Orc Village 7619 Scroll of Escape - Varka Silenos * Island 7555 Scroll of Escape to Elven Village 7556 Scroll of Escape to Dark Elf Village 7557 Scroll of Escape to Orc Village 7558 Scroll of Escape to Dwarven Village 7559 Scroll of Escape to Giran Castle Town 7618 Scroll of Escape - Ketra Orc Village 7619 Scroll of Escape - Varka Silenos
* Village 10129 Scroll of Escape : Fortress 10130 Blessed Scroll of Escape : Fortress * Village 10129 Scroll of Escape : Fortress 10130 Blessed Scroll of Escape : Fortress
*/ */
final int itemId = item.getItemId();
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (player.getKarma() > 0) && ((itemId == 736) || (itemId == 1538) || (itemId == 1829) || (itemId == 1830) || (itemId == 3958) || (itemId == 5858) || (itemId == 5859) || (itemId == 6663) || (itemId == 6664) || ((itemId >= 7117) && (itemId <= 7135)) || ((itemId >= 7554) && (itemId <= 7559)) || (itemId == 7618) || (itemId == 7619) || (itemId == 10129) || (itemId == 10130))) if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (player.getKarma() > 0) && ((itemId == 736) || (itemId == 1538) || (itemId == 1829) || (itemId == 1830) || (itemId == 3958) || (itemId == 5858) || (itemId == 5859) || (itemId == 6663) || (itemId == 6664) || ((itemId >= 7117) && (itemId <= 7135)) || ((itemId >= 7554) && (itemId <= 7559)) || (itemId == 7618) || (itemId == 7619) || (itemId == 10129) || (itemId == 10130)))
{ {
return; return;
@@ -254,13 +254,6 @@ public class UseItem implements IClientIncomingPacket
} }
} }
/*
* //You can't equip Shield if you have specific weapon equiped, not retail Weapon curwep = activeChar.getActiveWeaponItem(); if(curwep != null) { if(curwep.getItemType() == WeaponType.DUAL && item.getItemType() == WeaponType.NONE) { activeChar.sendMessage("You are not allowed to do this.");
* return; } else if(curwep.getItemType() == WeaponType.BOW && item.getItemType() == WeaponType.NONE) { activeChar.sendMessage("You are not allowed to do this."); return; } else if(curwep.getItemType() == WeaponType.BIGBLUNT && item.getItemType() == WeaponType.NONE) {
* activeChar.sendMessage("You are not allowed to do this."); return; } else if(curwep.getItemType() == WeaponType.BIGSWORD && item.getItemType() == WeaponType.NONE) { activeChar.sendMessage("You are not allowed to do this."); return; } else if(curwep.getItemType() == WeaponType.POLE &&
* item.getItemType() == WeaponType.NONE) { activeChar.sendMessage("You are not allowed to do this."); return; } else if(curwep.getItemType() == WeaponType.DUALFIST && item.getItemType() == WeaponType.NONE) { activeChar.sendMessage("You are not allowed to do this."); return; } }
*/
// Char cannot use item when dead // Char cannot use item when dead
if (player.isDead()) if (player.isDead())
{ {
@@ -297,8 +290,6 @@ public class UseItem implements IClientIncomingPacket
return; return;
} }
int bodyPart = item.getItem().getBodyPart();
// Like L2OFF you can't use equips while you are casting // Like L2OFF you can't use equips while you are casting
if ((player.isCastingNow() || player.isCastingPotionNow() || player.isMounted())) if ((player.isCastingNow() || player.isCastingPotionNow() || player.isMounted()))
{ {
@@ -306,13 +297,8 @@ public class UseItem implements IClientIncomingPacket
return; return;
} }
// Like L2OFF, since c5 you can equip weapon
// Don't allow weapon/shield equipment if wearing formal wear
/*
* if (activeChar.isWearingFormalWear() && (bodyPart == Item.SLOT_LR_HAND || bodyPart == Item.SLOT_L_HAND || bodyPart == Item.SLOT_R_HAND)) { SystemMessage sm = SystemMessageId.CANNOT_USE_ITEMS_SKILLS_WITH_FORMALWEAR); activeChar.sendPacket(sm); return; }
*/
// Over enchant protection // Over enchant protection
int bodyPart = item.getItem().getBodyPart();
if (Config.PROTECTED_ENCHANT) if (Config.PROTECTED_ENCHANT)
{ {
switch (bodyPart) switch (bodyPart)
@@ -419,7 +405,6 @@ public class UseItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_DISARMED); sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_DISARMED);
sm.addItemName(itemId); sm.addItemName(itemId);
} }
player.sendPacket(sm); player.sendPacket(sm);
switch (item.getEquipSlot()) switch (item.getEquipSlot())
@@ -464,6 +449,7 @@ public class UseItem implements IClientIncomingPacket
} }
} }
// unEquipItem will call also the remove boni for augument
items = player.getInventory().unEquipItemInBodySlotAndRecord(bodyPart); items = player.getInventory().unEquipItemInBodySlotAndRecord(bodyPart);
} }
else else
@@ -489,40 +475,37 @@ public class UseItem implements IClientIncomingPacket
// dont allow an item to replace a wear-item // dont allow an item to replace a wear-item
return; return;
} }
else if (tempBodyPart == 0x4000) // left+right hand equipment else if (tempBodyPart == ItemTemplate.SLOT_LR_HAND)
{ {
// this may not remove left OR right hand equipment // this may not remove left OR right hand equipment
tempItem = player.getInventory().getPaperdollItem(7); tempItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
if ((tempItem != null) && tempItem.isWear()) if ((tempItem != null) && tempItem.isWear())
{ {
return; return;
} }
tempItem = player.getInventory().getPaperdollItem(8); tempItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
if ((tempItem != null) && tempItem.isWear()) if ((tempItem != null) && tempItem.isWear())
{ {
return; return;
} }
} }
else if (tempBodyPart == 0x8000) // fullbody armor else if (tempBodyPart == ItemTemplate.SLOT_FULL_ARMOR)
{ {
// this may not remove chest or leggins // this may not remove chest or leggings
tempItem = player.getInventory().getPaperdollItem(10); tempItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST);
if ((tempItem != null) && tempItem.isWear()) if ((tempItem != null) && tempItem.isWear())
{ {
return; return;
} }
tempItem = player.getInventory().getPaperdollItem(11); tempItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LEGS);
if ((tempItem != null) && tempItem.isWear()) if ((tempItem != null) && tempItem.isWear())
{ {
return; return;
} }
} }
// Left hand
tempItem = player.getInventory().getPaperdollItem(7);
if (item.getEnchantLevel() > 0) if (item.getEnchantLevel() > 0)
{ {
sm = new SystemMessage(SystemMessageId.EQUIPPED_S1_S2); sm = new SystemMessage(SystemMessageId.EQUIPPED_S1_S2);

44
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
View File

@@ -150,7 +150,6 @@ public class UseItem implements IClientIncomingPacket
return; return;
} }
final int itemId = item.getItemId();
/* /*
* Alt game - Karma punishment // SOE 736 Scroll of Escape 1538 Blessed Scroll of Escape 1829 Scroll of Escape: Clan Hall 1830 Scroll of Escape: Castle 3958 L2Day - Blessed Scroll of Escape 5858 Blessed Scroll of Escape: Clan Hall 5859 Blessed Scroll of Escape: Castle 6663 Scroll of Escape: * Alt game - Karma punishment // SOE 736 Scroll of Escape 1538 Blessed Scroll of Escape 1829 Scroll of Escape: Clan Hall 1830 Scroll of Escape: Castle 3958 L2Day - Blessed Scroll of Escape 5858 Blessed Scroll of Escape: Clan Hall 5859 Blessed Scroll of Escape: Castle 6663 Scroll of Escape:
* Orc Village 6664 Scroll of Escape: Silenos Village 7117 Scroll of Escape to Talking Island 7118 Scroll of Escape to Elven Village 7119 Scroll of Escape to Dark Elf Village 7120 Scroll of Escape to Orc Village 7121 Scroll of Escape to Dwarven Village 7122 Scroll of Escape to Gludin Village * Orc Village 6664 Scroll of Escape: Silenos Village 7117 Scroll of Escape to Talking Island 7118 Scroll of Escape to Elven Village 7119 Scroll of Escape to Dark Elf Village 7120 Scroll of Escape to Orc Village 7121 Scroll of Escape to Dwarven Village 7122 Scroll of Escape to Gludin Village
@@ -159,6 +158,7 @@ public class UseItem implements IClientIncomingPacket
* Island 7555 Scroll of Escape to Elven Village 7556 Scroll of Escape to Dark Elf Village 7557 Scroll of Escape to Orc Village 7558 Scroll of Escape to Dwarven Village 7559 Scroll of Escape to Giran Castle Town 7618 Scroll of Escape - Ketra Orc Village 7619 Scroll of Escape - Varka Silenos * Island 7555 Scroll of Escape to Elven Village 7556 Scroll of Escape to Dark Elf Village 7557 Scroll of Escape to Orc Village 7558 Scroll of Escape to Dwarven Village 7559 Scroll of Escape to Giran Castle Town 7618 Scroll of Escape - Ketra Orc Village 7619 Scroll of Escape - Varka Silenos
* Village 10129 Scroll of Escape : Fortress 10130 Blessed Scroll of Escape : Fortress * Village 10129 Scroll of Escape : Fortress 10130 Blessed Scroll of Escape : Fortress
*/ */
final int itemId = item.getItemId();
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (player.getKarma() > 0) && ((itemId == 736) || (itemId == 1538) || (itemId == 1829) || (itemId == 1830) || (itemId == 3958) || (itemId == 5858) || (itemId == 5859) || (itemId == 6663) || (itemId == 6664) || ((itemId >= 7117) && (itemId <= 7135)) || ((itemId >= 7554) && (itemId <= 7559)) || (itemId == 7618) || (itemId == 7619) || (itemId == 10129) || (itemId == 10130))) if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (player.getKarma() > 0) && ((itemId == 736) || (itemId == 1538) || (itemId == 1829) || (itemId == 1830) || (itemId == 3958) || (itemId == 5858) || (itemId == 5859) || (itemId == 6663) || (itemId == 6664) || ((itemId >= 7117) && (itemId <= 7135)) || ((itemId >= 7554) && (itemId <= 7559)) || (itemId == 7618) || (itemId == 7619) || (itemId == 10129) || (itemId == 10130)))
{ {
return; return;
@@ -255,13 +255,6 @@ public class UseItem implements IClientIncomingPacket
} }
} }
/*
* //You can't equip Shield if you have specific weapon equiped, not retail Weapon curwep = activeChar.getActiveWeaponItem(); if(curwep != null) { if(curwep.getItemType() == WeaponType.DUAL && item.getItemType() == WeaponType.NONE) { activeChar.sendMessage("You are not allowed to do this.");
* return; } else if(curwep.getItemType() == WeaponType.BOW && item.getItemType() == WeaponType.NONE) { activeChar.sendMessage("You are not allowed to do this."); return; } else if(curwep.getItemType() == WeaponType.BIGBLUNT && item.getItemType() == WeaponType.NONE) {
* activeChar.sendMessage("You are not allowed to do this."); return; } else if(curwep.getItemType() == WeaponType.BIGSWORD && item.getItemType() == WeaponType.NONE) { activeChar.sendMessage("You are not allowed to do this."); return; } else if(curwep.getItemType() == WeaponType.POLE &&
* item.getItemType() == WeaponType.NONE) { activeChar.sendMessage("You are not allowed to do this."); return; } else if(curwep.getItemType() == WeaponType.DUALFIST && item.getItemType() == WeaponType.NONE) { activeChar.sendMessage("You are not allowed to do this."); return; } }
*/
// Char cannot use item when dead // Char cannot use item when dead
if (player.isDead()) if (player.isDead())
{ {
@@ -298,8 +291,6 @@ public class UseItem implements IClientIncomingPacket
return; return;
} }
int bodyPart = item.getItem().getBodyPart();
// Like L2OFF you can't use equips while you are casting // Like L2OFF you can't use equips while you are casting
if ((player.isCastingNow() || player.isCastingPotionNow() || player.isMounted())) if ((player.isCastingNow() || player.isCastingPotionNow() || player.isMounted()))
{ {
@@ -307,13 +298,8 @@ public class UseItem implements IClientIncomingPacket
return; return;
} }
// Like L2OFF, since c5 you can equip weapon
// Don't allow weapon/shield equipment if wearing formal wear
/*
* if (activeChar.isWearingFormalWear() && (bodyPart == Item.SLOT_LR_HAND || bodyPart == Item.SLOT_L_HAND || bodyPart == Item.SLOT_R_HAND)) { SystemMessage sm = SystemMessageId.CANNOT_USE_ITEMS_SKILLS_WITH_FORMALWEAR); activeChar.sendPacket(sm); return; }
*/
// Over enchant protection // Over enchant protection
int bodyPart = item.getItem().getBodyPart();
if (Config.PROTECTED_ENCHANT) if (Config.PROTECTED_ENCHANT)
{ {
switch (bodyPart) switch (bodyPart)
@@ -450,15 +436,8 @@ public class UseItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_DISARMED); sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_DISARMED);
sm.addItemName(itemId); sm.addItemName(itemId);
} }
player.sendPacket(sm); player.sendPacket(sm);
// Remove augementation bonus on unequipment
if (item.isAugmented())
{
item.getAugmentation().removeBonus(player);
}
switch (item.getEquipSlot()) switch (item.getEquipSlot())
{ {
case 1: case 1:
@@ -501,6 +480,7 @@ public class UseItem implements IClientIncomingPacket
} }
} }
// unEquipItem will call also the remove boni for augument
items = player.getInventory().unEquipItemInBodySlotAndRecord(bodyPart); items = player.getInventory().unEquipItemInBodySlotAndRecord(bodyPart);
} }
else else
@@ -520,7 +500,7 @@ public class UseItem implements IClientIncomingPacket
final int tempBodyPart = item.getItem().getBodyPart(); final int tempBodyPart = item.getItem().getBodyPart();
Item tempItem = player.getInventory().getPaperdollItemByItemId(tempBodyPart); Item tempItem = player.getInventory().getPaperdollItemByItemId(tempBodyPart);
// remove augmentation stats for replaced items currently weapons only.. // remove augmentation stats for replaced items currently weapons only.
if ((tempItem != null) && tempItem.isAugmented()) if ((tempItem != null) && tempItem.isAugmented())
{ {
tempItem.getAugmentation().removeBonus(player); tempItem.getAugmentation().removeBonus(player);
@@ -532,31 +512,31 @@ public class UseItem implements IClientIncomingPacket
// dont allow an item to replace a wear-item // dont allow an item to replace a wear-item
return; return;
} }
else if (tempBodyPart == 0x4000) // left+right hand equipment else if (tempBodyPart == ItemTemplate.SLOT_LR_HAND)
{ {
// this may not remove left OR right hand equipment // this may not remove left OR right hand equipment
tempItem = player.getInventory().getPaperdollItem(7); tempItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
if ((tempItem != null) && tempItem.isWear()) if ((tempItem != null) && tempItem.isWear())
{ {
return; return;
} }
tempItem = player.getInventory().getPaperdollItem(8); tempItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
if ((tempItem != null) && tempItem.isWear()) if ((tempItem != null) && tempItem.isWear())
{ {
return; return;
} }
} }
else if (tempBodyPart == 0x8000) // fullbody armor else if (tempBodyPart == ItemTemplate.SLOT_FULL_ARMOR)
{ {
// this may not remove chest or leggins // this may not remove chest or leggings
tempItem = player.getInventory().getPaperdollItem(10); tempItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST);
if ((tempItem != null) && tempItem.isWear()) if ((tempItem != null) && tempItem.isWear())
{ {
return; return;
} }
tempItem = player.getInventory().getPaperdollItem(11); tempItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LEGS);
if ((tempItem != null) && tempItem.isWear()) if ((tempItem != null) && tempItem.isWear())
{ {
return; return;
@@ -564,7 +544,7 @@ public class UseItem implements IClientIncomingPacket
} }
// Left hand // Left hand
tempItem = player.getInventory().getPaperdollItem(7); tempItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
// Elrokian Trap like L2OFF, remove skills // Elrokian Trap like L2OFF, remove skills
if ((tempItem != null) && (tempItem.getItemId() == 8763)) if ((tempItem != null) && (tempItem.getItemId() == 8763))
{ {