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

Solo event status related additions.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-10-30 13:54:02 +00:00
parent 4df8d007bd
commit 593e36fc3a
118 changed files with 263 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/CorpseClan.java vendored
View File

@@ -87,7 +87,7 @@ public class CorpseClan implements ITargetTypeHandler
continue;
}
if (player.isOnEvent() && obj.isOnEvent() && (player.getTeam() != obj.getTeam()))
if (player.isOnEvent() && !player.isOnSoloEvent() && obj.isOnEvent() && (player.getTeam() != obj.getTeam()))
{
continue;
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/PartyClan.java vendored
View File

@@ -117,7 +117,7 @@ public class PartyClan implements ITargetTypeHandler
continue;
}
if (player.isOnEvent() && obj.isOnEvent() && (player.getTeam() != obj.getTeam()))
if (player.isOnEvent() && !player.isOnSoloEvent() && obj.isOnEvent() && (player.getTeam() != obj.getTeam()))
{
continue;
}

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java
View File

@@ -291,7 +291,7 @@ public class CubicInstance implements IIdentifiable
if (ownerTarget.getActingPlayer() != null)
{
final PlayerInstance target = ownerTarget.getActingPlayer();
if ((_owner.getTeam() != target.getTeam()) && !(target.isDead()))
if (((_owner.getTeam() != target.getTeam()) || _owner.isOnSoloEvent()) && !(target.isDead()))
{
_target = (Creature) ownerTarget;
}

13
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -736,6 +736,7 @@ public class PlayerInstance extends Playable
/** Event parameters */
private boolean _isRegisteredOnEvent = false;
private boolean _isOnSoloEvent = false;
private boolean _isOnEvent = false;
private byte _handysBlockCheckerEventArena = -1;
@@ -8306,7 +8307,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in an event
if (isOnEvent())
{
return getTeam() != attacker.getTeam();
return isOnSoloEvent() || (getTeam() != attacker.getTeam());
}
// Check if the attacker is a Playable
@@ -14102,6 +14103,16 @@ public class PlayerInstance extends Playable
_isOnEvent = value;
}
public boolean isOnSoloEvent()
{
return _isOnSoloEvent;
}
public void setOnSoloEvent(boolean value)
{
_isOnSoloEvent = value;
}
public void setBlockCheckerArena(byte arena)
{
_handysBlockCheckerEventArena = arena;

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1129,7 +1129,7 @@ public class Skill implements IIdentifiable
}
}
if (player.isOnEvent() && targetPlayer.isOnEvent() && (player.getTeam() == target.getTeam()))
if (player.isOnEvent() && !player.isOnSoloEvent() && targetPlayer.isOnEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}