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

Replaced AttributeType NONE_ARMOR with NONE.

Browse Source
This commit is contained in:
MobiusDev
2019-03-03 13:43:04 +00:00
parent bbe546f4c2
commit e6c88d6127
22 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/enums/AttributeType.java
View File

@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
*/ */
public enum AttributeType public enum AttributeType
{ {
NONE_ARMOR(-2), NONE(-2),
NONE(-1),
FIRE(0), FIRE(0),
WATER(1), WATER(1),
WIND(2), WIND(2),

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
View File

@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
_itemId = stone.getDisplayId(); _itemId = stone.getDisplayId();
_count = stone.getCount(); _count = stone.getCount();
_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId)); _atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR)) if (_atribute == AttributeType.NONE)
{ {
throw new IllegalArgumentException("Undefined Atribute item: " + stone); throw new IllegalArgumentException("Undefined Atribute item: " + stone);
} }

3
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/enums/AttributeType.java
View File

@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
*/ */
public enum AttributeType public enum AttributeType
{ {
NONE_ARMOR(-2), NONE(-2),
NONE(-1),
FIRE(0), FIRE(0),
WATER(1), WATER(1),
WIND(2), WIND(2),

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
View File

@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
_itemId = stone.getDisplayId(); _itemId = stone.getDisplayId();
_count = stone.getCount(); _count = stone.getCount();
_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId)); _atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR)) if (_atribute == AttributeType.NONE)
{ {
throw new IllegalArgumentException("Undefined Atribute item: " + stone); throw new IllegalArgumentException("Undefined Atribute item: " + stone);
} }

3
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/enums/AttributeType.java
View File

@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
*/ */
public enum AttributeType public enum AttributeType
{ {
NONE_ARMOR(-2), NONE(-2),
NONE(-1),
FIRE(0), FIRE(0),
WATER(1), WATER(1),
WIND(2), WIND(2),

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
View File

@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
_itemId = stone.getDisplayId(); _itemId = stone.getDisplayId();
_count = stone.getCount(); _count = stone.getCount();
_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId)); _atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR)) if (_atribute == AttributeType.NONE)
{ {
throw new IllegalArgumentException("Undefined Atribute item: " + stone); throw new IllegalArgumentException("Undefined Atribute item: " + stone);
} }

3
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/enums/AttributeType.java
View File

@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
*/ */
public enum AttributeType public enum AttributeType
{ {
NONE_ARMOR(-2), NONE(-2),
NONE(-1),
FIRE(0), FIRE(0),
WATER(1), WATER(1),
WIND(2), WIND(2),

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
View File

@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
_itemId = stone.getDisplayId(); _itemId = stone.getDisplayId();
_count = stone.getCount(); _count = stone.getCount();
_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId)); _atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR)) if (_atribute == AttributeType.NONE)
{ {
throw new IllegalArgumentException("Undefined Atribute item: " + stone); throw new IllegalArgumentException("Undefined Atribute item: " + stone);
} }

3
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/enums/AttributeType.java
View File

@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
*/ */
public enum AttributeType public enum AttributeType
{ {
NONE_ARMOR(-2), NONE(-2),
NONE(-1),
FIRE(0), FIRE(0),
WATER(1), WATER(1),
WIND(2), WIND(2),

2
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
View File

@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
_itemId = stone.getDisplayId(); _itemId = stone.getDisplayId();
_count = stone.getCount(); _count = stone.getCount();
_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId)); _atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR)) if (_atribute == AttributeType.NONE)
{ {
throw new IllegalArgumentException("Undefined Atribute item: " + stone); throw new IllegalArgumentException("Undefined Atribute item: " + stone);
} }

3
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/enums/AttributeType.java
View File

