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

Removal of cron4j and event abstractions.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-10-29 21:34:58 +00:00
parent 16bf5cc59f
commit 66d22336c3
2573 changed files with 17593 additions and 111410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java
View File

@@ -97,7 +97,7 @@ public class ScrollOfEscape implements IItemHandler
return;
}
if (player.isOnCustomEvent())
if (player.isOnEvent())
{
player.sendMessage("You can't use Scroll of Escape in an event.");
return;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java
View File

@@ -57,7 +57,7 @@ public class SummonItems implements IItemHandler
return;
}
if (player.isOnCustomEvent())
if (player.isOnEvent())
{
playable.sendPacket(ActionFailed.STATIC_PACKET);
return;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java
View File

@@ -53,7 +53,7 @@ public class ClanGate implements ISkillHandler
return;
}
if (player.isOnCustomEvent() || player.isInsideZone(ZoneId.NO_LANDING) || player.isInOlympiadMode() || player.isInsideZone(ZoneId.PVP) || (GrandBossManager.getInstance().getZone(player) != null))
if (player.isOnEvent() || player.isInsideZone(ZoneId.NO_LANDING) || player.isInOlympiadMode() || player.isInsideZone(ZoneId.PVP) || (GrandBossManager.getInstance().getZone(player) != null))
{
player.sendMessage("Cannot open the portal here.");
return;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java
View File

@@ -88,7 +88,7 @@ public class Recall implements ISkillHandler
continue;
}
if (targetChar.isOnCustomEvent())
if (targetChar.isOnEvent())
{
targetChar.sendMessage("You can't use escape skill in an event.");
continue;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java
View File

@@ -58,7 +58,7 @@ public class SummonFriend implements ISkillHandler
return;
}
if (activePlayer.isOnCustomEvent())
if (activePlayer.isOnEvent())
{
activePlayer.sendMessage("You cannot use this skill in an Event.");
return;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Escape.java
View File

@@ -48,7 +48,7 @@ public class Escape implements IUserCommandHandler
}
// Check to see if the current player is in an event.
if (player.isOnCustomEvent())
if (player.isOnEvent())
{
player.sendMessage("You may not use an escape skill in an event.");
return false;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java
View File

@@ -57,7 +57,7 @@ public class OfflineShop implements IUserCommandHandler
return false;
}
if (player.isOnCustomEvent())
if (player.isRegisteredOnEvent())
{
player.sendMessage("You cannot logout while registered in an event.");
player.sendPacket(ActionFailed.STATIC_PACKET);

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java
View File

@@ -58,7 +58,7 @@ public class OfflineShop implements IVoicedCommandHandler
return false;
}
if (player.isOnCustomEvent())
if (player.isRegisteredOnEvent())
{
player.sendMessage("You cannot Logout while registered in an event.");
player.sendPacket(ActionFailed.STATIC_PACKET);

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java
View File

@@ -52,7 +52,7 @@ public class Wedding implements IVoicedCommandHandler
@Override
public boolean useVoicedCommand(String command, PlayerInstance activeChar, String target)
{
if (activeChar.isRegisteredOnCustomEvent() || activeChar.isInOlympiadMode())
if (activeChar.isRegisteredOnEvent() || activeChar.isInOlympiadMode())
{
activeChar.sendMessage("Sorry, you have registered in an event.");
return false;
@@ -227,7 +227,7 @@ public class Wedding implements IVoicedCommandHandler
}
// Check to see if the current player is in an event.
if (activeChar.isOnCustomEvent())
if (activeChar.isOnEvent())
{
activeChar.sendMessage("You are in an event.");
return false;
@@ -263,7 +263,7 @@ public class Wedding implements IVoicedCommandHandler
activeChar.sendMessage("Your partner is in the Olympiad now.");
return false;
}
else if (partner.isOnCustomEvent())
else if (partner.isOnEvent())
{
activeChar.sendMessage("Your partner is in an event.");
return false;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/PrecautionaryRestartManager.java
View File

@@ -156,7 +156,7 @@ public class PrecautionaryRestartManager
return true;
}
if (player.isOnCustomEvent())
if (player.isOnEvent())
{
return true;
}

18
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java
View File

@@ -1765,7 +1765,7 @@ public abstract class Skill
continue;
}
// if src is in event and trg not or viceversa
if ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent()))
if ((src.isOnEvent() && !trg.isOnEvent()) || (trg.isOnEvent() && !src.isOnEvent()))
{
continue;
}
@@ -1778,7 +1778,7 @@ public abstract class Skill
continue;
}
// if src is in event and trg not or viceversa
if ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent()))
if ((src.isOnEvent() && !trg.isOnEvent()) || (trg.isOnEvent() && !src.isOnEvent()))
{
continue;
}
@@ -1908,7 +1908,7 @@ public abstract class Skill
continue;
}
// if src is in event and trg not or viceversa
if ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent()))
if ((src.isOnEvent() && !trg.isOnEvent()) || (trg.isOnEvent() && !src.isOnEvent()))
{
continue;
}
@@ -1921,7 +1921,7 @@ public abstract class Skill
continue;
}
// if src is in event and trg not or viceversa
if ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent()))
if ((src.isOnEvent() && !trg.isOnEvent()) || (trg.isOnEvent() && !src.isOnEvent()))
{
continue;
}
@@ -1990,7 +1990,7 @@ public abstract class Skill
}
final PlayerInstance trg = partyMember;
// if src is in event and trg not or viceversa
if ((src != null) && ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent())))
if ((src != null) && ((src.isOnEvent() && !trg.isOnEvent()) || (trg.isOnEvent() && !src.isOnEvent())))
{
continue;
}
@@ -2123,7 +2123,7 @@ public abstract class Skill
final PlayerInstance trg = newTarget;
final PlayerInstance src = player;
// if src is in event and trg not or viceversa
if ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent()))
if ((src.isOnEvent() && !trg.isOnEvent()) || (trg.isOnEvent() && !src.isOnEvent()))
{
continue;
}
@@ -2373,7 +2373,7 @@ public abstract class Skill
}
// if src is in event and trg not or viceversa
if ((src != null) && (trg != null) && ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent())))
if ((src != null) && (trg != null) && ((src.isOnEvent() && !trg.isOnEvent()) || (trg.isOnEvent() && !src.isOnEvent())))
{
continue;
}
@@ -2851,12 +2851,12 @@ public abstract class Skill
}
// if src is in event and trg not OR viceversa, the target must be not attackable
if ((activeCh.isOnCustomEvent() && !targetChar.isOnCustomEvent()) || (targetChar.isOnCustomEvent() && !activeCh.isOnCustomEvent()))
if ((activeCh.isOnEvent() && !targetChar.isOnEvent()) || (targetChar.isOnEvent() && !activeCh.isOnEvent()))
{
return true;
}
if (activeCh.isOnCustomEvent() && targetChar.isOnCustomEvent())
if (activeCh.isOnEvent() && targetChar.isOnEvent())
{
return false;
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@@ -6340,7 +6340,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
return false;
}
if (dst.isOnCustomEvent() && src.isOnCustomEvent())
if (dst.isOnEvent() && src.isOnEvent())
{
return false;
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Playable.java
View File

@@ -445,7 +445,7 @@ public abstract class Playable extends Creature
_lastCharmOfLuckEffect = null;
}
public boolean isOnCustomEvent()
public boolean isOnEvent()
{
return false;
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java
View File

@@ -819,9 +819,9 @@ public abstract class Summon extends Playable
}
@Override
public boolean isOnCustomEvent()
public boolean isOnEvent()
{
return (_owner != null) && _owner.isOnCustomEvent();
return (_owner != null) && _owner.isOnEvent();
}
@Override

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ObservationInstance.java
View File

