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

Renamed onAdvEvent method to onEvent.

Browse Source
This commit is contained in:
MobiusDevelopment
2024-05-03 14:41:09 +03:00
parent b81a3e6b7e
commit f3646d13cd
13245 changed files with 16430 additions and 17329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java
View File

@ -246,7 +246,7 @@ public class Quest extends AbstractScript implements IIdentifiable
/**
* Add a timer to the quest (if it doesn't exist already) and start it.
* @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
* @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
* @param time time in ms for when to fire the timer
* @param npc the NPC associated with this timer (can be null)
* @param player the player associated with this timer (can be null)
@ -268,7 +268,7 @@ public class Quest extends AbstractScript implements IIdentifiable
/**
* Add a timer to the quest (if it doesn't exist already) and start it.
* @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
* @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
* @param time time in ms for when to fire the timer
* @param npc the NPC associated with this timer (can be null)
* @param player the player associated with this timer (can be null)
@ -559,7 +559,7 @@ public class Quest extends AbstractScript implements IIdentifiable
{
player.setSimulatedTalking(false);
}
res = onAdvEvent(event, npc, player);
res = onEvent(event, npc, player);
}
catch (Exception e)
{
@ -1037,12 +1037,11 @@ public class Quest extends AbstractScript implements IIdentifiable
*/
public String onDeath(Creature killer, Creature victim, QuestState qs)
{
return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
}
/**
* This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
* If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
* If the player has a quest state, use it as parameter in the next call, otherwise return null.
* @param event this parameter contains a string identifier for the event.<br>
* Generally, this string is passed directly via the link.<br>
@ -1061,35 +1060,7 @@ public class Quest extends AbstractScript implements IIdentifiable
* This parameter may be {@code null} in certain circumstances.
* @return the text returned by the event (may be {@code null}, a filename or just text)
*/
public String onAdvEvent(String event, Npc npc, Player player)
{
if (player != null)
{
final QuestState qs = player.getQuestState(getName());
if (qs != null)
{
return onEvent(event, qs);
}
}
return null;
}
/**
* This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
* If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
* @param event this parameter contains a string identifier for the event.<br>
* Generally, this string is passed directly via the link.<br>
* For example:<br>
* <code>
* &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
* </code><br>
* The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
* In the case of timers, this will be the name of the timer.<br>
* This parameter serves as a sort of identifier.
* @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
* @return the text returned by the event (may be {@code null}, a filename or just text)
*/
public String onEvent(String event, QuestState qs)
public String onEvent(String event, Npc npc, Player player)
{
return null;
}