diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index fce5c99f5d..b15c2aeb01 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -862,7 +862,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -952,7 +959,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index fce5c99f5d..b15c2aeb01 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -862,7 +862,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -952,7 +959,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index fce5c99f5d..b15c2aeb01 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -862,7 +862,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -952,7 +959,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index fce5c99f5d..b15c2aeb01 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -862,7 +862,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -952,7 +959,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index fce5c99f5d..b15c2aeb01 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -862,7 +862,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -952,7 +959,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index fce5c99f5d..b15c2aeb01 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -862,7 +862,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -952,7 +959,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index fce5c99f5d..b15c2aeb01 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -862,7 +862,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -952,7 +959,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index fce5c99f5d..b15c2aeb01 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -862,7 +862,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -952,7 +959,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 9edff93e6e..fe8a556e5f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -862,7 +862,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -952,7 +959,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 9edff93e6e..fe8a556e5f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -862,7 +862,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -952,7 +959,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 9edff93e6e..fe8a556e5f 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -862,7 +862,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -952,7 +959,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 9edff93e6e..fe8a556e5f 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -862,7 +862,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -952,7 +959,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index c1f0d10395..0d5d08bd58 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -801,7 +801,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -891,7 +898,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index d52f36d6dd..0cb77f3ddf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -801,7 +801,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -891,7 +898,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index d52f36d6dd..0cb77f3ddf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -801,7 +801,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -891,7 +898,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index e4be0a78ce..090e2fee20 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -863,7 +863,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -953,7 +960,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index e4be0a78ce..090e2fee20 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -863,7 +863,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -953,7 +960,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index e4be0a78ce..090e2fee20 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -863,7 +863,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -953,7 +960,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 41373c82fc..7885aa44e4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -878,7 +878,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -968,7 +975,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 41373c82fc..7885aa44e4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -878,7 +878,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -968,7 +975,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 41373c82fc..7885aa44e4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -878,7 +878,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -968,7 +975,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 1d3e86b4d9..70c8c5dbeb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -862,7 +862,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -952,7 +959,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 2ef83fc7f4..67a4d3a945 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -877,7 +877,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -967,7 +974,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 2ef83fc7f4..67a4d3a945 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -877,7 +877,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -967,7 +974,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 2ef83fc7f4..67a4d3a945 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -877,7 +877,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -967,7 +974,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 2ef83fc7f4..67a4d3a945 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -877,7 +877,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; } @@ -967,7 +974,16 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable } // finally - if (dropItem.getChance() < 100) + final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()); + if (itemChance != null) + { + if ((dropItem.getChance() * itemChance) < 100) + { + dropOccurrenceCounter--; + randomDrops.add(drop); + } + } + else if (dropItem.getChance() < 100) { dropOccurrenceCounter--; randomDrops.add(drop);