From 0fc1ea01d19a8ffe5c1fadc33025c9c86a4ed356 Mon Sep 17 00:00:00 2001 From: David Quintana Date: Tue, 28 Apr 2020 19:22:48 +0200 Subject: [PATCH] Remove redundant call to modifyLoot. Closes #6657 --- .../minecraft/entity/LivingEntity.java.patch | 2 +- .../fml/loading/BackgroundWaiter.java | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/patches/minecraft/net/minecraft/entity/LivingEntity.java.patch b/patches/minecraft/net/minecraft/entity/LivingEntity.java.patch index 346d933ad2..9323e64c29 100644 --- a/patches/minecraft/net/minecraft/entity/LivingEntity.java.patch +++ b/patches/minecraft/net/minecraft/entity/LivingEntity.java.patch @@ -211,7 +211,7 @@ LootContext.Builder lootcontext$builder = this.func_213363_a(p_213354_2_, p_213354_1_); - loottable.func_216120_b(lootcontext$builder.func_216022_a(LootParameterSets.field_216263_d), this::func_199701_a_); + LootContext ctx = lootcontext$builder.func_216022_a(LootParameterSets.field_216263_d); -+ net.minecraftforge.common.ForgeHooks.modifyLoot(loottable.func_216113_a(ctx), ctx).forEach(this::func_199701_a_); ++ loottable.func_216113_a(ctx).forEach(this::func_199701_a_); } protected LootContext.Builder func_213363_a(boolean p_213363_1_, DamageSource p_213363_2_) { diff --git a/src/fmllauncher/java/net/minecraftforge/fml/loading/BackgroundWaiter.java b/src/fmllauncher/java/net/minecraftforge/fml/loading/BackgroundWaiter.java index 1ba4aa5d35..8163699c69 100644 --- a/src/fmllauncher/java/net/minecraftforge/fml/loading/BackgroundWaiter.java +++ b/src/fmllauncher/java/net/minecraftforge/fml/loading/BackgroundWaiter.java @@ -1,3 +1,22 @@ +/* + * Minecraft Forge + * Copyright (c) 2016-2019. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + package net.minecraftforge.fml.loading; import java.util.concurrent.ExecutorService;