SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.14-pre5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
paper-server/nms-patches/LootItemConditionRandomChanceWithLooting.patch
View File

@@ -1,14 +1,14 @@
--- 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());
@@ -28,6 +28,11 @@
if (entity instanceof EntityLiving) {
i = EnchantmentManager.g((EntityLiving) entity);
}
+ // CraftBukkit start - only use lootingModifier if set by Bukkit
+ if (loottableinfo.lootingMod > org.bukkit.loot.LootContext.DEFAULT_LOOT_MODIFIER) {
+ i = loottableinfo.lootingMod;
+ if (loottableinfo.hasContextParameter(LootContextParameters.LOOTING_MOD)) {
+ i = loottableinfo.getContextParameter(LootContextParameters.LOOTING_MOD);
+ }
+ // CraftBukkit end
return random.nextFloat() < this.a + (float) i * this.b;
return loottableinfo.b().nextFloat() < this.a + (float) i * this.b;
}