From 174b9ca0b538dc7cda9bda791bc58bed3b475793 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 6 Oct 2017 01:15:29 +0000
Subject: [PATCH] Herb rates must be calculated before raid rates.

---
 .../scripts/handlers/communityboard/DropSearchBoard.java  | 8 ++++----
 .../scripts/handlers/communityboard/DropSearchBoard.java  | 8 ++++----
 .../scripts/handlers/communityboard/DropSearchBoard.java  | 8 ++++----
 .../scripts/handlers/communityboard/DropSearchBoard.java  | 8 ++++----
 .../scripts/handlers/communityboard/DropSearchBoard.java  | 8 ++++----
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
index 94e20c8837..1e8aca6386 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
@@ -211,14 +211,14 @@ public class DropSearchBoard implements IParseBoardHandler
 						{
 							rateAmount *= Config.RATE_DROP_AMOUNT_BY_ID.get(cbDropHolder.itemId);
 						}
-						else if (cbDropHolder.isRaid)
-						{
-							rateAmount *= Config.RATE_RAID_DROP_AMOUNT_MULTIPLIER;
-						}
 						else if (item.hasExImmediateEffect())
 						{
 							rateAmount *= Config.RATE_HERB_DROP_AMOUNT_MULTIPLIER;
 						}
+						else if (cbDropHolder.isRaid)
+						{
+							rateAmount *= Config.RATE_RAID_DROP_AMOUNT_MULTIPLIER;
+						}
 						else
 						{
 							rateAmount *= Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER;
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
index 94e20c8837..1e8aca6386 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
@@ -211,14 +211,14 @@ public class DropSearchBoard implements IParseBoardHandler
 						{
 							rateAmount *= Config.RATE_DROP_AMOUNT_BY_ID.get(cbDropHolder.itemId);
 						}
-						else if (cbDropHolder.isRaid)
-						{
-							rateAmount *= Config.RATE_RAID_DROP_AMOUNT_MULTIPLIER;
-						}
 						else if (item.hasExImmediateEffect())
 						{
 							rateAmount *= Config.RATE_HERB_DROP_AMOUNT_MULTIPLIER;
 						}
+						else if (cbDropHolder.isRaid)
+						{
+							rateAmount *= Config.RATE_RAID_DROP_AMOUNT_MULTIPLIER;
+						}
 						else
 						{
 							rateAmount *= Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER;
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
index 94e20c8837..1e8aca6386 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
@@ -211,14 +211,14 @@ public class DropSearchBoard implements IParseBoardHandler
 						{
 							rateAmount *= Config.RATE_DROP_AMOUNT_BY_ID.get(cbDropHolder.itemId);
 						}
-						else if (cbDropHolder.isRaid)
-						{
-							rateAmount *= Config.RATE_RAID_DROP_AMOUNT_MULTIPLIER;
-						}
 						else if (item.hasExImmediateEffect())
 						{
 							rateAmount *= Config.RATE_HERB_DROP_AMOUNT_MULTIPLIER;
 						}
+						else if (cbDropHolder.isRaid)
+						{
+							rateAmount *= Config.RATE_RAID_DROP_AMOUNT_MULTIPLIER;
+						}
 						else
 						{
 							rateAmount *= Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
index a5bc77bf72..a1aede2b5b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
@@ -210,14 +210,14 @@ public class DropSearchBoard implements IParseBoardHandler
 						{
 							rateAmount *= Config.RATE_DROP_AMOUNT_BY_ID.get(cbDropHolder.itemId);
 						}
-						else if (cbDropHolder.isRaid)
-						{
-							rateAmount *= Config.RATE_RAID_DROP_AMOUNT_MULTIPLIER;
-						}
 						else if (item.hasExImmediateEffect())
 						{
 							rateAmount *= Config.RATE_HERB_DROP_AMOUNT_MULTIPLIER;
 						}
+						else if (cbDropHolder.isRaid)
+						{
+							rateAmount *= Config.RATE_RAID_DROP_AMOUNT_MULTIPLIER;
+						}
 						else
 						{
 							rateAmount *= Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
index 94e20c8837..1e8aca6386 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
@@ -211,14 +211,14 @@ public class DropSearchBoard implements IParseBoardHandler
 						{
 							rateAmount *= Config.RATE_DROP_AMOUNT_BY_ID.get(cbDropHolder.itemId);
 						}
-						else if (cbDropHolder.isRaid)
-						{
-							rateAmount *= Config.RATE_RAID_DROP_AMOUNT_MULTIPLIER;
-						}
 						else if (item.hasExImmediateEffect())
 						{
 							rateAmount *= Config.RATE_HERB_DROP_AMOUNT_MULTIPLIER;
 						}
+						else if (cbDropHolder.isRaid)
+						{
+							rateAmount *= Config.RATE_RAID_DROP_AMOUNT_MULTIPLIER;
+						}
 						else
 						{
 							rateAmount *= Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER;