BETA: Fix for ticket #5465 (thanks Deedlit/Szponiasty and Triumph)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -858,6 +858,7 @@ public final class L2PcInstance extends L2Playable
 			
 		}
 		
+		@Override
 		public void run()
 		{
 			try
@@ -908,6 +909,7 @@ public final class L2PcInstance extends L2Playable
 			_sendMessage = sendMessage;
 		}
 		
+		@Override
 		public void run()
 		{
 			try
@@ -926,6 +928,7 @@ public final class L2PcInstance extends L2Playable
 	
 	private class ShortBuffTask implements Runnable
 	{
+		@Override
 		public void run()
 		{
 			if (L2PcInstance.this == null)
@@ -3111,6 +3114,7 @@ public final class L2PcInstance extends L2Playable
 	 */
 	private class SitDownTask implements Runnable
 	{
+		@Override
 		public void run()
 		{
 			L2PcInstance.this.setIsParalyzed(false);
@@ -3122,6 +3126,7 @@ public final class L2PcInstance extends L2Playable
 	 */
 	private class StandUpTask implements Runnable
 	{
+		@Override
 		public void run()
 		{
 			L2PcInstance.this.setIsSitting(false);
@@ -4538,6 +4543,7 @@ public final class L2PcInstance extends L2Playable
 		/**
 		 * @see java.lang.Runnable#run()
 		 */
+		@Override
 		public void run()
 		{
 			L2GameClient client = L2PcInstance.this.getClient();
@@ -4912,10 +4918,11 @@ public final class L2PcInstance extends L2Playable
 	}
 	
 	@Override
-	public void untransform()
+	public synchronized void untransform()
 	{
 		if (_transformation != null)
 		{
+			setQueuedSkill(null, false, false);
 			setTransformAllowedSkills(new int[]{});
 			_transformation.onUntransform();
 			_transformation = null;
@@ -9600,6 +9607,7 @@ public final class L2PcInstance extends L2Playable
 	
 	private class InventoryEnable implements Runnable
 	{
+		@Override
 		public void run()
 		{
 			_inventoryDisable = false;
@@ -9841,6 +9849,7 @@ public final class L2PcInstance extends L2Playable
 	
 	private class WarnUserTakeBreak implements Runnable
 	{
+		@Override
 		public void run()
 		{
 			if (L2PcInstance.this.isOnline())
@@ -9855,6 +9864,7 @@ public final class L2PcInstance extends L2Playable
 	
 	private class RentPetTask implements Runnable
 	{
+		@Override
 		public void run()
 		{
 			stopRentPet();
@@ -9863,6 +9873,7 @@ public final class L2PcInstance extends L2Playable
 	
 	private class WaterTask implements Runnable
 	{
+		@Override
 		public void run()
 		{
 			double reduceHp = getMaxHp()/100.0;
@@ -9894,6 +9905,7 @@ public final class L2PcInstance extends L2Playable
 			_isUpperGrade = isUpperGrade;
 		}
 		
+		@Override
 		public void run()
 		{
 			if (System.currentTimeMillis() >= _endTaskTime) {
@@ -11221,6 +11233,7 @@ public final class L2PcInstance extends L2Playable
 			_player = L2PcInstance.this;
 		}
 		
+		@Override
 		public void run()
 		{
 			if (_player == null || !_player.isTeleporting())
@@ -12682,6 +12695,7 @@ public final class L2PcInstance extends L2Playable
 	
 	private class PunishTask implements Runnable
 	{
+		@Override
 		public void run()
 		{
 			L2PcInstance.this.setPunishLevel(PunishLevel.NONE, 0);
@@ -12716,6 +12730,7 @@ public final class L2PcInstance extends L2Playable
 			_value = value;
 		}
 		
+		@Override
 		public void run()
 		{
 			if (_player == null || (_player.isDead() && !Config.FAME_FOR_DEAD_PLAYERS))
@@ -12757,6 +12772,7 @@ public final class L2PcInstance extends L2Playable
 			_player = player;
 		}
 		
+		@Override
 		public void run()
 		{
 			if (!_player.isInsideZone(L2Character.ZONE_PEACE))
@@ -12947,6 +12963,7 @@ public final class L2PcInstance extends L2Playable
 	
 	private class SoulTask implements Runnable
 	{
+		@Override
 		public void run()
 		{
 			L2PcInstance.this.clearSouls();
@@ -13530,6 +13547,7 @@ public final class L2PcInstance extends L2Playable
 	/** Section for mounted pets */
 	private class FeedTask implements Runnable
 	{
+		@Override
 		public void run()
 		{
 			try
@@ -13672,6 +13690,7 @@ public final class L2PcInstance extends L2Playable
 	
 	private class Dismount implements Runnable
 	{
+		@Override
 		public void run()
 		{
 			try
@@ -13871,6 +13890,7 @@ public final class L2PcInstance extends L2Playable
 	private class ChargeTask implements Runnable
 	{
 		
+		@Override
 		public void run()
 		{
 			L2PcInstance.this.clearCharges();
@@ -15079,6 +15099,7 @@ public final class L2PcInstance extends L2Playable
 	
 	private class RecoGiveTask implements Runnable
 	{
+		@Override
 		public void run()
 		{
 			if (L2PcInstance.this == null)
@@ -15107,6 +15128,7 @@ public final class L2PcInstance extends L2Playable
 	
 	private class RecoBonusTaskEnd implements Runnable
 	{
+		@Override
 		public void run()
 		{
 			if (L2PcInstance.this == null)