@@ -52,7 +52,7 @@ public class ObservationInstance extends FolkInstance
return;
}
if (player.isRegisteredOnCustomEvent())
if (player.isRegisteredOnEvent())
{
player.sendMessage("You already participate in an event!");
player.sendPacket(ActionFailed.STATIC_PACKET);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManagerInstance.java
View File

@@ -107,7 +107,7 @@ public class OlympiadManagerInstance extends FolkInstance
}
case 4:
{
if (player.isRegisteredOnCustomEvent())
if (player.isRegisteredOnEvent())
{
player.sendMessage("You are already registered in an event.");
return;
@@ -117,7 +117,7 @@ public class OlympiadManagerInstance extends FolkInstance
}
case 5:
{
if (player.isRegisteredOnCustomEvent())
if (player.isRegisteredOnEvent())
{
player.sendMessage("You are already registered in an event.");
return;

67
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -411,8 +411,8 @@ public class PlayerInstance extends Playable
private final int[] _loto = new int[5];
private final int[] _race = new int[2];
private final BlockList _blockList = new BlockList(this);
private boolean _isRegisteredOnCustomEvent = false;
private boolean _isOnCustomEvent = false;
private boolean _isRegisteredOnEvent = false;
private boolean _isOnEvent = false;
private int _team = 0;
private int _alliedVarkaKetra = 0;
private int _hasCoupon = 0;
@@ -5714,7 +5714,7 @@ public class PlayerInstance extends Playable
*/
private void onDieDropItem(Creature killer)
{
if (isOnCustomEvent())
if (isOnEvent())
{
return;
}
@@ -5836,7 +5836,7 @@ public class PlayerInstance extends Playable
return;
}
if (isOnCustomEvent())
if (isOnEvent())
{
return;
}
@@ -5928,7 +5928,7 @@ public class PlayerInstance extends Playable
}
// 'No war' or 'One way war' -> 'Normal PK'
if (!isOnCustomEvent())
if (!isOnEvent())
{
if (targetPlayer.getKarma() > 0) // Target player has karma
{
@@ -5957,7 +5957,7 @@ public class PlayerInstance extends Playable
AnnouncementsTable.getInstance().announceToAll("Player " + getName() + " killed Player " + target.getName());
}
if (isOnCustomEvent())
if (isOnEvent())
{
return;
}
@@ -6105,7 +6105,7 @@ public class PlayerInstance extends Playable
*/
public void increasePvpKills()
{
if (isOnCustomEvent())
if (isOnEvent())
{
return;
}
@@ -6150,7 +6150,7 @@ public class PlayerInstance extends Playable
*/
public void increasePkKillsAndKarma(int targLVL)
{
if (isOnCustomEvent())
if (isOnEvent())
{
return;
}
@@ -6271,7 +6271,7 @@ public class PlayerInstance extends Playable
*/
public void updatePvPStatus()
{
if (isOnCustomEvent())
if (isOnEvent())
{
return;
}
@@ -6309,7 +6309,7 @@ public class PlayerInstance extends Playable
return;
}
if (isOnCustomEvent())
if (isOnEvent())
{
return;
}
@@ -6391,7 +6391,7 @@ public class PlayerInstance extends Playable
// Calculate the Experience loss
long lostExp = 0;
if (!isOnCustomEvent())
if (!isOnEvent())
{
final byte maxLevel = ExperienceData.getInstance().getMaxLevel();
if (lvl < maxLevel)
@@ -9089,26 +9089,13 @@ public class PlayerInstance extends Playable
}
}
if ((attacker instanceof Playable) && isOnCustomEvent())
// Check if the attacker is in an event
if (isOnEvent() && (attacker instanceof Playable))
{
PlayerInstance player = null;
if (attacker instanceof PlayerInstance)
final PlayerInstance player = attacker.getActingPlayer();
if ((player != null) && player.isOnEvent())
{
player = (PlayerInstance) attacker;
}
else if (attacker instanceof Summon)
{
player = ((Summon) attacker).getOwner();
}
if (player != null)
{
// checks for events
if (player.isOnCustomEvent())
{
return (isOnCustomEvent() && player.isOnCustomEvent() && (getTeam() != player.getTeam()));
}
return false;
return getTeam() != player.getTeam();
}
}
@@ -9873,9 +9860,9 @@ public class PlayerInstance extends Playable
WorldObject target = worldObject;
// Check if player and target are in events and on the same team.
if ((target instanceof PlayerInstance) && isOnCustomEvent() && skill.isOffensive())
if ((target instanceof PlayerInstance) && isOnEvent() && skill.isOffensive())
{
return target.getActingPlayer().isOnCustomEvent() && (getTeam() != target.getActingPlayer().getTeam());
return target.getActingPlayer().isOnEvent() && (getTeam() != target.getActingPlayer().getTeam());
}
// check for PC->PC Pvp status
@@ -11289,25 +11276,25 @@ public class PlayerInstance extends Playable
return _lvlJoinedAcademy > 0;
}
public boolean isRegisteredOnCustomEvent()
public boolean isRegisteredOnEvent()
{
return _isRegisteredOnCustomEvent || _isOnCustomEvent;
return _isRegisteredOnEvent || _isOnEvent;
}
public void setRegisteredOnCustomEvent(boolean value)
public void setRegisteredOnEvent(boolean value)
{
_isRegisteredOnCustomEvent = value;
_isRegisteredOnEvent = value;
}
@Override
public boolean isOnCustomEvent()
public boolean isOnEvent()
{
return _isOnCustomEvent;
return _isOnEvent;
}
public void setOnCustomEvent(boolean value)
public void setOnEvent(boolean value)
{
_isOnCustomEvent = value;
_isOnEvent = value;
}
/**
@@ -12217,7 +12204,7 @@ public class PlayerInstance extends Playable
getParty().getDimensionalRift().memberRessurected(this);
}
if (isOnCustomEvent())
if (isOnEvent())
{
getStatus().setCurrentHp(getMaxHp());
getStatus().setCurrentMp(getMaxMp());

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@@ -341,7 +341,7 @@ public class VillageMasterInstance extends FolkInstance
}
// You can't add subclass when you are registered in an event.
if (player.isRegisteredOnCustomEvent())
if (player.isRegisteredOnEvent())
{
player.sendMessage("You can't add a subclass while in an event.");
player.setLocked(false);
@@ -442,7 +442,7 @@ public class VillageMasterInstance extends FolkInstance
}
// You can't change subclass when you are registered in an event.
if (player.isRegisteredOnCustomEvent())
if (player.isRegisteredOnEvent())
{
player.sendMessage("You can't change subclass while in an event.");
player.setLocked(false);
@@ -503,7 +503,7 @@ public class VillageMasterInstance extends FolkInstance
}
// You can't delete subclass when you are registered in an event.
if (player.isRegisteredOnCustomEvent())
if (player.isRegisteredOnEvent())
{
player.sendMessage("You can't delete a subclass while in an event.");
player.setLocked(false);

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java
View File

@@ -1042,7 +1042,7 @@ public class Olympiad
return;
}
if (spectator.isRegisteredOnCustomEvent())
if (spectator.isRegisteredOnEvent())
{
spectator.sendMessage("You are already registered in an event.");
return;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java
View File

@@ -98,7 +98,7 @@ public class AttackRequest implements IClientIncomingPacket
}
// No attacks to same team in event
if (player.isOnCustomEvent())
if (player.isOnEvent())
{
if (target instanceof PlayerInstance)
{

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java
View File

@@ -50,7 +50,7 @@ public class Logout implements IClientIncomingPacket
return;
}
if (player.isRegisteredOnCustomEvent())
if (player.isRegisteredOnEvent())
{
player.sendMessage("You cannot logout while registered in an event.");
player.sendPacket(ActionFailed.STATIC_PACKET);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
View File

@@ -185,7 +185,7 @@ public class RequestActionUse implements IClientIncomingPacket
return;
}
if ((target instanceof PlayerInstance) && !player.getAccessLevel().allowPeaceAttack() && Creature.isInsidePeaceZone(pet, target) && (!player.isOnCustomEvent() || !((PlayerInstance) target).isOnCustomEvent()))
if ((target instanceof PlayerInstance) && !player.getAccessLevel().allowPeaceAttack() && Creature.isInsidePeaceZone(pet, target) && (!player.isOnEvent() || !((PlayerInstance) target).isOnEvent()))
{
player.sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_THIS_TARGET_IN_A_PEACEFUL_ZONE);
return;
@@ -277,7 +277,7 @@ public class RequestActionUse implements IClientIncomingPacket
// A strider cannot be ridden while in battle
player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE));
}
else if (player.isOnCustomEvent())
else if (player.isOnEvent())
{
// A strider cannot be ridden while in event
player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE));

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
View File

@@ -118,7 +118,7 @@ public class RequestRestart implements IClientIncomingPacket
}
// Check if player is in an event.
if (player.isRegisteredOnCustomEvent())
if (player.isRegisteredOnEvent())
{
player.sendMessage("You can't restart while registered in an event.");
player.sendPacket(RestartResponse.valueOf(false));

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
View File

@@ -74,7 +74,7 @@ public class RequestRestartPoint implements IClientIncomingPacket
}
// Custom event resurrection management.
if (player.isOnCustomEvent())
if (player.isOnEvent())
{
// This is an example, replace EventScriptName with proper event script name.
final Quest eventScript = QuestManager.getInstance().getQuest("EventScriptName");
@@ -111,7 +111,7 @@ public class RequestRestartPoint implements IClientIncomingPacket
@Override
public void run()
{
if (_player.isOnCustomEvent())
if (_player.isOnEvent())
{
_player.sendMessage("You cannot do that while participating in an event!");
return;