Merge remote-tracking branch 'origin/magicbox1.5' into char-init-cleanup

src/engine/loot/LootManager.java

@@ -60,6 +60,7 @@ public class LootManager {
             RunBootySet(NPCManager._bootySetMap.get(mob.bootySet), mob, multiplier, inHotzone, fromDeath);
         }
         //lastly, check mobs inventory for godly or disc runes to send a server announcement
+        if(!fromDeath) {
             for (Item it : mob.getInventory()) {
                 ItemBase ib = it.getItemBase();
                 if (ib.isDiscRune() || ib.getName().toLowerCase().contains("of the gods")) {
@@ -70,6 +71,7 @@ public class LootManager {
                 }
             }
         }
+    }
     private static void RunBootySet(ArrayList<BootySetEntry> entries, Mob mob, float multiplier, boolean inHotzone, boolean fromDeath) {
         if(fromDeath){
             //do equipment here
@@ -79,7 +81,7 @@ public class LootManager {
                         continue;
                     float equipmentRoll = ThreadLocalRandom.current().nextFloat();
                     float dropChance = me.getDropChance();
-                    if (equipmentRoll < dropChance){
+                    if (equipmentRoll < dropChance * multiplier){
                         MobLoot ml = new MobLoot(mob, me.getItemBase(), false);
                         mob.getCharItemManager().addItemToInventory(ml);
                     }