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_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@@ -79,7 +79,7 @@ public class NotFriend implements IAffectObjectHandler
}
// Events.
if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}

2
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java vendored
View File

@@ -79,7 +79,7 @@ public class NotFriendPc implements IAffectObjectHandler
}
// Events.
if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}

2
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@@ -1023,7 +1023,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return;
}
// Events.
else if (getActingPlayer().isOnEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
else if (getActingPlayer().isOnEvent() && !getActingPlayer().isOnSoloEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
{
sendPacket(ActionFailed.STATIC_PACKET);
return;

13
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -738,6 +738,7 @@ public class PlayerInstance extends Playable
/** Event parameters */
private boolean _isRegisteredOnEvent = false;
private boolean _isOnSoloEvent = false;
private boolean _isOnEvent = false;
private byte _handysBlockCheckerEventArena = -1;
@@ -8067,7 +8068,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
@@ -13071,6 +13072,16 @@ public class PlayerInstance extends Playable
_isOnEvent = value;
}
public boolean isOnSoloEvent()
{
return _isOnSoloEvent;
}
public void setOnSoloEvent(boolean value)
{
_isOnSoloEvent = value;
}
public boolean isBlockedFromDeathPenalty()
{
return _isOnEvent || isAffected(EffectFlag.PROTECT_DEATH_PENALTY);

2
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java
View File

@@ -64,7 +64,7 @@ public class ConditionPlayerCanTransform extends Condition
player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
canTransform = false;
}
else if (player.isOnEvent())
else if (player.isRegisteredOnEvent())
{
player.sendMessage("You cannot transform while registered on an event.");
canTransform = false;

2
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@@ -1135,7 +1135,7 @@ public class SkillCaster implements Runnable
return false;
}
if (skill.isBad())
if (skill.isBad() && !player.isOnSoloEvent())
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))