summaryrefslogtreecommitdiffstats
path: root/nms-patches/LootItemConditionRandomChanceWithLooting.patch
blob: 078a868454c37eec356d745d0addbac5f78dc74f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
--- a/net/minecraft/server/LootItemConditionRandomChanceWithLooting.java
+++ b/net/minecraft/server/LootItemConditionRandomChanceWithLooting.java
@@ -21,6 +21,11 @@
         if (loottableinfo.c() instanceof EntityLiving) {
             i = EnchantmentManager.g((EntityLiving) loottableinfo.c());
         }
+        // CraftBukkit start - only use lootingModifier if set by Bukkit
+        if (loottableinfo.lootingMod > org.bukkit.loot.LootContext.DEFAULT_LOOT_MODIFIER) {
+            i = loottableinfo.lootingMod;
+        }
+        // CraftBukkit end
 
         return random.nextFloat() < this.a + (float) i * this.b;
     }
@@ -40,7 +45,7 @@
             return new LootItemConditionRandomChanceWithLooting(ChatDeserializer.l(jsonobject, "chance"), ChatDeserializer.l(jsonobject, "looting_multiplier"));
         }
 
-        public LootItemCondition b(JsonObject jsonobject, JsonDeserializationContext jsondeserializationcontext) {
+        public LootItemConditionRandomChanceWithLooting b(JsonObject jsonobject, JsonDeserializationContext jsondeserializationcontext) { // CraftBukkit - decompile error
             return this.a(jsonobject, jsondeserializationcontext);
         }
     }