Reworked Attackable rewardAttributeExp method.
This commit is contained in:
parent
e2b5238d4e
commit
2e5a8e64d7
@ -720,13 +720,12 @@ public class Attackable extends Npc
|
|||||||
|
|
||||||
private void rewardAttributeExp(Player player, long damage, long totalDamage)
|
private void rewardAttributeExp(Player player, long damage, long totalDamage)
|
||||||
{
|
{
|
||||||
if ((player.getActiveElementalSpiritType() > 0) && (getAttributeExp() > 0) && (getElementalSpiritType() != ElementalType.NONE))
|
if ((getAttributeExp() > 0) && (getElementalSpiritType() != ElementalType.NONE) && (player.getActiveElementalSpiritType() > 0))
|
||||||
{
|
{
|
||||||
final int attributeExp = (int) (((getAttributeExp() * damage) / totalDamage) * player.getElementalSpiritXpBonus());
|
|
||||||
final ElementalSpirit spirit = player.getElementalSpirit(getElementalSpiritType().getSuperior());
|
final ElementalSpirit spirit = player.getElementalSpirit(getElementalSpiritType().getSuperior());
|
||||||
if (spirit != null)
|
if (spirit != null)
|
||||||
{
|
{
|
||||||
spirit.addExperience(attributeExp);
|
spirit.addExperience((int) (((getAttributeExp() * damage) / totalDamage) * player.getElementalSpiritXpBonus()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -720,13 +720,12 @@ public class Attackable extends Npc
|
|||||||
|
|
||||||
private void rewardAttributeExp(Player player, long damage, long totalDamage)
|
private void rewardAttributeExp(Player player, long damage, long totalDamage)
|
||||||
{
|
{
|
||||||
if ((player.getActiveElementalSpiritType() > 0) && (getAttributeExp() > 0) && (getElementalSpiritType() != ElementalType.NONE))
|
if ((getAttributeExp() > 0) && (getElementalSpiritType() != ElementalType.NONE) && (player.getActiveElementalSpiritType() > 0))
|
||||||
{
|
{
|
||||||
final int attributeExp = (int) (((getAttributeExp() * damage) / totalDamage) * player.getElementalSpiritXpBonus());
|
|
||||||
final ElementalSpirit spirit = player.getElementalSpirit(getElementalSpiritType().getSuperior());
|
final ElementalSpirit spirit = player.getElementalSpirit(getElementalSpiritType().getSuperior());
|
||||||
if (spirit != null)
|
if (spirit != null)
|
||||||
{
|
{
|
||||||
spirit.addExperience(attributeExp);
|
spirit.addExperience((int) (((getAttributeExp() * damage) / totalDamage) * player.getElementalSpiritXpBonus()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -720,13 +720,12 @@ public class Attackable extends Npc
|
|||||||
|
|
||||||
private void rewardAttributeExp(Player player, long damage, long totalDamage)
|
private void rewardAttributeExp(Player player, long damage, long totalDamage)
|
||||||
{
|
{
|
||||||
if ((player.getActiveElementalSpiritType() > 0) && (getAttributeExp() > 0) && (getElementalSpiritType() != ElementalType.NONE))
|
if ((getAttributeExp() > 0) && (getElementalSpiritType() != ElementalType.NONE) && (player.getActiveElementalSpiritType() > 0))
|
||||||
{
|
{
|
||||||
final int attributeExp = (int) (((getAttributeExp() * damage) / totalDamage) * player.getElementalSpiritXpBonus());
|
|
||||||
final ElementalSpirit spirit = player.getElementalSpirit(getElementalSpiritType().getSuperior());
|
final ElementalSpirit spirit = player.getElementalSpirit(getElementalSpiritType().getSuperior());
|
||||||
if (spirit != null)
|
if (spirit != null)
|
||||||
{
|
{
|
||||||
spirit.addExperience(attributeExp);
|
spirit.addExperience((int) (((getAttributeExp() * damage) / totalDamage) * player.getElementalSpiritXpBonus()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -725,13 +725,12 @@ public class Attackable extends Npc
|
|||||||
|
|
||||||
private void rewardAttributeExp(Player player, long damage, long totalDamage)
|
private void rewardAttributeExp(Player player, long damage, long totalDamage)
|
||||||
{
|
{
|
||||||
if ((player.getActiveElementalSpiritType() > 0) && (getAttributeExp() > 0) && (getElementalSpiritType() != ElementalType.NONE))
|
if ((getAttributeExp() > 0) && (getElementalSpiritType() != ElementalType.NONE) && (player.getActiveElementalSpiritType() > 0))
|
||||||
{
|
{
|
||||||
final int attributeExp = (int) (((getAttributeExp() * damage) / totalDamage) * player.getElementalSpiritXpBonus());
|
|
||||||
final ElementalSpirit spirit = player.getElementalSpirit(getElementalSpiritType().getSuperior());
|
final ElementalSpirit spirit = player.getElementalSpirit(getElementalSpiritType().getSuperior());
|
||||||
if (spirit != null)
|
if (spirit != null)
|
||||||
{
|
{
|
||||||
spirit.addExperience(attributeExp);
|
spirit.addExperience((int) (((getAttributeExp() * damage) / totalDamage) * player.getElementalSpiritXpBonus()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -730,13 +730,12 @@ public class Attackable extends Npc
|
|||||||
|
|
||||||
private void rewardAttributeExp(Player player, long damage, long totalDamage)
|
private void rewardAttributeExp(Player player, long damage, long totalDamage)
|
||||||
{
|
{
|
||||||
if ((player.getActiveElementalSpiritType() > 0) && (getAttributeExp() > 0) && (getElementalSpiritType() != ElementalType.NONE))
|
if ((getAttributeExp() > 0) && (getElementalSpiritType() != ElementalType.NONE) && (player.getActiveElementalSpiritType() > 0))
|
||||||
{
|
{
|
||||||
final int attributeExp = (int) (((getAttributeExp() * damage) / totalDamage) * player.getElementalSpiritXpBonus());
|
|
||||||
final ElementalSpirit spirit = player.getElementalSpirit(getElementalSpiritType().getSuperior());
|
final ElementalSpirit spirit = player.getElementalSpirit(getElementalSpiritType().getSuperior());
|
||||||
if (spirit != null)
|
if (spirit != null)
|
||||||
{
|
{
|
||||||
spirit.addExperience(attributeExp);
|
spirit.addExperience((int) (((getAttributeExp() * damage) / totalDamage) * player.getElementalSpiritXpBonus()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -730,13 +730,12 @@ public class Attackable extends Npc
|
|||||||
|
|
||||||
private void rewardAttributeExp(Player player, long damage, long totalDamage)
|
private void rewardAttributeExp(Player player, long damage, long totalDamage)
|
||||||
{
|
{
|
||||||
if ((player.getActiveElementalSpiritType() > 0) && (getAttributeExp() > 0) && (getElementalSpiritType() != ElementalType.NONE))
|
if ((getAttributeExp() > 0) && (getElementalSpiritType() != ElementalType.NONE) && (player.getActiveElementalSpiritType() > 0))
|
||||||
{
|
{
|
||||||
final int attributeExp = (int) (((getAttributeExp() * damage) / totalDamage) * player.getElementalSpiritXpBonus());
|
|
||||||
final ElementalSpirit spirit = player.getElementalSpirit(getElementalSpiritType().getSuperior());
|
final ElementalSpirit spirit = player.getElementalSpirit(getElementalSpiritType().getSuperior());
|
||||||
if (spirit != null)
|
if (spirit != null)
|
||||||
{
|
{
|
||||||
spirit.addExperience(attributeExp);
|
spirit.addExperience((int) (((getAttributeExp() * damage) / totalDamage) * player.getElementalSpiritXpBonus()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -730,13 +730,12 @@ public class Attackable extends Npc
|
|||||||
|
|
||||||
private void rewardAttributeExp(Player player, long damage, long totalDamage)
|
private void rewardAttributeExp(Player player, long damage, long totalDamage)
|
||||||
{
|
{
|
||||||
if ((player.getActiveElementalSpiritType() > 0) && (getAttributeExp() > 0) && (getElementalSpiritType() != ElementalType.NONE))
|
if ((getAttributeExp() > 0) && (getElementalSpiritType() != ElementalType.NONE) && (player.getActiveElementalSpiritType() > 0))
|
||||||
{
|
{
|
||||||
final int attributeExp = (int) (((getAttributeExp() * damage) / totalDamage) * player.getElementalSpiritXpBonus());
|
|
||||||
final ElementalSpirit spirit = player.getElementalSpirit(getElementalSpiritType().getSuperior());
|
final ElementalSpirit spirit = player.getElementalSpirit(getElementalSpiritType().getSuperior());
|
||||||
if (spirit != null)
|
if (spirit != null)
|
||||||
{
|
{
|
||||||
spirit.addExperience(attributeExp);
|
spirit.addExperience((int) (((getAttributeExp() * damage) / totalDamage) * player.getElementalSpiritXpBonus()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user