Merge branch 'master' of https://github.com/L2J/L2J_Server.git

L2J_Server/java/com/l2jserver/gameserver/model/L2Party.java

@@ -618,20 +618,23 @@ public class L2Party extends AbstractPlayerGroup
 		target.addItem("Party", item, player, true);
 		
 		// Send messages to other party members about reward
-		if (item.getCount() > 1)
+		if (item.getCount() > 0)
 		{
-			SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_OBTAINED_S3_S2);
-			msg.addString(target.getName());
-			msg.addItemName(item);
-			msg.addLong(item.getCount());
-			broadcastToPartyMembers(target, msg);
-		}
-		else
-		{
-			SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_OBTAINED_S2);
-			msg.addString(target.getName());
-			msg.addItemName(item);
-			broadcastToPartyMembers(target, msg);
+			if (item.getCount() > 1)
+			{
+				SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_OBTAINED_S3_S2);
+				msg.addString(target.getName());
+				msg.addItemName(item);
+				msg.addLong(item.getCount());
+				broadcastToPartyMembers(target, msg);
+			}
+			else
+			{
+				SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_OBTAINED_S2);
+				msg.addString(target.getName());
+				msg.addItemName(item);
+				broadcastToPartyMembers(target, msg);
+			}
 		}
 	}
 	
@@ -656,20 +659,23 @@ public class L2Party extends AbstractPlayerGroup
 		looter.addItem(spoil ? "Sweeper Party" : "Party", itemId, itemCount, target, true);
 		
 		// Send messages to other party members about reward
-		if (itemCount > 1)
+		if (itemCount > 0)
 		{
-			SystemMessage msg = spoil ? SystemMessage.getSystemMessage(SystemMessageId.C1_SWEEPED_UP_S3_S2) : SystemMessage.getSystemMessage(SystemMessageId.C1_OBTAINED_S3_S2);
-			msg.addString(looter.getName());
-			msg.addItemName(itemId);
-			msg.addLong(itemCount);
-			broadcastToPartyMembers(looter, msg);
-		}
-		else
-		{
-			SystemMessage msg = spoil ? SystemMessage.getSystemMessage(SystemMessageId.C1_SWEEPED_UP_S2) : SystemMessage.getSystemMessage(SystemMessageId.C1_OBTAINED_S2);
-			msg.addString(looter.getName());
-			msg.addItemName(itemId);
-			broadcastToPartyMembers(looter, msg);
+			if (itemCount > 1)
+			{
+				SystemMessage msg = spoil ? SystemMessage.getSystemMessage(SystemMessageId.C1_SWEEPED_UP_S3_S2) : SystemMessage.getSystemMessage(SystemMessageId.C1_OBTAINED_S3_S2);
+				msg.addString(looter.getName());
+				msg.addItemName(itemId);
+				msg.addLong(itemCount);
+				broadcastToPartyMembers(looter, msg);
+			}
+			else
+			{
+				SystemMessage msg = spoil ? SystemMessage.getSystemMessage(SystemMessageId.C1_SWEEPED_UP_S2) : SystemMessage.getSystemMessage(SystemMessageId.C1_OBTAINED_S2);
+				msg.addString(looter.getName());
+				msg.addItemName(itemId);
+				broadcastToPartyMembers(looter, msg);
+			}
 		}
 	}
 	

L2J_Server/java/com/l2jserver/gameserver/model/actor/L2Attackable.java

@@ -989,7 +989,7 @@ public class L2Attackable extends L2Npc
 				}
 				
 				// Broadcast message if RaidBoss was defeated
-				if (isRaid() && !isRaidMinion())
+				if (isRaid() && !isRaidMinion() && drop.getCount() > 0)
 				{
 					final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DIED_DROPPED_S3_S2);
 					sm.addCharName(this);