Removal of cron4j and event abstractions.
This commit is contained in:
@@ -95,7 +95,7 @@ public class Warpgate extends AbstractNpcAI
|
||||
if (creature.isPlayer())
|
||||
{
|
||||
final PlayerInstance player = creature.getActingPlayer();
|
||||
if (!canEnter(player) && !player.canOverrideCond(PlayerCondOverride.ZONE_CONDITIONS) && !player.isOnCustomEvent())
|
||||
if (!canEnter(player) && !player.canOverrideCond(PlayerCondOverride.ZONE_CONDITIONS) && !player.isOnEvent())
|
||||
{
|
||||
startQuestTimer("TELEPORT", 1000, null, player);
|
||||
}
|
||||
|
@@ -100,7 +100,7 @@ public class Observation implements IBypassHandler
|
||||
player.sendPacket(SystemMessageId.YOU_MAY_NOT_OBSERVE_A_SIEGE_WITH_A_PET_OR_SERVITOR_SUMMONED);
|
||||
return false;
|
||||
}
|
||||
if (player.isRegisteredOnCustomEvent())
|
||||
if (player.isRegisteredOnEvent())
|
||||
{
|
||||
player.sendMessage("Cannot use while registered on an event");
|
||||
return false;
|
||||
|
@@ -81,7 +81,7 @@ public class OlympiadObservation implements IBypassHandler
|
||||
return false;
|
||||
}
|
||||
|
||||
if (player.isRegisteredOnCustomEvent())
|
||||
if (player.isRegisteredOnEvent())
|
||||
{
|
||||
player.sendMessage("You can not observe games while registered on an event.");
|
||||
return false;
|
||||
|
@@ -89,7 +89,7 @@ public class HomeBoard implements IParseBoardHandler
|
||||
break;
|
||||
}
|
||||
}
|
||||
return commandCheck && (player.isCastingNow() || player.isCastingSimultaneouslyNow() || player.isInCombat() || player.isInDuel() || player.isInOlympiadMode() || player.isInsideZone(ZoneId.SIEGE) || player.isInsideZone(ZoneId.PVP) || (player.getPvpFlag() > 0) || player.isAlikeDead() || player.isOnCustomEvent());
|
||||
return commandCheck && (player.isCastingNow() || player.isCastingSimultaneouslyNow() || player.isInCombat() || player.isInDuel() || player.isInOlympiadMode() || player.isInsideZone(ZoneId.SIEGE) || player.isInsideZone(ZoneId.PVP) || (player.getPvpFlag() > 0) || player.isAlikeDead() || player.isOnEvent());
|
||||
};
|
||||
|
||||
private static final Predicate<PlayerInstance> KARMA_CHECK = player -> Config.COMMUNITYBOARD_KARMA_DISABLED && (player.getKarma() > 0);
|
||||
|
@@ -139,7 +139,7 @@ public class CallPc extends AbstractEffect
|
||||
return false;
|
||||
}
|
||||
|
||||
if (target.isFestivalParticipant() || target.isFlyingMounted() || target.isCombatFlagEquipped() || !target.isOnCustomEvent())
|
||||
if (target.isFestivalParticipant() || target.isFlyingMounted() || target.isCombatFlagEquipped() || !target.isOnEvent())
|
||||
{
|
||||
activeChar.sendPacket(SystemMessageId.YOUR_TARGET_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING);
|
||||
return false;
|
||||
|
@@ -40,7 +40,7 @@ public class ItemSkillsTemplate implements IItemHandler
|
||||
return false;
|
||||
}
|
||||
|
||||
if (playable.isOnCustomEvent())
|
||||
if (playable.isOnEvent())
|
||||
{
|
||||
playable.sendPacket(ActionFailed.STATIC_PACKET);
|
||||
return false;
|
||||
|
@@ -38,7 +38,7 @@ public class SummonItems extends ItemSkillsTemplate
|
||||
return false;
|
||||
}
|
||||
|
||||
if (playable.isOnCustomEvent())
|
||||
if (playable.isOnEvent())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
@@ -100,7 +100,7 @@ public class Clan implements ITargetTypeHandler
|
||||
continue;
|
||||
}
|
||||
|
||||
if (player.isOnCustomEvent() && obj.isOnCustomEvent() && (player.getTeam() != obj.getTeam()))
|
||||
if (player.isOnEvent() && obj.isOnEvent() && (player.getTeam() != obj.getTeam()))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
@@ -87,7 +87,7 @@ public class CorpseClan implements ITargetTypeHandler
|
||||
continue;
|
||||
}
|
||||
|
||||
if (player.isOnCustomEvent() && obj.isOnCustomEvent() && (player.getTeam() != obj.getTeam()))
|
||||
if (player.isOnEvent() && obj.isOnEvent() && (player.getTeam() != obj.getTeam()))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
@@ -117,7 +117,7 @@ public class PartyClan implements ITargetTypeHandler
|
||||
continue;
|
||||
}
|
||||
|
||||
if (player.isOnCustomEvent() && obj.isOnCustomEvent() && (player.getTeam() != obj.getTeam()))
|
||||
if (player.isOnEvent() && obj.isOnEvent() && (player.getTeam() != obj.getTeam()))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
@@ -44,7 +44,7 @@ public class Unstuck implements IUserCommandHandler
|
||||
@Override
|
||||
public boolean useUserCommand(int id, PlayerInstance player)
|
||||
{
|
||||
if (player.isRegisteredOnCustomEvent())
|
||||
if (player.isRegisteredOnEvent())
|
||||
{
|
||||
player.sendPacket(ActionFailed.STATIC_PACKET);
|
||||
return false;
|
||||
|
@@ -289,7 +289,7 @@ public class Wedding implements IVoicedCommandHandler
|
||||
return false;
|
||||
}
|
||||
|
||||
if (activeChar.isRegisteredOnCustomEvent())
|
||||
if (activeChar.isRegisteredOnEvent())
|
||||
{
|
||||
activeChar.sendMessage("You are registered in an event.");
|
||||
return false;
|
||||
@@ -368,7 +368,7 @@ public class Wedding implements IVoicedCommandHandler
|
||||
return false;
|
||||
}
|
||||
|
||||
if (partner.isRegisteredOnCustomEvent())
|
||||
if (partner.isRegisteredOnEvent())
|
||||
{
|
||||
activeChar.sendMessage("Your partner is registered in an event.");
|
||||
return false;
|
||||
|
Reference in New Issue
Block a user