be13705177
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 6b8cd9a7 SPIGOT-6207: forcibly drop the items of a converted zombie villager
64 lines
2.7 KiB
Diff
64 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: lukas <lukasalt98@gmail.com>
|
|
Date: Sun, 27 Dec 2020 16:47:00 +0100
|
|
Subject: [PATCH] Cache burn durations
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntityFurnace.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntityFurnace.java
|
|
index e630e8d3e115d2a0177849ad8258a2304b9d3e9d..54316a8079b4331a48cac3c43f3f8c506a4af091 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/entity/TileEntityFurnace.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntityFurnace.java
|
|
@@ -1,5 +1,6 @@
|
|
package net.minecraft.world.level.block.entity;
|
|
|
|
+import com.google.common.collect.ImmutableMap;
|
|
import com.google.common.collect.Lists;
|
|
import com.google.common.collect.Maps;
|
|
import it.unimi.dsi.fastutil.objects.Object2IntMap.Entry;
|
|
@@ -113,7 +114,15 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
|
|
this.c = recipes;
|
|
}
|
|
|
|
+ private static Map<Item, Integer> cachedBurnDurations = null; // Paper - cache burn durations
|
|
+
|
|
+ public static Map<Item, Integer> getBurnDurations() { return f(); } // Paper - OBFHELPER
|
|
public static Map<Item, Integer> f() {
|
|
+ // Paper start - cache burn durations
|
|
+ if(cachedBurnDurations != null) {
|
|
+ return cachedBurnDurations;
|
|
+ }
|
|
+ // Paper end
|
|
Map<Item, Integer> map = Maps.newLinkedHashMap();
|
|
|
|
a(map, (IMaterial) Items.LAVA_BUCKET, 20000);
|
|
@@ -176,7 +185,10 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
|
|
a(map, (IMaterial) Blocks.FLETCHING_TABLE, 300);
|
|
a(map, (IMaterial) Blocks.SMITHING_TABLE, 300);
|
|
a(map, (IMaterial) Blocks.COMPOSTER, 300);
|
|
- return map;
|
|
+ // Paper start - cache burn durations
|
|
+ cachedBurnDurations = ImmutableMap.copyOf(map);
|
|
+ return cachedBurnDurations;
|
|
+ // Paper end
|
|
}
|
|
|
|
// CraftBukkit start - add fields and methods
|
|
@@ -430,7 +442,7 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
|
|
} else {
|
|
Item item = itemstack.getItem();
|
|
|
|
- return (Integer) f().getOrDefault(item, 0);
|
|
+ return getBurnDurations().getOrDefault(item, 0); // Paper - cache burn durations
|
|
}
|
|
}
|
|
|
|
@@ -443,7 +455,7 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
|
|
// Paper end
|
|
|
|
public static boolean isFuel(ItemStack itemstack) {
|
|
- return f().containsKey(itemstack.getItem());
|
|
+ return getBurnDurations().containsKey(itemstack.getItem()); // Paper - cache burn durations
|
|
}
|
|
|
|
@Override
|