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

Code style changes.

Browse Source
This commit is contained in:
MobiusDev
2016-04-26 19:21:19 +00:00
parent 6a13705766
commit fc070c9238
768 changed files with 3338 additions and 4252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/java/com/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java
View File

@ -76,7 +76,7 @@ public final class ClanWarehouse extends Warehouse
@Override
public boolean validateCapacity(long slots)
{
return ((_items.size() + slots) <= Config.WAREHOUSE_SLOTS_CLAN);
return (_items.size() + slots) <= Config.WAREHOUSE_SLOTS_CLAN;
}
@Override

18
trunk/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -55,9 +55,9 @@ public abstract class Inventory extends ItemContainer
public interface PaperdollListener
{
public void notifyEquiped(int slot, L2ItemInstance inst, Inventory inventory);
void notifyEquiped(int slot, L2ItemInstance inst, Inventory inventory);
public void notifyUnequiped(int slot, L2ItemInstance inst, Inventory inventory);
void notifyUnequiped(int slot, L2ItemInstance inst, Inventory inventory);
}
// Common Items
@ -1771,7 +1771,7 @@ public abstract class Inventory extends ItemContainer
case L2Item.SLOT_L_HAND:
{
final L2ItemInstance rh = getPaperdollItem(PAPERDOLL_RHAND);
if ((rh != null) && (rh.getItem().getBodyPart() == L2Item.SLOT_LR_HAND) && !(((rh.getItemType() == WeaponType.BOW) && (item.getItemType() == EtcItemType.ARROW)) || ((rh.getItemType() == WeaponType.CROSSBOW) && (item.getItemType() == EtcItemType.BOLT)) || ((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE))))
if ((rh != null) && (rh.getItem().getBodyPart() == L2Item.SLOT_LR_HAND) && ((rh.getItemType() != WeaponType.BOW) || (item.getItemType() != EtcItemType.ARROW)) && ((rh.getItemType() != WeaponType.CROSSBOW) || (item.getItemType() != EtcItemType.BOLT)) && ((rh.getItemType() != WeaponType.FISHINGROD) || (item.getItemType() != EtcItemType.LURE)))
{
setPaperdollItem(PAPERDOLL_RHAND, null);
}
@ -1793,13 +1793,13 @@ public abstract class Inventory extends ItemContainer
{
setPaperdollItem(PAPERDOLL_LEAR, item);
}
else if (_paperdoll[PAPERDOLL_REAR] == null)
else if (_paperdoll[PAPERDOLL_REAR] != null)
{
setPaperdollItem(PAPERDOLL_REAR, item);
setPaperdollItem(PAPERDOLL_LEAR, item);
}
else
{
setPaperdollItem(PAPERDOLL_LEAR, item);
setPaperdollItem(PAPERDOLL_REAR, item);
}
break;
}
@ -1811,13 +1811,13 @@ public abstract class Inventory extends ItemContainer
{
setPaperdollItem(PAPERDOLL_LFINGER, item);
}
else if (_paperdoll[PAPERDOLL_RFINGER] == null)
else if (_paperdoll[PAPERDOLL_RFINGER] != null)
{
setPaperdollItem(PAPERDOLL_RFINGER, item);
setPaperdollItem(PAPERDOLL_LFINGER, item);
}
else
{
setPaperdollItem(PAPERDOLL_LFINGER, item);
setPaperdollItem(PAPERDOLL_RFINGER, item);
}
break;
}

10
trunk/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
View File

