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

Added latest commits for todays sync.

Browse Source
This commit is contained in:
mobius
2015-02-03 22:02:10 +00:00
parent fe25f74122
commit 094651541b
36 changed files with 216 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/AbstractRefinePacket.java
View File

@ -227,7 +227,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket
return false;
}
final CrystalType grade = item.getItem().getItemGrade();
final CrystalType grade = item.getItem().getCrystalType();
final LifeStone ls = _lifeStones.get(refinerItem.getId());
// Check for item id

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAutoSoulShot.java
View File

@ -141,7 +141,7 @@ public final class RequestAutoSoulShot extends L2GameClientPacket
{
final boolean isSoulshot = (item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT) || (item.getEtcItem().getDefaultAction() == ActionType.FISHINGSHOT);
final boolean isSpiritshot = item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT;
if ((activeChar.getActiveWeaponItem() == activeChar.getFistsWeaponItem()) || (item.getItem().getCrystalType() != activeChar.getActiveWeaponItem().getItemGradeSPlus()))
if ((activeChar.getActiveWeaponItem() == activeChar.getFistsWeaponItem()) || (item.getItem().getCrystalType() != activeChar.getActiveWeaponItem().getCrystalTypePlus()))
{
activeChar.sendPacket(isSoulshot ? SystemMessageId.THE_SOULSHOT_YOU_ARE_ATTEMPTING_TO_USE_DOES_NOT_MATCH_THE_GRADE_OF_YOUR_EQUIPPED_WEAPON : SystemMessageId.YOUR_SPIRITSHOT_DOES_NOT_MATCH_THE_WEAPON_S_GRADE);
return;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmGemStone.java
View File

@ -82,7 +82,7 @@ public final class RequestConfirmGemStone extends AbstractRefinePacket
return;
}
if (_gemStoneCount != getGemStoneCount(targetItem.getItem().getItemGrade(), ls.getGrade()))
if (_gemStoneCount != getGemStoneCount(targetItem.getItem().getCrystalType(), ls.getGrade()))
{
activeChar.sendPacket(SystemMessageId.GEMSTONE_QUANTITY_IS_INCORRECT);
return;

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmRefinerItem.java
View File

@ -70,7 +70,7 @@ public class RequestConfirmRefinerItem extends AbstractRefinePacket
}
final int refinerItemId = refinerItem.getItem().getId();
final CrystalType grade = targetItem.getItem().getItemGrade();
final CrystalType grade = targetItem.getItem().getCrystalType();
final LifeStone ls = getLifeStone(refinerItemId);
final int gemStoneId = getGemStoneId(grade);
final int gemStoneCount = getGemStoneCount(grade, ls.getGrade());

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCrystallizeItem.java
View File

@ -141,7 +141,7 @@ public final class RequestCrystallizeItem extends L2GameClientPacket
// Check if the char can crystallize items and return if false;
boolean canCrystallize = true;
switch (itemToRemove.getItem().getItemGradeSPlus())
switch (itemToRemove.getItem().getCrystalTypePlus())
{
case D:
{

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRefine.java
View File

@ -87,7 +87,7 @@ public final class RequestRefine extends AbstractRefinePacket
final int lifeStoneLevel = ls.getLevel();
final int lifeStoneGrade = ls.getGrade();
if (_gemStoneCount != getGemStoneCount(targetItem.getItem().getItemGrade(), lifeStoneGrade))
if (_gemStoneCount != getGemStoneCount(targetItem.getItem().getCrystalType(), lifeStoneGrade))
{
activeChar.sendPacket(new ExVariationResult(0, 0, 0));
activeChar.sendPacket(SystemMessageId.AUGMENTATION_FAILED_DUE_TO_INAPPROPRIATE_CONDITIONS);

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
View File

@ -120,7 +120,7 @@ public class RequestCrystallizeEstimate extends L2GameClientPacket
// Check if the char can crystallize items and return if false;
boolean canCrystallize = true;
switch (item.getItem().getItemGradeSPlus())
switch (item.getItem().getCrystalTypePlus())
{
case D:
{

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExQuestNpcLogList.java
View File

@ -61,7 +61,7 @@ public class ExQuestNpcLogList extends L2GameServerPacket
writeC(_npcLogList.size());
for (NpcLogListHolder holder : _npcLogList)
{
writeD((holder.getId()));
writeD(holder.getId());
writeC(holder.isNpcString() ? 0x01 : 0x00);
writeD(holder.getCount());
}

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java
View File

@ -324,7 +324,7 @@ public class UserInfo extends AbstractMaskPacket<UserInfoType>
writeC(_activeChar.getInventory().getTalismanSlots()); // Confirmed
writeC(_activeChar.getInventory().getBroochJewelSlots()); // Confirmed
writeC(_activeChar.getTeam().getId()); // Confirmed
writeC(0x00); // Red dotted ring on the floor
writeC(0x00); // (1 = Red, 2 = White, 3 = White Pink) dotted ring on the floor
writeC(0x00);
writeC(0x00);
writeC(0x00);