Fixed subclass change NPEs.
Contributed by Trance.
This commit is contained in:
+1
-1
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -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);
|
||||||
|
|||||||
+1
-1
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -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);
|
||||||
|
|||||||
+1
-1
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -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);
|
||||||
|
|||||||
+1
-1
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -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);
|
||||||
|
|||||||
+1
-1
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -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);
|
||||||
|
|||||||
+1
-1
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -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);
|
||||||
|
|||||||
+1
-1
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -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);
|
||||||
|
|||||||
Reference in New Issue
Block a user