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

Fixed probable Provisional Halls NPE.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-10-06 13:15:37 +00:00
parent 902093bd0c
commit cf76253496
14 changed files with 210 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java vendored
View File

@ -81,11 +81,6 @@ public class ProvisionalHalls extends AbstractNpcAI
@Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
if ((npc.getId() != KERRY) && (npc.getId() != MAID))
{
return null;
}
String htmltext = null;
if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
{
@ -93,6 +88,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("buy"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
synchronized (LOCK)
{
final Calendar calendar = Calendar.getInstance();
@ -147,6 +147,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("enter"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
final int playerClanId = player.getClanId();
for (Entry<Integer, Location> hall : CLAN_HALLS.entrySet())
{
@ -161,6 +166,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("leave"))
{
if ((npc == null) || (npc.getId() != MAID))
{
return null;
}
final String[] location = player.getVariables().getString(HALL_RETURN_VAR, "-112574,256057,-1449,-1").split(",");
player.teleToLocation(Integer.parseInt(location[0]), Integer.parseInt(location[1]), Integer.parseInt(location[2]), Integer.parseInt(location[3]));
}

20
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java vendored
View File

@ -81,11 +81,6 @@ public class ProvisionalHalls extends AbstractNpcAI
@Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
if ((npc.getId() != KERRY) && (npc.getId() != MAID))
{
return null;
}
String htmltext = null;
if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
{
@ -93,6 +88,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("buy"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
synchronized (LOCK)
{
final Calendar calendar = Calendar.getInstance();
@ -147,6 +147,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("enter"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
final int playerClanId = player.getClanId();
for (Entry<Integer, Location> hall : CLAN_HALLS.entrySet())
{
@ -161,6 +166,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("leave"))
{
if ((npc == null) || (npc.getId() != MAID))
{
return null;
}
final String[] location = player.getVariables().getString(HALL_RETURN_VAR, "-112574,256057,-1449,-1").split(",");
player.teleToLocation(Integer.parseInt(location[0]), Integer.parseInt(location[1]), Integer.parseInt(location[2]), Integer.parseInt(location[3]));
}

20
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java vendored
View File

@ -81,11 +81,6 @@ public class ProvisionalHalls extends AbstractNpcAI
@Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
if ((npc.getId() != KERRY) && (npc.getId() != MAID))
{
return null;
}
String htmltext = null;
if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
{
@ -93,6 +88,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("buy"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
synchronized (LOCK)
{
final Calendar calendar = Calendar.getInstance();
@ -147,6 +147,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("enter"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
final int playerClanId = player.getClanId();
for (Entry<Integer, Location> hall : CLAN_HALLS.entrySet())
{
@ -161,6 +166,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("leave"))
{
if ((npc == null) || (npc.getId() != MAID))
{
return null;
}
final String[] location = player.getVariables().getString(HALL_RETURN_VAR, "-112574,256057,-1449,-1").split(",");
player.teleToLocation(Integer.parseInt(location[0]), Integer.parseInt(location[1]), Integer.parseInt(location[2]), Integer.parseInt(location[3]));
}

20
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java vendored
View File

@ -81,11 +81,6 @@ public class ProvisionalHalls extends AbstractNpcAI
@Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
if ((npc.getId() != KERRY) && (npc.getId() != MAID))
{
return null;
}
String htmltext = null;
if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
{
@ -93,6 +88,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("buy"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
synchronized (LOCK)
{
final Calendar calendar = Calendar.getInstance();
@ -147,6 +147,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("enter"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
final int playerClanId = player.getClanId();
for (Entry<Integer, Location> hall : CLAN_HALLS.entrySet())
{
@ -161,6 +166,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("leave"))
{
if ((npc == null) || (npc.getId() != MAID))
{
return null;
}
final String[] location = player.getVariables().getString(HALL_RETURN_VAR, "-112574,256057,-1449,-1").split(",");
player.teleToLocation(Integer.parseInt(location[0]), Integer.parseInt(location[1]), Integer.parseInt(location[2]), Integer.parseInt(location[3]));
}

20
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java vendored
View File

@ -81,11 +81,6 @@ public class ProvisionalHalls extends AbstractNpcAI
@Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
if ((npc.getId() != KERRY) && (npc.getId() != MAID))
{
return null;
}
String htmltext = null;
if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
{
@ -93,6 +88,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("buy"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
synchronized (LOCK)
{
final Calendar calendar = Calendar.getInstance();
@ -147,6 +147,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("enter"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
final int playerClanId = player.getClanId();
for (Entry<Integer, Location> hall : CLAN_HALLS.entrySet())
{
@ -161,6 +166,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("leave"))
{
if ((npc == null) || (npc.getId() != MAID))
{
return null;
}
final String[] location = player.getVariables().getString(HALL_RETURN_VAR, "-112574,256057,-1449,-1").split(",");
player.teleToLocation(Integer.parseInt(location[0]), Integer.parseInt(location[1]), Integer.parseInt(location[2]), Integer.parseInt(location[3]));
}

20
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java vendored
View File

@ -81,11 +81,6 @@ public class ProvisionalHalls extends AbstractNpcAI
@Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
if ((npc.getId() != KERRY) && (npc.getId() != MAID))
{
return null;
}
String htmltext = null;
if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
{
@ -93,6 +88,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("buy"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
synchronized (LOCK)
{
final Calendar calendar = Calendar.getInstance();
@ -147,6 +147,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("enter"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
final int playerClanId = player.getClanId();
for (Entry<Integer, Location> hall : CLAN_HALLS.entrySet())
{
@ -161,6 +166,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("leave"))
{
if ((npc == null) || (npc.getId() != MAID))
{
return null;
}
final String[] location = player.getVariables().getString(HALL_RETURN_VAR, "-112574,256057,-1449,-1").split(",");
player.teleToLocation(Integer.parseInt(location[0]), Integer.parseInt(location[1]), Integer.parseInt(location[2]), Integer.parseInt(location[3]));
}

20
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java vendored
View File

@ -81,11 +81,6 @@ public class ProvisionalHalls extends AbstractNpcAI
@Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
if ((npc.getId() != KERRY) && (npc.getId() != MAID))
{
return null;
}
String htmltext = null;
if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
{
@ -93,6 +88,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("buy"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
synchronized (LOCK)
{
final Calendar calendar = Calendar.getInstance();
@ -147,6 +147,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("enter"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
final int playerClanId = player.getClanId();
for (Entry<Integer, Location> hall : CLAN_HALLS.entrySet())
{
@ -161,6 +166,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("leave"))
{
if ((npc == null) || (npc.getId() != MAID))
{
return null;
}
final String[] location = player.getVariables().getString(HALL_RETURN_VAR, "-112574,256057,-1449,-1").split(",");
player.teleToLocation(Integer.parseInt(location[0]), Integer.parseInt(location[1]), Integer.parseInt(location[2]), Integer.parseInt(location[3]));
}

20
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java vendored
View File

@ -81,11 +81,6 @@ public class ProvisionalHalls extends AbstractNpcAI
@Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
if ((npc.getId() != KERRY) && (npc.getId() != MAID))
{
return null;
}
String htmltext = null;
if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
{
@ -93,6 +88,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("buy"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
synchronized (LOCK)
{
final Calendar calendar = Calendar.getInstance();
@ -147,6 +147,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("enter"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
final int playerClanId = player.getClanId();
for (Entry<Integer, Location> hall : CLAN_HALLS.entrySet())
{
@ -161,6 +166,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("leave"))
{
if ((npc == null) || (npc.getId() != MAID))
{
return null;
}
final String[] location = player.getVariables().getString(HALL_RETURN_VAR, "-112574,256057,-1449,-1").split(",");
player.teleToLocation(Integer.parseInt(location[0]), Integer.parseInt(location[1]), Integer.parseInt(location[2]), Integer.parseInt(location[3]));
}

20
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java vendored
View File

@ -81,11 +81,6 @@ public class ProvisionalHalls extends AbstractNpcAI
@Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
if ((npc.getId() != KERRY) && (npc.getId() != MAID))
{
return null;
}
String htmltext = null;
if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
{
@ -93,6 +88,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("buy"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
synchronized (LOCK)
{
final Calendar calendar = Calendar.getInstance();
@ -147,6 +147,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("enter"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
final int playerClanId = player.getClanId();
for (Entry<Integer, Location> hall : CLAN_HALLS.entrySet())
{
@ -161,6 +166,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("leave"))
{
if ((npc == null) || (npc.getId() != MAID))
{
return null;
}
final String[] location = player.getVariables().getString(HALL_RETURN_VAR, "-83246,242118,-3730,-1").split(",");
player.teleToLocation(Integer.parseInt(location[0]), Integer.parseInt(location[1]), Integer.parseInt(location[2]), Integer.parseInt(location[3]));
}

20
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java vendored
View File

@ -81,11 +81,6 @@ public class ProvisionalHalls extends AbstractNpcAI
@Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
if ((npc.getId() != KERRY) && (npc.getId() != MAID))
{
return null;
}
String htmltext = null;
if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
{
@ -93,6 +88,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("buy"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
synchronized (LOCK)
{
final Calendar calendar = Calendar.getInstance();
@ -147,6 +147,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("enter"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
final int playerClanId = player.getClanId();
for (Entry<Integer, Location> hall : CLAN_HALLS.entrySet())
{
@ -161,6 +166,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("leave"))
{
if ((npc == null) || (npc.getId() != MAID))
{
return null;
}
final String[] location = player.getVariables().getString(HALL_RETURN_VAR, "-83246,242118,-3730,-1").split(",");
player.teleToLocation(Integer.parseInt(location[0]), Integer.parseInt(location[1]), Integer.parseInt(location[2]), Integer.parseInt(location[3]));
}

20
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java vendored
View File

@ -81,11 +81,6 @@ public class ProvisionalHalls extends AbstractNpcAI
@Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
if ((npc.getId() != KERRY) && (npc.getId() != MAID))
{
return null;
}
String htmltext = null;
if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
{
@ -93,6 +88,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("buy"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
synchronized (LOCK)
{
final Calendar calendar = Calendar.getInstance();
@ -147,6 +147,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("enter"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
final int playerClanId = player.getClanId();
for (Entry<Integer, Location> hall : CLAN_HALLS.entrySet())
{
@ -161,6 +166,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("leave"))
{
if ((npc == null) || (npc.getId() != MAID))
{
return null;
}
final String[] location = player.getVariables().getString(HALL_RETURN_VAR, "-83246,242118,-3730,-1").split(",");
player.teleToLocation(Integer.parseInt(location[0]), Integer.parseInt(location[1]), Integer.parseInt(location[2]), Integer.parseInt(location[3]));
}

20
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java vendored
View File

@ -81,11 +81,6 @@ public class ProvisionalHalls extends AbstractNpcAI
@Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
if ((npc.getId() != KERRY) && (npc.getId() != MAID))
{
return null;
}
String htmltext = null;
if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
{
@ -93,6 +88,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("buy"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
synchronized (LOCK)
{
final Calendar calendar = Calendar.getInstance();
@ -147,6 +147,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("enter"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
final int playerClanId = player.getClanId();
for (Entry<Integer, Location> hall : CLAN_HALLS.entrySet())
{
@ -161,6 +166,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("leave"))
{
if ((npc == null) || (npc.getId() != MAID))
{
return null;
}
final String[] location = player.getVariables().getString(HALL_RETURN_VAR, "-83246,242118,-3730,-1").split(",");
player.teleToLocation(Integer.parseInt(location[0]), Integer.parseInt(location[1]), Integer.parseInt(location[2]), Integer.parseInt(location[3]));
}

20
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java vendored
View File

@ -81,11 +81,6 @@ public class ProvisionalHalls extends AbstractNpcAI
@Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
if ((npc.getId() != KERRY) && (npc.getId() != MAID))
{
return null;
}
String htmltext = null;
if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
{
@ -93,6 +88,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("buy"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
synchronized (LOCK)
{
final Calendar calendar = Calendar.getInstance();
@ -147,6 +147,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("enter"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
final int playerClanId = player.getClanId();
for (Entry<Integer, Location> hall : CLAN_HALLS.entrySet())
{
@ -161,6 +166,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("leave"))
{
if ((npc == null) || (npc.getId() != MAID))
{
return null;
}
final String[] location = player.getVariables().getString(HALL_RETURN_VAR, "-83246,242118,-3730,-1").split(",");
player.teleToLocation(Integer.parseInt(location[0]), Integer.parseInt(location[1]), Integer.parseInt(location[2]), Integer.parseInt(location[3]));
}

20
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java vendored
View File

@ -81,11 +81,6 @@ public class ProvisionalHalls extends AbstractNpcAI
@Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
if ((npc.getId() != KERRY) && (npc.getId() != MAID))
{
return null;
}
String htmltext = null;
if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
{
@ -93,6 +88,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("buy"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
synchronized (LOCK)
{
final Calendar calendar = Calendar.getInstance();
@ -147,6 +147,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("enter"))
{
if ((npc == null) || (npc.getId() != KERRY))
{
return null;
}
final int playerClanId = player.getClanId();
for (Entry<Integer, Location> hall : CLAN_HALLS.entrySet())
{
@ -161,6 +166,11 @@ public class ProvisionalHalls extends AbstractNpcAI
}
else if (event.equals("leave"))
{
if ((npc == null) || (npc.getId() != MAID))
{
return null;
}
final String[] location = player.getVariables().getString(HALL_RETURN_VAR, "-83246,242118,-3730,-1").split(",");
player.teleToLocation(Integer.parseInt(location[0]), Integer.parseInt(location[1]), Integer.parseInt(location[2]), Integer.parseInt(location[3]));
}