From 49d38cc1aadc94e2cac9c70d92a2abc82c8b69bf Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 18 May 2020 21:35:03 +0000
Subject: [PATCH] Fixed subclass change NPEs. Contributed by Trance.

---
 .../gameserver/model/actor/instance/PlayerInstance.java         | 2 +-
 .../gameserver/model/actor/instance/VillageMasterInstance.java  | 2 +-
 .../gameserver/model/actor/instance/PlayerInstance.java         | 2 +-
 .../gameserver/model/actor/instance/VillageMasterInstance.java  | 2 +-
 .../gameserver/model/actor/instance/PlayerInstance.java         | 2 +-
 .../gameserver/model/actor/instance/VillageMasterInstance.java  | 2 +-
 .../gameserver/model/actor/instance/PlayerInstance.java         | 2 +-
 .../gameserver/model/actor/instance/VillageMasterInstance.java  | 2 +-
 .../gameserver/model/actor/instance/PlayerInstance.java         | 2 +-
 .../gameserver/model/actor/instance/VillageMasterInstance.java  | 2 +-
 .../gameserver/model/actor/instance/PlayerInstance.java         | 2 +-
 .../gameserver/model/actor/instance/VillageMasterInstance.java  | 2 +-
 .../gameserver/model/actor/instance/PlayerInstance.java         | 2 +-
 .../gameserver/model/actor/instance/VillageMasterInstance.java  | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index fe41eb2dd7..2bd2c41666 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -9779,7 +9779,7 @@ public class PlayerInstance extends Playable
 			restoreEffects();
 			
 			sendPacket(new EtcStatusUpdate(this));
-			for (int i = 0; i < 4; i++)
+			for (int i = 0; i < 3; i++)
 			{
 				_henna[i] = null;
 			}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index 0f88b6c7be..51ce88b3b9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -342,7 +342,7 @@ public class VillageMasterInstance extends NpcInstance
 			}
 			final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 			// 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");
 				player.sendPacket(html);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 347e248bac..fda3eb9d63 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -9779,7 +9779,7 @@ public class PlayerInstance extends Playable
 			restoreEffects();
 			
 			sendPacket(new EtcStatusUpdate(this));
-			for (int i = 0; i < 4; i++)
+			for (int i = 0; i < 3; i++)
 			{
 				_henna[i] = null;
 			}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index 0f88b6c7be..51ce88b3b9 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -342,7 +342,7 @@ public class VillageMasterInstance extends NpcInstance
 			}
 			final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 			// 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");
 				player.sendPacket(html);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 7d04933958..8b6251d483 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -9765,7 +9765,7 @@ public class PlayerInstance extends Playable
 			restoreEffects();
 			
 			sendPacket(new EtcStatusUpdate(this));
-			for (int i = 0; i < 4; i++)
+			for (int i = 0; i < 3; i++)
 			{
 				_henna[i] = null;
 			}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index 0f88b6c7be..51ce88b3b9 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -342,7 +342,7 @@ public class VillageMasterInstance extends NpcInstance
 			}
 			final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 			// 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");
 				player.sendPacket(html);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 98b145a2c7..ffed28ea40 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -9792,7 +9792,7 @@ public class PlayerInstance extends Playable
 			restoreEffects();
 			
 			sendPacket(new EtcStatusUpdate(this));
-			for (int i = 0; i < 4; i++)
+			for (int i = 0; i < 3; i++)
 			{
 				_henna[i] = null;
 			}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index 0f88b6c7be..51ce88b3b9 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -342,7 +342,7 @@ public class VillageMasterInstance extends NpcInstance
 			}
 			final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 			// 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");
 				player.sendPacket(html);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 71d2bbd0b1..e70c55ab63 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -9792,7 +9792,7 @@ public class PlayerInstance extends Playable
 			restoreEffects();
 			
 			sendPacket(new EtcStatusUpdate(this));
-			for (int i = 0; i < 4; i++)
+			for (int i = 0; i < 3; i++)
 			{
 				_henna[i] = null;
 			}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index 0f88b6c7be..51ce88b3b9 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -342,7 +342,7 @@ public class VillageMasterInstance extends NpcInstance
 			}
 			final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 			// 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");
 				player.sendPacket(html);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 1ba5ff9f95..1ec07edaf8 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -9704,7 +9704,7 @@ public class PlayerInstance extends Playable
 			restoreEffects();
 			
 			sendPacket(new EtcStatusUpdate(this));
-			for (int i = 0; i < 4; i++)
+			for (int i = 0; i < 3; i++)
 			{
 				_henna[i] = null;
 			}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index c8d6c788ba..9e8463b738 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -342,7 +342,7 @@ public class VillageMasterInstance extends NpcInstance
 			}
 			final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 			// 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");
 				player.sendPacket(html);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index e24d0f0729..0a424574a4 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -9791,7 +9791,7 @@ public class PlayerInstance extends Playable
 			restoreEffects();
 			
 			sendPacket(new EtcStatusUpdate(this));
-			for (int i = 0; i < 4; i++)
+			for (int i = 0; i < 3; i++)
 			{
 				_henna[i] = null;
 			}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index 0f88b6c7be..51ce88b3b9 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -342,7 +342,7 @@ public class VillageMasterInstance extends NpcInstance
 			}
 			final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 			// 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");
 				player.sendPacket(html);