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

Fixed class change NPE.

Browse Source
This commit is contained in:
MobiusDev
2018-04-07 18:10:37 +00:00
parent ecfee7dd5f
commit 4b01a96675
7 changed files with 48 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+7 -4
View File
@@ -9627,6 +9627,13 @@ public final class L2PcInstance extends L2Playable
try
{
// Notify to scripts before class is removed.
if (!getSubClasses().isEmpty()) // also null check
{
final int classId = getSubClasses().get(classIndex).getClassId();
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this);
}
final SubClass subClass = getSubClasses().remove(classIndex);
if (subClass == null)
{
@@ -9686,10 +9693,6 @@ public final class L2PcInstance extends L2Playable
_log.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e);
return false;
}
// Notify to scripts
int classId = getSubClasses().get(classIndex).getClassId();
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this);
}
finally
{
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+7 -4
View File
@@ -9634,6 +9634,13 @@ public final class L2PcInstance extends L2Playable
try
{
// Notify to scripts before class is removed.
if (!getSubClasses().isEmpty()) // also null check
{
final int classId = getSubClasses().get(classIndex).getClassId();
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this);
}
final SubClass subClass = getSubClasses().remove(classIndex);
if (subClass == null)
{
@@ -9693,10 +9700,6 @@ public final class L2PcInstance extends L2Playable
_log.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e);
return false;
}
// Notify to scripts
int classId = getSubClasses().get(classIndex).getClassId();
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this);
}
finally
{
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+7 -4
View File
@@ -9644,6 +9644,13 @@ public final class L2PcInstance extends L2Playable
try
{
// Notify to scripts before class is removed.
if (!getSubClasses().isEmpty()) // also null check
{
final int classId = getSubClasses().get(classIndex).getClassId();
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this);
}
final SubClass subClass = getSubClasses().remove(classIndex);
if (subClass == null)
{
@@ -9703,10 +9710,6 @@ public final class L2PcInstance extends L2Playable
_log.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e);
return false;
}
// Notify to scripts
int classId = getSubClasses().get(classIndex).getClassId();
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this);
}
finally
{
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+7 -4
View File
@@ -9637,6 +9637,13 @@ public final class L2PcInstance extends L2Playable
try
{
// Notify to scripts before class is removed.
if (!getSubClasses().isEmpty()) // also null check
{
final int classId = getSubClasses().get(classIndex).getClassId();
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this);
}
final SubClass subClass = getSubClasses().remove(classIndex);
if (subClass == null)
{
@@ -9696,10 +9703,6 @@ public final class L2PcInstance extends L2Playable
_log.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e);
return false;
}
// Notify to scripts
int classId = getSubClasses().get(classIndex).getClassId();
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this);
}
finally
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+5 -2
View File
@@ -10092,9 +10092,12 @@ public final class L2PcInstance extends L2Playable
return false;
}
// Notify to scripts
int classId = getSubClasses().get(classIndex).getClassId();
// Notify to scripts before class is removed.
if (!getSubClasses().isEmpty()) // also null check
{
final int classId = getSubClasses().get(classIndex).getClassId();
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this);
}
getSubClasses().remove(classIndex);
}
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+7 -4
View File
@@ -9569,6 +9569,13 @@ public final class L2PcInstance extends L2Playable
try
{
// Notify to scripts before class is removed.
if (!getSubClasses().isEmpty()) // also null check
{
final int classId = getSubClasses().get(classIndex).getClassId();
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this);
}
final SubClass subClass = getSubClasses().remove(classIndex);
if (subClass == null)
{
@@ -9628,10 +9635,6 @@ public final class L2PcInstance extends L2Playable
_log.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e);
return false;
}
// Notify to scripts
int classId = getSubClasses().get(classIndex).getClassId();
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this);
}
finally
{
L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+7 -4
View File
@@ -9569,6 +9569,13 @@ public final class L2PcInstance extends L2Playable
try
{
// Notify to scripts before class is removed.
if (!getSubClasses().isEmpty()) // also null check
{
final int classId = getSubClasses().get(classIndex).getClassId();
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this);
}
final SubClass subClass = getSubClasses().remove(classIndex);
if (subClass == null)
{
@@ -9628,10 +9635,6 @@ public final class L2PcInstance extends L2Playable
_log.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e);
return false;
}
// Notify to scripts
int classId = getSubClasses().get(classIndex).getClassId();
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this);
}
finally
{