From b0e35f358e5f2537e9863be85dedfa35445bd741 Mon Sep 17 00:00:00 2001 From: Richard Freimer Date: Mon, 29 Jun 2020 16:09:04 -0400 Subject: [PATCH] Fix access levels being hardcoded to private via patch overriding AT entry (#6848) --- .../minecraft/data/loot/EntityLootTables.java.patch | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/patches/minecraft/net/minecraft/data/loot/EntityLootTables.java.patch b/patches/minecraft/net/minecraft/data/loot/EntityLootTables.java.patch index f8e7d5db2b..c91e2dbcac 100644 --- a/patches/minecraft/net/minecraft/data/loot/EntityLootTables.java.patch +++ b/patches/minecraft/net/minecraft/data/loot/EntityLootTables.java.patch @@ -32,11 +32,10 @@ if (resourcelocation != LootTables.field_186419_a && this.field_218587_b.remove(resourcelocation) != null) { break; } -@@ -171,11 +175,19 @@ +@@ -171,6 +175,14 @@ throw new IllegalStateException(String.format("Weird loottable '%s' for '%s', not a LivingEntity so should not have loot", resourcelocation, Registry.field_212629_r.func_177774_c(entitytype))); } -- protected void func_218582_a(EntityType p_218582_1_, LootTable.Builder p_218582_2_) { + protected Iterable> getKnownEntities() { + return Registry.field_212629_r; + } @@ -45,12 +44,6 @@ + return !field_222944_b.contains(entitytype) && entitytype.func_220339_d() == EntityClassification.MISC; + } + -+ private void func_218582_a(EntityType p_218582_1_, LootTable.Builder p_218582_2_) { + protected void func_218582_a(EntityType p_218582_1_, LootTable.Builder p_218582_2_) { this.func_218585_a(p_218582_1_.func_220348_g(), p_218582_2_); } - -- protected void func_218585_a(ResourceLocation p_218585_1_, LootTable.Builder p_218585_2_) { -+ private void func_218585_a(ResourceLocation p_218585_1_, LootTable.Builder p_218585_2_) { - this.field_218587_b.put(p_218585_1_, p_218585_2_); - } - }