@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
*/ */
public enum AttributeType public enum AttributeType
{ {
NONE_ARMOR(-2), NONE(-2),
NONE(-1),
FIRE(0), FIRE(0),
WATER(1), WATER(1),
WIND(2), WIND(2),

2
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
View File

@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
_itemId = stone.getDisplayId(); _itemId = stone.getDisplayId();
_count = stone.getCount(); _count = stone.getCount();
_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId)); _atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR)) if (_atribute == AttributeType.NONE)
{ {
throw new IllegalArgumentException("Undefined Atribute item: " + stone); throw new IllegalArgumentException("Undefined Atribute item: " + stone);
} }

3
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/enums/AttributeType.java
View File

@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
*/ */
public enum AttributeType public enum AttributeType
{ {
NONE_ARMOR(-2), NONE(-2),
NONE(-1),
FIRE(0), FIRE(0),
WATER(1), WATER(1),
WIND(2), WIND(2),

2
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
View File

@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
_itemId = stone.getDisplayId(); _itemId = stone.getDisplayId();
_count = stone.getCount(); _count = stone.getCount();
_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId)); _atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR)) if (_atribute == AttributeType.NONE)
{ {
throw new IllegalArgumentException("Undefined Atribute item: " + stone); throw new IllegalArgumentException("Undefined Atribute item: " + stone);
} }

3
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/enums/AttributeType.java
View File

@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
*/ */
public enum AttributeType public enum AttributeType
{ {
NONE_ARMOR(-2), NONE(-2),
NONE(-1),
FIRE(0), FIRE(0),
WATER(1), WATER(1),
WIND(2), WIND(2),

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
View File

@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
_itemId = stone.getDisplayId(); _itemId = stone.getDisplayId();
_count = stone.getCount(); _count = stone.getCount();
_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId)); _atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR)) if (_atribute == AttributeType.NONE)
{ {
throw new IllegalArgumentException("Undefined Atribute item: " + stone); throw new IllegalArgumentException("Undefined Atribute item: " + stone);
} }

3
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/enums/AttributeType.java
View File

@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
*/ */
public enum AttributeType public enum AttributeType
{ {
NONE_ARMOR(-2), NONE(-2),
NONE(-1),
FIRE(0), FIRE(0),
WATER(1), WATER(1),
WIND(2), WIND(2),

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
View File

@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
_itemId = stone.getDisplayId(); _itemId = stone.getDisplayId();
_count = stone.getCount(); _count = stone.getCount();
_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId)); _atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR)) if (_atribute == AttributeType.NONE)
{ {
throw new IllegalArgumentException("Undefined Atribute item: " + stone); throw new IllegalArgumentException("Undefined Atribute item: " + stone);
} }

3
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/enums/AttributeType.java
View File

@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
*/ */
public enum AttributeType public enum AttributeType
{ {
NONE_ARMOR(-2), NONE(-2),
NONE(-1),
FIRE(0), FIRE(0),
WATER(1), WATER(1),
WIND(2), WIND(2),

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
View File

@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
_itemId = stone.getDisplayId(); _itemId = stone.getDisplayId();
_count = stone.getCount(); _count = stone.getCount();
_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId)); _atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR)) if (_atribute == AttributeType.NONE)
{ {
throw new IllegalArgumentException("Undefined Atribute item: " + stone); throw new IllegalArgumentException("Undefined Atribute item: " + stone);
} }

3
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/enums/AttributeType.java
View File

@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
*/ */
public enum AttributeType public enum AttributeType
{ {
NONE_ARMOR(-2), NONE(-2),
NONE(-1),
FIRE(0), FIRE(0),
WATER(1), WATER(1),
WIND(2), WIND(2),

2
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
View File

@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
_itemId = stone.getDisplayId(); _itemId = stone.getDisplayId();
_count = stone.getCount(); _count = stone.getCount();
_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId)); _atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR)) if (_atribute == AttributeType.NONE)
{ {
throw new IllegalArgumentException("Undefined Atribute item: " + stone); throw new IllegalArgumentException("Undefined Atribute item: " + stone);
} }