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

Pets should be affected by weapon specific buffs.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2019-11-23 20:07:50 +00:00
parent 4c78e176c1
commit 48ed880262
17 changed files with 102 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@@ -45,11 +45,16 @@ public class ConditionUsingItemType extends Condition
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
if ((effector == null) || !effector.isPlayer())
if (effector == null)
{
return false;
}
if (!effector.isPlayer())
{
return _armor ? false : (_mask & effector.getAttackType().mask()) != 0;
}
final Inventory inv = effector.getInventory();
// If ConditionUsingItemType is one between Light, Heavy or Magic
if (_armor)

7
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@@ -45,11 +45,16 @@ public class ConditionUsingItemType extends Condition
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
if ((effector == null) || !effector.isPlayer())
if (effector == null)
{
return false;
}
if (!effector.isPlayer())
{
return _armor ? false : (_mask & effector.getAttackType().mask()) != 0;
}
final Inventory inv = effector.getInventory();
// If ConditionUsingItemType is one between Light, Heavy or Magic
if (_armor)

7
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@@ -45,11 +45,16 @@ public class ConditionUsingItemType extends Condition
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
if ((effector == null) || !effector.isPlayer())
if (effector == null)
{
return false;
}
if (!effector.isPlayer())
{
return _armor ? false : (_mask & effector.getAttackType().mask()) != 0;
}
final Inventory inv = effector.getInventory();
// If ConditionUsingItemType is one between Light, Heavy or Magic
if (_armor)

7
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@@ -45,11 +45,16 @@ public class ConditionUsingItemType extends Condition
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
if ((effector == null) || !effector.isPlayer())
if (effector == null)
{
return false;
}
if (!effector.isPlayer())
{
return _armor ? false : (_mask & effector.getAttackType().mask()) != 0;
}
final Inventory inv = effector.getInventory();
// If ConditionUsingItemType is one between Light, Heavy or Magic
if (_armor)

7
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@@ -45,11 +45,16 @@ public class ConditionUsingItemType extends Condition
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
if ((effector == null) || !effector.isPlayer())
if (effector == null)
{
return false;
}
if (!effector.isPlayer())
{
return _armor ? false : (_mask & effector.getAttackType().mask()) != 0;
}
final Inventory inv = effector.getInventory();
// If ConditionUsingItemType is one between Light, Heavy or Magic
if (_armor)

7
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@@ -45,11 +45,16 @@ public class ConditionUsingItemType extends Condition
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
if ((effector == null) || !effector.isPlayer())
if (effector == null)
{
return false;
}
if (!effector.isPlayer())
{
return _armor ? false : (_mask & effector.getAttackType().mask()) != 0;
}
final Inventory inv = effector.getInventory();
// If ConditionUsingItemType is one between Light, Heavy or Magic
if (_armor)

7
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@@ -45,11 +45,16 @@ public class ConditionUsingItemType extends Condition
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
if ((effector == null) || !effector.isPlayer())
if (effector == null)
{
return false;
}
if (!effector.isPlayer())
{
return _armor ? false : (_mask & effector.getAttackType().mask()) != 0;
}
final Inventory inv = effector.getInventory();
// If ConditionUsingItemType is one between Light, Heavy or Magic
if (_armor)

7
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@@ -45,11 +45,16 @@ public class ConditionUsingItemType extends Condition
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
if ((effector == null) || !effector.isPlayer())
if (effector == null)
{
return false;
}
if (!effector.isPlayer())
{
return _armor ? false : (_mask & effector.getAttackType().mask()) != 0;
}
final Inventory inv = effector.getInventory();
// If ConditionUsingItemType is one between Light, Heavy or Magic
if (_armor)

7
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@@ -45,11 +45,16 @@ public class ConditionUsingItemType extends Condition
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
if ((effector == null) || !effector.isPlayer())
if (effector == null)
{
return false;
}
if (!effector.isPlayer())
{
return _armor ? false : (_mask & effector.getAttackType().mask()) != 0;
}
final Inventory inv = effector.getInventory();
// If ConditionUsingItemType is one between Light, Heavy or Magic
if (_armor)

7
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@@ -45,11 +45,16 @@ public class ConditionUsingItemType extends Condition
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
if ((effector == null) || !effector.isPlayer())
if (effector == null)
{
return false;
}
if (!effector.isPlayer())
{
return _armor ? false : (_mask & effector.getAttackType().mask()) != 0;
}
final Inventory inv = effector.getInventory();
// If ConditionUsingItemType is one between Light, Heavy or Magic
if (_armor)

7
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@@ -45,11 +45,16 @@ public class ConditionUsingItemType extends Condition
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
if ((effector == null) || !effector.isPlayer())
if (effector == null)
{
return false;
}
if (!effector.isPlayer())
{
return _armor ? false : (_mask & effector.getAttackType().mask()) != 0;
}
final Inventory inv = effector.getInventory();
// If ConditionUsingItemType is one between Light, Heavy or Magic
if (_armor)

7
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@@ -45,11 +45,16 @@ public class ConditionUsingItemType extends Condition
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
if ((effector == null) || !effector.isPlayer())
if (effector == null)
{
return false;
}
if (!effector.isPlayer())
{
return _armor ? false : (_mask & effector.getAttackType().mask()) != 0;
}
final Inventory inv = effector.getInventory();
// If ConditionUsingItemType is one between Light, Heavy or Magic
if (_armor)

7
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@@ -45,11 +45,16 @@ public class ConditionUsingItemType extends Condition
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
if ((effector == null) || !effector.isPlayer())
if (effector == null)
{
return false;
}
if (!effector.isPlayer())
{
return _armor ? false : (_mask & effector.getAttackType().mask()) != 0;
}
final Inventory inv = effector.getInventory();
// If ConditionUsingItemType is one between Light, Heavy or Magic
if (_armor)

7
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@@ -45,11 +45,16 @@ public class ConditionUsingItemType extends Condition
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
if ((effector == null) || !effector.isPlayer())
if (effector == null)
{
return false;
}
if (!effector.isPlayer())
{
return _armor ? false : (_mask & effector.getAttackType().mask()) != 0;
}
final Inventory inv = effector.getInventory();
// If ConditionUsingItemType is one between Light, Heavy or Magic
if (_armor)

7
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@@ -45,11 +45,16 @@ public class ConditionUsingItemType extends Condition
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
if ((effector == null) || !effector.isPlayer())
if (effector == null)
{
return false;
}
if (!effector.isPlayer())
{
return _armor ? false : (_mask & effector.getAttackType().mask()) != 0;
}
final Inventory inv = effector.getInventory();
// If ConditionUsingItemType is one between Light, Heavy or Magic
if (_armor)

7
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@@ -45,11 +45,16 @@ public class ConditionUsingItemType extends Condition
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
if ((effector == null) || !effector.isPlayer())
if (effector == null)
{
return false;
}
if (!effector.isPlayer())
{
return _armor ? false : (_mask & effector.getAttackType().mask()) != 0;
}
final Inventory inv = effector.getInventory();
// If ConditionUsingItemType is one between Light, Heavy or Magic
if (_armor)

7
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@@ -45,11 +45,16 @@ public class ConditionUsingItemType extends Condition
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
if ((effector == null) || !effector.isPlayer())
if (effector == null)
{
return false;
}
if (!effector.isPlayer())
{
return _armor ? false : (_mask & effector.getAttackType().mask()) != 0;
}
final Inventory inv = effector.getInventory();
// If ConditionUsingItemType is one between Light, Heavy or Magic
if (_armor)