@ -105,7 +105,7 @@ public abstract class ItemContainer
{
for (L2ItemInstance item : _items)
{
if ((item != null) && (item.getItem().isAllowSelfResurrection()))
if ((item != null) && item.getItem().isAllowSelfResurrection())
{
return true;
}
@ -254,7 +254,7 @@ public abstract class ItemContainer
{
item.setOwnerId(process, getOwnerId(), actor, reference);
item.setItemLocation(getBaseLocation());
item.setLastChange((L2ItemInstance.ADDED));
item.setLastChange(L2ItemInstance.ADDED);
// Add item in inventory
addItem(item);
@ -490,7 +490,7 @@ public abstract class ItemContainer
*/
public L2ItemInstance destroyItem(String process, L2ItemInstance item, L2PcInstance actor, Object reference)
{
return this.destroyItem(process, item, item.getCount(), actor, reference);
return destroyItem(process, item, item.getCount(), actor, reference);
}
/**
@ -553,7 +553,7 @@ public abstract class ItemContainer
public L2ItemInstance destroyItem(String process, int objectId, long count, L2PcInstance actor, Object reference)
{
final L2ItemInstance item = getItemByObjectId(objectId);
return item == null ? null : this.destroyItem(process, item, count, actor, reference);
return item == null ? null : destroyItem(process, item, count, actor, reference);
}
/**
@ -704,7 +704,7 @@ public abstract class ItemContainer
// If stackable item is found in inventory just add to current quantity
if (item.isStackable() && (getItemByItemId(item.getId()) != null))
{
addItem("Restore", item, (getOwner() == null ? null : getOwner().getActingPlayer()), null);
addItem("Restore", item, getOwner() == null ? null : getOwner().getActingPlayer(), null);
}
else
{

6
trunk/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java
View File

@ -89,13 +89,13 @@ public class Mail extends ItemContainer
{
continue;
}
if (wh == null)
if (wh != null)
{
item.setItemLocation(ItemLocation.WAREHOUSE);
transferItem("Expire", item.getObjectId(), item.getCount(), wh, null, null);
}
else
{
transferItem("Expire", item.getObjectId(), item.getCount(), wh, null, null);
item.setItemLocation(ItemLocation.WAREHOUSE);
}
}
}

2
trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PcFreight.java
View File

@ -69,7 +69,7 @@ public class PcFreight extends ItemContainer
@Override
public boolean validateCapacity(long slots)
{
return ((getSize() + slots) <= (_owner == null ? Config.ALT_FREIGHT_SLOTS : Config.ALT_FREIGHT_SLOTS + (int) _owner.getStat().calcStat(Stats.FREIGHT_LIM, 0, null, null)));
return (getSize() + slots) <= (_owner == null ? Config.ALT_FREIGHT_SLOTS : Config.ALT_FREIGHT_SLOTS + (int) _owner.getStat().calcStat(Stats.FREIGHT_LIM, 0, null, null));
}
@Override

6
trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java
View File

@ -688,7 +688,7 @@ public class PcInventory extends Inventory
public L2ItemInstance destroyItem(String process, int objectId, long count, L2PcInstance actor, Object reference)
{
final L2ItemInstance item = getItemByObjectId(objectId);
return item == null ? null : this.destroyItem(process, item, count, actor, reference);
return item == null ? null : destroyItem(process, item, count, actor, reference);
}
/**
@ -704,7 +704,7 @@ public class PcInventory extends Inventory
public L2ItemInstance destroyItemByItemId(String process, int itemId, long count, L2PcInstance actor, Object reference)
{
final L2ItemInstance item = getItemByItemId(itemId);
return item == null ? null : this.destroyItem(process, item, count, actor, reference);
return item == null ? null : destroyItem(process, item, count, actor, reference);
}
/**
@ -978,7 +978,7 @@ public class PcInventory extends Inventory
*/
public boolean hasInventoryBlock()
{
return ((_blockMode > -1) && (_blockItems != null) && (_blockItems.length > 0));
return (_blockMode > -1) && (_blockItems != null) && (_blockItems.length > 0);
}
/**

2
trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PcWarehouse.java
View File

@ -51,6 +51,6 @@ public class PcWarehouse extends Warehouse
@Override
public boolean validateCapacity(long slots)
{
return ((_items.size() + slots) <= _owner.getWareHouseLimit());
return (_items.size() + slots) <= _owner.getWareHouseLimit();
}
}

6
trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java
View File

@ -67,7 +67,7 @@ public class PetInventory extends Inventory
{
int slots = 0;
if (!(item.isStackable() && (getItemByItemId(item.getId()) != null)) && !item.getItem().hasExImmediateEffect())
if ((!item.isStackable() || (getItemByItemId(item.getId()) == null)) && !item.getItem().hasExImmediateEffect())
{
slots++;
}
@ -78,7 +78,7 @@ public class PetInventory extends Inventory
@Override
public boolean validateCapacity(long slots)
{
return ((_items.size() + slots) <= _owner.getInventoryLimit());
return (_items.size() + slots) <= _owner.getInventoryLimit();
}
public boolean validateWeight(L2ItemInstance item, long count)
@ -96,7 +96,7 @@ public class PetInventory extends Inventory
@Override
public boolean validateWeight(long weight)
{
return ((_totalWeight + weight) <= _owner.getMaxLoad());
return (_totalWeight + weight) <= _owner.getMaxLoad();
}
@Override