Solo event status related additions.

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

View File

@@ -1022,7 +1022,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;

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;

View File

@@ -1130,7 +1130,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()))