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

Remove revelation skills before subclass removal.

Browse Source
This commit is contained in:
MobiusDev
2018-05-06 22:37:47 +00:00
parent 7904e0d0a2
commit f42ef7a77f
6 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -9633,7 +9633,7 @@ public final class L2PcInstance extends L2Playable
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this); EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this);
} }
final SubClass subClass = getSubClasses().remove(classIndex); final SubClass subClass = getSubClasses().get(classIndex);
if (subClass == null) if (subClass == null)
{ {
return false; return false;
@@ -9655,6 +9655,9 @@ public final class L2PcInstance extends L2Playable
} }
} }
// Remove after stats are recalculated.
getSubClasses().remove(classIndex);
try (Connection con = DatabaseFactory.getInstance().getConnection(); try (Connection con = DatabaseFactory.getInstance().getConnection();
PreparedStatement deleteHennas = con.prepareStatement(DELETE_CHAR_HENNAS); PreparedStatement deleteHennas = con.prepareStatement(DELETE_CHAR_HENNAS);
PreparedStatement deleteShortcuts = con.prepareStatement(DELETE_CHAR_SHORTCUTS); PreparedStatement deleteShortcuts = con.prepareStatement(DELETE_CHAR_SHORTCUTS);

5
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -9640,7 +9640,7 @@ public final class L2PcInstance extends L2Playable
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this); EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this);
} }
final SubClass subClass = getSubClasses().remove(classIndex); final SubClass subClass = getSubClasses().get(classIndex);
if (subClass == null) if (subClass == null)
{ {
return false; return false;
@@ -9662,6 +9662,9 @@ public final class L2PcInstance extends L2Playable
} }
} }
// Remove after stats are recalculated.
getSubClasses().remove(classIndex);
try (Connection con = DatabaseFactory.getInstance().getConnection(); try (Connection con = DatabaseFactory.getInstance().getConnection();
PreparedStatement deleteHennas = con.prepareStatement(DELETE_CHAR_HENNAS); PreparedStatement deleteHennas = con.prepareStatement(DELETE_CHAR_HENNAS);
PreparedStatement deleteShortcuts = con.prepareStatement(DELETE_CHAR_SHORTCUTS); PreparedStatement deleteShortcuts = con.prepareStatement(DELETE_CHAR_SHORTCUTS);

5
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -9650,7 +9650,7 @@ public final class L2PcInstance extends L2Playable
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this); EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this);
} }
final SubClass subClass = getSubClasses().remove(classIndex); final SubClass subClass = getSubClasses().get(classIndex);
if (subClass == null) if (subClass == null)
{ {
return false; return false;
@@ -9672,6 +9672,9 @@ public final class L2PcInstance extends L2Playable
} }
} }
// Remove after stats are recalculated.
getSubClasses().remove(classIndex);
try (Connection con = DatabaseFactory.getInstance().getConnection(); try (Connection con = DatabaseFactory.getInstance().getConnection();
PreparedStatement deleteHennas = con.prepareStatement(DELETE_CHAR_HENNAS); PreparedStatement deleteHennas = con.prepareStatement(DELETE_CHAR_HENNAS);
PreparedStatement deleteShortcuts = con.prepareStatement(DELETE_CHAR_SHORTCUTS); PreparedStatement deleteShortcuts = con.prepareStatement(DELETE_CHAR_SHORTCUTS);

5
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -9643,7 +9643,7 @@ public final class L2PcInstance extends L2Playable
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this); EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this);
} }
final SubClass subClass = getSubClasses().remove(classIndex); final SubClass subClass = getSubClasses().get(classIndex);
if (subClass == null) if (subClass == null)
{ {
return false; return false;
@@ -9665,6 +9665,9 @@ public final class L2PcInstance extends L2Playable
} }
} }
// Remove after stats are recalculated.
getSubClasses().remove(classIndex);
try (Connection con = DatabaseFactory.getInstance().getConnection(); try (Connection con = DatabaseFactory.getInstance().getConnection();
PreparedStatement deleteHennas = con.prepareStatement(DELETE_CHAR_HENNAS); PreparedStatement deleteHennas = con.prepareStatement(DELETE_CHAR_HENNAS);
PreparedStatement deleteShortcuts = con.prepareStatement(DELETE_CHAR_SHORTCUTS); PreparedStatement deleteShortcuts = con.prepareStatement(DELETE_CHAR_SHORTCUTS);

5
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -9574,7 +9574,7 @@ public final class L2PcInstance extends L2Playable
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this); EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this);
} }
final SubClass subClass = getSubClasses().remove(classIndex); final SubClass subClass = getSubClasses().get(classIndex);
if (subClass == null) if (subClass == null)
{ {
return false; return false;
@@ -9596,6 +9596,9 @@ public final class L2PcInstance extends L2Playable
} }
} }
// Remove after stats are recalculated.
getSubClasses().remove(classIndex);
try (Connection con = DatabaseFactory.getInstance().getConnection(); try (Connection con = DatabaseFactory.getInstance().getConnection();
PreparedStatement deleteHennas = con.prepareStatement(DELETE_CHAR_HENNAS); PreparedStatement deleteHennas = con.prepareStatement(DELETE_CHAR_HENNAS);
PreparedStatement deleteShortcuts = con.prepareStatement(DELETE_CHAR_SHORTCUTS); PreparedStatement deleteShortcuts = con.prepareStatement(DELETE_CHAR_SHORTCUTS);

5
L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -9574,7 +9574,7 @@ public final class L2PcInstance extends L2Playable
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this); EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this);
} }
final SubClass subClass = getSubClasses().remove(classIndex); final SubClass subClass = getSubClasses().get(classIndex);
if (subClass == null) if (subClass == null)
{ {
return false; return false;
@@ -9596,6 +9596,9 @@ public final class L2PcInstance extends L2Playable
} }
} }
// Remove after stats are recalculated.
getSubClasses().remove(classIndex);
try (Connection con = DatabaseFactory.getInstance().getConnection(); try (Connection con = DatabaseFactory.getInstance().getConnection();
PreparedStatement deleteHennas = con.prepareStatement(DELETE_CHAR_HENNAS); PreparedStatement deleteHennas = con.prepareStatement(DELETE_CHAR_HENNAS);
PreparedStatement deleteShortcuts = con.prepareStatement(DELETE_CHAR_SHORTCUTS); PreparedStatement deleteShortcuts = con.prepareStatement(DELETE_CHAR_SHORTCUTS);