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

Minor code organization related to PvP flag gain.

Browse Source
This commit is contained in:
MobiusDev
2019-01-25 03:45:32 +00:00
parent f27e223be9
commit e70aa2c56d
10 changed files with 100 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster); ((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
} }
} }
else if (((skill.getEffectPoint() > 0) && obj.isMonster()) // // Self casting should not increase PvP time.
else if (obj != player)
{
// Supporting monsters or players results in pvpflag.
if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) // || (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
|| (((L2Character) obj).getReputation() < 0) // || (((L2Character) obj).getReputation() < 0) //
))) )))
{ {
// Supporting players or monsters result in pvpflag. // Consider fake player PvP status.
if (!obj.isFakePlayer() // if (!obj.isFakePlayer() //
|| (obj.isFakePlayer() // || (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
&& (!((L2Npc) obj).isScriptValue(0) //
|| (((L2Npc) obj).getReputation() < 0))))
{
// Self casting should not increase PvP time.
if (obj != player)
{ {
player.updatePvPStatus(); player.updatePvPStatus();
} }

15
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster); ((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
} }
} }
else if (((skill.getEffectPoint() > 0) && obj.isMonster()) // // Self casting should not increase PvP time.
else if (obj != player)
{
// Supporting monsters or players results in pvpflag.
if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) // || (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
|| (((L2Character) obj).getReputation() < 0) // || (((L2Character) obj).getReputation() < 0) //
))) )))
{ {
// Supporting players or monsters result in pvpflag. // Consider fake player PvP status.
if (!obj.isFakePlayer() // if (!obj.isFakePlayer() //
|| (obj.isFakePlayer() // || (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
&& (!((L2Npc) obj).isScriptValue(0) //
|| (((L2Npc) obj).getReputation() < 0))))
{
// Self casting should not increase PvP time.
if (obj != player)
{ {
player.updatePvPStatus(); player.updatePvPStatus();
} }

15
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster); ((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
} }
} }
else if (((skill.getEffectPoint() > 0) && obj.isMonster()) // // Self casting should not increase PvP time.
else if (obj != player)
{
// Supporting monsters or players results in pvpflag.
if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) // || (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
|| (((L2Character) obj).getReputation() < 0) // || (((L2Character) obj).getReputation() < 0) //
))) )))
{ {
// Supporting players or monsters result in pvpflag. // Consider fake player PvP status.
if (!obj.isFakePlayer() // if (!obj.isFakePlayer() //
|| (obj.isFakePlayer() // || (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
&& (!((L2Npc) obj).isScriptValue(0) //
|| (((L2Npc) obj).getReputation() < 0))))
{
// Self casting should not increase PvP time.
if (obj != player)
{ {
player.updatePvPStatus(); player.updatePvPStatus();
} }

15
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster); ((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
} }
} }
else if (((skill.getEffectPoint() > 0) && obj.isMonster()) // // Self casting should not increase PvP time.
else if (obj != player)
{
// Supporting monsters or players results in pvpflag.
if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) // || (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
|| (((L2Character) obj).getReputation() < 0) // || (((L2Character) obj).getReputation() < 0) //
))) )))
{ {
// Supporting players or monsters result in pvpflag. // Consider fake player PvP status.
if (!obj.isFakePlayer() // if (!obj.isFakePlayer() //
|| (obj.isFakePlayer() // || (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
&& (!((L2Npc) obj).isScriptValue(0) //
|| (((L2Npc) obj).getReputation() < 0))))
{
// Self casting should not increase PvP time.
if (obj != player)
{ {
player.updatePvPStatus(); player.updatePvPStatus();
} }

15
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster); ((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
} }
} }
else if (((skill.getEffectPoint() > 0) && obj.isMonster()) // // Self casting should not increase PvP time.
else if (obj != player)
{
// Supporting monsters or players results in pvpflag.
if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) // || (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
|| (((L2Character) obj).getReputation() < 0) // || (((L2Character) obj).getReputation() < 0) //
))) )))
{ {
// Supporting players or monsters result in pvpflag. // Consider fake player PvP status.
if (!obj.isFakePlayer() // if (!obj.isFakePlayer() //
|| (obj.isFakePlayer() // || (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
&& (!((L2Npc) obj).isScriptValue(0) //
|| (((L2Npc) obj).getReputation() < 0))))
{
// Self casting should not increase PvP time.
if (obj != player)
{ {
player.updatePvPStatus(); player.updatePvPStatus();
} }

15
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster); ((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
} }
} }
else if (((skill.getEffectPoint() > 0) && obj.isMonster()) // // Self casting should not increase PvP time.
else if (obj != player)
{
// Supporting monsters or players results in pvpflag.
if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) // || (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
|| (((L2Character) obj).getReputation() < 0) // || (((L2Character) obj).getReputation() < 0) //
))) )))
{ {
// Supporting players or monsters result in pvpflag. // Consider fake player PvP status.
if (!obj.isFakePlayer() // if (!obj.isFakePlayer() //
|| (obj.isFakePlayer() // || (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
&& (!((L2Npc) obj).isScriptValue(0) //
|| (((L2Npc) obj).getReputation() < 0))))
{
// Self casting should not increase PvP time.
if (obj != player)
{ {
player.updatePvPStatus(); player.updatePvPStatus();
} }

15
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster); ((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
} }
} }
else if (((skill.getEffectPoint() > 0) && obj.isMonster()) // // Self casting should not increase PvP time.
else if (obj != player)
{
// Supporting monsters or players results in pvpflag.
if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) // || (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
|| (((L2Character) obj).getReputation() < 0) // || (((L2Character) obj).getReputation() < 0) //
))) )))
{ {
// Supporting players or monsters result in pvpflag. // Consider fake player PvP status.
if (!obj.isFakePlayer() // if (!obj.isFakePlayer() //
|| (obj.isFakePlayer() // || (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
&& (!((L2Npc) obj).isScriptValue(0) //
|| (((L2Npc) obj).getReputation() < 0))))
{
// Self casting should not increase PvP time.
if (obj != player)
{ {
player.updatePvPStatus(); player.updatePvPStatus();
} }

15
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster); ((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
} }
} }
else if (((skill.getEffectPoint() > 0) && obj.isMonster()) // // Self casting should not increase PvP time.
else if (obj != player)
{
// Supporting monsters or players results in pvpflag.
if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) // || (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
|| (((L2Character) obj).getReputation() < 0) // || (((L2Character) obj).getReputation() < 0) //
))) )))
{ {
// Supporting players or monsters result in pvpflag. // Consider fake player PvP status.
if (!obj.isFakePlayer() // if (!obj.isFakePlayer() //
|| (obj.isFakePlayer() // || (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
&& (!((L2Npc) obj).isScriptValue(0) //
|| (((L2Npc) obj).getReputation() < 0))))
{
// Self casting should not increase PvP time.
if (obj != player)
{ {
player.updatePvPStatus(); player.updatePvPStatus();
} }

15
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster); ((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
} }
} }
else if (((skill.getEffectPoint() > 0) && obj.isMonster()) // // Self casting should not increase PvP time.
else if (obj != player)
{
// Supporting monsters or players results in pvpflag.
if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) // || (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
|| (((L2Character) obj).getReputation() < 0) // || (((L2Character) obj).getReputation() < 0) //
))) )))
{ {
// Supporting players or monsters result in pvpflag. // Consider fake player PvP status.
if (!obj.isFakePlayer() // if (!obj.isFakePlayer() //
|| (obj.isFakePlayer() // || (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
&& (!((L2Npc) obj).isScriptValue(0) //
|| (((L2Npc) obj).getReputation() < 0))))
{
// Self casting should not increase PvP time.
if (obj != player)
{ {
player.updatePvPStatus(); player.updatePvPStatus();
} }

15
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@@ -642,19 +642,18 @@ public class SkillCaster implements Runnable
((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster); ((L2Character) obj).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, caster);
} }
} }
else if (((skill.getEffectPoint() > 0) && obj.isMonster()) // // Self casting should not increase PvP time.
else if (obj != player)
{
// Supporting monsters or players results in pvpflag.
if (((skill.getEffectPoint() > 0) && obj.isMonster()) //
|| (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) // || (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) //
|| (((L2Character) obj).getReputation() < 0) // || (((L2Character) obj).getReputation() < 0) //
))) )))
{ {
// Supporting players or monsters result in pvpflag. // Consider fake player PvP status.
if (!obj.isFakePlayer() // if (!obj.isFakePlayer() //
|| (obj.isFakePlayer() // || (obj.isFakePlayer() && (!((L2Npc) obj).isScriptValue(0) || (((L2Npc) obj).getReputation() < 0))))
&& (!((L2Npc) obj).isScriptValue(0) //
|| (((L2Npc) obj).getReputation() < 0))))
{
// Self casting should not increase PvP time.
if (obj != player)
{ {
player.updatePvPStatus(); player.updatePvPStatus();
} }