瀏覽代碼

BETA: Fixing some more NPEs.
* Reported by: Nik

Rumen Nikiforov 12 年之前
父節點
當前提交
f158e9429f
共有 1 個文件被更改,包括 13 次插入1 次删除
  1. 13 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Attackable.java

+ 13 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Attackable.java

@@ -1211,12 +1211,18 @@ public class L2Attackable extends L2Npc
 			dropChance = ((drop.getChance() - ((drop.getChance() * levelModifier) / 100)) / deepBlueDrop);
 			dropChance = ((drop.getChance() - ((drop.getChance() * levelModifier) / 100)) / deepBlueDrop);
 		
 		
 		// Applies Drop rates
 		// Applies Drop rates
-		if (Config.RATE_DROP_ITEMS_ID.get(drop.getItemId()) != 0)
+		if (Config.RATE_DROP_ITEMS_ID.containsKey(drop.getItemId()))
+		{
 			dropChance *= Config.RATE_DROP_ITEMS_ID.get(drop.getItemId());
 			dropChance *= Config.RATE_DROP_ITEMS_ID.get(drop.getItemId());
+		}
 		else if (isSweep)
 		else if (isSweep)
+		{
 			dropChance *= Config.RATE_DROP_SPOIL;
 			dropChance *= Config.RATE_DROP_SPOIL;
+		}
 		else
 		else
+		{
 			dropChance *= isRaid() && !isRaidMinion() ? Config.RATE_DROP_ITEMS_BY_RAID : Config.RATE_DROP_ITEMS;
 			dropChance *= isRaid() && !isRaidMinion() ? Config.RATE_DROP_ITEMS_BY_RAID : Config.RATE_DROP_ITEMS;
+		}
 		
 		
 		if (Config.L2JMOD_CHAMPION_ENABLE && isChampion())
 		if (Config.L2JMOD_CHAMPION_ENABLE && isChampion())
 			dropChance *= Config.L2JMOD_CHAMPION_REWARDS;
 			dropChance *= Config.L2JMOD_CHAMPION_REWARDS;
@@ -1344,12 +1350,18 @@ public class L2Attackable extends L2Npc
 			double dropChance = drop.getChance();
 			double dropChance = drop.getChance();
 			
 			
 			if (Config.RATE_DROP_ITEMS_ID.containsKey(drop.getItemId()))
 			if (Config.RATE_DROP_ITEMS_ID.containsKey(drop.getItemId()))
+			{
 				dropChance *= Config.RATE_DROP_ITEMS_ID.get(drop.getItemId());
 				dropChance *= Config.RATE_DROP_ITEMS_ID.get(drop.getItemId());
+			}
 			else
 			else
+			{
 				dropChance *= isRaid() && !isRaidMinion() ? Config.RATE_DROP_ITEMS_BY_RAID : Config.RATE_DROP_ITEMS;
 				dropChance *= isRaid() && !isRaidMinion() ? Config.RATE_DROP_ITEMS_BY_RAID : Config.RATE_DROP_ITEMS;
+			}
 			
 			
 			if (Config.L2JMOD_CHAMPION_ENABLE && isChampion())
 			if (Config.L2JMOD_CHAMPION_ENABLE && isChampion())
+			{
 				dropChance *= Config.L2JMOD_CHAMPION_REWARDS;
 				dropChance *= Config.L2JMOD_CHAMPION_REWARDS;
+			}
 			
 			
 			dropChance = Math.round(dropChance);
 			dropChance = Math.round(dropChance);