Fixed subclass change NPEs.

Contributed by Trance.
This commit is contained in:
MobiusDevelopment
2020-05-18 21:35:03 +00:00
parent 96fb9ea3e8
commit 49d38cc1aa
14 changed files with 14 additions and 14 deletions
@@ -9779,7 +9779,7 @@ public class PlayerInstance extends Playable
restoreEffects(); restoreEffects();
sendPacket(new EtcStatusUpdate(this)); sendPacket(new EtcStatusUpdate(this));
for (int i = 0; i < 4; i++) for (int i = 0; i < 3; i++)
{ {
_henna[i] = null; _henna[i] = null;
} }
@@ -342,7 +342,7 @@ public class VillageMasterInstance extends NpcInstance
} }
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
// Subclasses may not be changed while a transformated state. // Subclasses may not be changed while a transformated state.
if (player.getTransformation() != null) if (player.isTransformed())
{ {
html.setFile(player, "data/html/villagemaster/SubClass_NoTransformed.htm"); html.setFile(player, "data/html/villagemaster/SubClass_NoTransformed.htm");
player.sendPacket(html); player.sendPacket(html);
@@ -9779,7 +9779,7 @@ public class PlayerInstance extends Playable
restoreEffects(); restoreEffects();
sendPacket(new EtcStatusUpdate(this)); sendPacket(new EtcStatusUpdate(this));
for (int i = 0; i < 4; i++) for (int i = 0; i < 3; i++)
{ {
_henna[i] = null; _henna[i] = null;
} }
@@ -342,7 +342,7 @@ public class VillageMasterInstance extends NpcInstance
} }
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
// Subclasses may not be changed while a transformated state. // Subclasses may not be changed while a transformated state.
if (player.getTransformation() != null) if (player.isTransformed())
{ {
html.setFile(player, "data/html/villagemaster/SubClass_NoTransformed.htm"); html.setFile(player, "data/html/villagemaster/SubClass_NoTransformed.htm");
player.sendPacket(html); player.sendPacket(html);
@@ -9765,7 +9765,7 @@ public class PlayerInstance extends Playable
restoreEffects(); restoreEffects();
sendPacket(new EtcStatusUpdate(this)); sendPacket(new EtcStatusUpdate(this));
for (int i = 0; i < 4; i++) for (int i = 0; i < 3; i++)
{ {
_henna[i] = null; _henna[i] = null;
} }
@@ -342,7 +342,7 @@ public class VillageMasterInstance extends NpcInstance
} }
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
// Subclasses may not be changed while a transformated state. // Subclasses may not be changed while a transformated state.
if (player.getTransformation() != null) if (player.isTransformed())
{ {
html.setFile(player, "data/html/villagemaster/SubClass_NoTransformed.htm"); html.setFile(player, "data/html/villagemaster/SubClass_NoTransformed.htm");
player.sendPacket(html); player.sendPacket(html);
@@ -9792,7 +9792,7 @@ public class PlayerInstance extends Playable
restoreEffects(); restoreEffects();
sendPacket(new EtcStatusUpdate(this)); sendPacket(new EtcStatusUpdate(this));
for (int i = 0; i < 4; i++) for (int i = 0; i < 3; i++)
{ {
_henna[i] = null; _henna[i] = null;
} }
@@ -342,7 +342,7 @@ public class VillageMasterInstance extends NpcInstance
} }
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
// Subclasses may not be changed while a transformated state. // Subclasses may not be changed while a transformated state.
if (player.getTransformation() != null) if (player.isTransformed())
{ {
html.setFile(player, "data/html/villagemaster/SubClass_NoTransformed.htm"); html.setFile(player, "data/html/villagemaster/SubClass_NoTransformed.htm");
player.sendPacket(html); player.sendPacket(html);
@@ -9792,7 +9792,7 @@ public class PlayerInstance extends Playable
restoreEffects(); restoreEffects();
sendPacket(new EtcStatusUpdate(this)); sendPacket(new EtcStatusUpdate(this));
for (int i = 0; i < 4; i++) for (int i = 0; i < 3; i++)
{ {
_henna[i] = null; _henna[i] = null;
} }
@@ -342,7 +342,7 @@ public class VillageMasterInstance extends NpcInstance
} }
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
// Subclasses may not be changed while a transformated state. // Subclasses may not be changed while a transformated state.
if (player.getTransformation() != null) if (player.isTransformed())
{ {
html.setFile(player, "data/html/villagemaster/SubClass_NoTransformed.htm"); html.setFile(player, "data/html/villagemaster/SubClass_NoTransformed.htm");
player.sendPacket(html); player.sendPacket(html);
@@ -9704,7 +9704,7 @@ public class PlayerInstance extends Playable
restoreEffects(); restoreEffects();
sendPacket(new EtcStatusUpdate(this)); sendPacket(new EtcStatusUpdate(this));
for (int i = 0; i < 4; i++) for (int i = 0; i < 3; i++)
{ {
_henna[i] = null; _henna[i] = null;
} }
@@ -342,7 +342,7 @@ public class VillageMasterInstance extends NpcInstance
} }
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
// Subclasses may not be changed while a transformated state. // Subclasses may not be changed while a transformated state.
if (player.getTransformation() != null) if (player.isTransformed())
{ {
html.setFile(player, "data/html/villagemaster/SubClass_NoTransformed.htm"); html.setFile(player, "data/html/villagemaster/SubClass_NoTransformed.htm");
player.sendPacket(html); player.sendPacket(html);
@@ -9791,7 +9791,7 @@ public class PlayerInstance extends Playable
restoreEffects(); restoreEffects();
sendPacket(new EtcStatusUpdate(this)); sendPacket(new EtcStatusUpdate(this));
for (int i = 0; i < 4; i++) for (int i = 0; i < 3; i++)
{ {
_henna[i] = null; _henna[i] = null;
} }
@@ -342,7 +342,7 @@ public class VillageMasterInstance extends NpcInstance
} }
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
// Subclasses may not be changed while a transformated state. // Subclasses may not be changed while a transformated state.
if (player.getTransformation() != null) if (player.isTransformed())
{ {
html.setFile(player, "data/html/villagemaster/SubClass_NoTransformed.htm"); html.setFile(player, "data/html/villagemaster/SubClass_NoTransformed.htm");
player.sendPacket(html); player.sendPacket(html);