The default pet name value is an empty string.
Contributed by G-hamsteR.
This commit is contained in:
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -53,7 +53,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -53,7 +53,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -57,7 +57,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -58,7 +58,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -58,7 +58,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -58,7 +58,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
@@ -58,7 +58,7 @@ public class RequestChangePetName implements ClientPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pet.getName() != null)
|
if ((pet.getName() != null) && !pet.getName().equals(""))
|
||||||
{
|
{
|
||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
|
||||||
return;
|
return;
|
||||||
|
Reference in New Issue
Block a user