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

Removed the escapable parameter from movie enum.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDev 2018-06-06 10:20:55 +00:00
parent 9a6b9ee99e
commit af0ec1c5ae
2 changed files with 37 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/enums/Movie.java
View File

@ -22,49 +22,47 @@ package com.l2jmobius.gameserver.enums;
*/
public enum Movie
{
SC_LINDVIOR(1, true),
SC_ECHMUS_OPENING(2, true),
SC_ECHMUS_SUCCESS(3, true),
SC_ECHMUS_FAIL(4, true),
SC_BOSS_TIAT_OPENING(5, true),
SC_BOSS_TIAT_ENDING_SUCCES(6, true),
SC_BOSS_TIAT_ENDING_FAIL(7, true),
SSQ_SUSPICIOUS_DEATHS(8, true),
SSQ_DYING_MASSAGE(9, true),
SSQ_CONTRACT_OF_MAMMON(10, true),
SSQ_RITUAL_OF_PRIEST(11, true),
SSQ_SEALING_EMPEROR_1ST(12, true),
SSQ_SEALING_EMPEROR_2ND(13, true),
SSQ_EMBRYO(14, true),
SC_BOSS_FREYA_OPENING(15, false),
SC_BOSS_FREYA_PHASECH_A(16, true),
SC_BOSS_FREYA_PHASECH_B(17, true),
SC_BOSS_KEGOR_INTRUSION(18, false),
SC_BOSS_FREYA_ENDING_A(19, false),
SC_BOSS_FREYA_ENDING_B(20, false),
SC_BOSS_FREYA_FORCED_DEFEAT(21, true),
SC_BOSS_FREYA_DEFEAT(22, true),
SC_ICE_HEAVYKNIGHT_SPAWN(23, false),
SSQ2_HOLY_BURIAL_GROUND_OPENING(24, true),
SSQ2_HOLY_BURIAL_GROUND_CLOSING(25, true),
SSQ2_SOLINA_TOMB_OPENING(26, false),
SSQ2_SOLINA_TOMB_CLOSING(27, true),
SSQ2_ELYSS_NARRATION(28, false),
SSQ2_BOSS_OPENING(29, false),
SSQ2_BOSS_CLOSING(30, false),
LAND_KSERTH_A(1000, true),
LAND_KSERTH_B(1001, true),
LAND_UNDEAD_A(1002, true),
LAND_DISTRUCTION_A(1003, true),
LAND_ANNIHILATION_A(1004, true);
SC_LINDVIOR(1),
SC_ECHMUS_OPENING(2),
SC_ECHMUS_SUCCESS(3),
SC_ECHMUS_FAIL(4),
SC_BOSS_TIAT_OPENING(5),
SC_BOSS_TIAT_ENDING_SUCCES(6),
SC_BOSS_TIAT_ENDING_FAIL(7),
SSQ_SUSPICIOUS_DEATHS(8),
SSQ_DYING_MASSAGE(9),
SSQ_CONTRACT_OF_MAMMON(10),
SSQ_RITUAL_OF_PRIEST(11),
SSQ_SEALING_EMPEROR_1ST(12),
SSQ_SEALING_EMPEROR_2ND(13),
SSQ_EMBRYO(14),
SC_BOSS_FREYA_OPENING(15),
SC_BOSS_FREYA_PHASECH_A(16),
SC_BOSS_FREYA_PHASECH_B(17),
SC_BOSS_KEGOR_INTRUSION(18),
SC_BOSS_FREYA_ENDING_A(19),
SC_BOSS_FREYA_ENDING_B(20),
SC_BOSS_FREYA_FORCED_DEFEAT(21),
SC_BOSS_FREYA_DEFEAT(22),
SC_ICE_HEAVYKNIGHT_SPAWN(23),
SSQ2_HOLY_BURIAL_GROUND_OPENING(24),
SSQ2_HOLY_BURIAL_GROUND_CLOSING(25),
SSQ2_SOLINA_TOMB_OPENING(26),
SSQ2_SOLINA_TOMB_CLOSING(27),
SSQ2_ELYSS_NARRATION(28),
SSQ2_BOSS_OPENING(29),
SSQ2_BOSS_CLOSING(30),
LAND_KSERTH_A(1000),
LAND_KSERTH_B(1001),
LAND_UNDEAD_A(1002),
LAND_DISTRUCTION_A(1003),
LAND_ANNIHILATION_A(1004);
private final int _clientId;
private final boolean _isEscapable;
private Movie(int clientId, boolean isEscapable)
private Movie(int clientId)
{
_clientId = clientId;
_isEscapable = isEscapable;
}
/**
@ -74,12 +72,4 @@ public enum Movie
{
return _clientId;
}
/**
* @return {@code true} if movie can be escaped (skipped), {@code false} otherwise.
*/
public boolean isEscapable()
{
return _isEscapable;
}
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java
View File

@ -50,7 +50,7 @@ public final class EndScenePlayer implements IClientIncomingPacket
return;
}
final Movie movie = movieHolder.getMovie();
if ((movie.getClientId() != _movieId) || !movie.isEscapable())
if (movie.getClientId() != _movieId)
{
return;
}