Просмотр исходного кода

Fixing NPE when unsummoning a pet
Patch by: @Sdw-

UnAfraid 10 лет назад
Родитель
Сommit
005ffb97ca

+ 6 - 5
L2J_Server/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java

@@ -188,6 +188,12 @@ public final class RequestActionUse extends L2GameClientPacket
 				}
 				break;
 			case 19: // Unsummon Pet
+				
+				if (!validateSummon(summon, true))
+				{
+					break;
+				}
+				
 				if (summon.isDead())
 				{
 					sendPacket(SystemMessageId.DEAD_PET_CANNOT_BE_RETURNED);
@@ -213,11 +219,6 @@ public final class RequestActionUse extends L2GameClientPacket
 					break;
 				}
 				
-				if (!validateSummon(summon, true))
-				{
-					break;
-				}
-				
 				summon.unSummon(activeChar);
 				break;
 			case 21: // Change Movement Mode (Servitors)