Fix MC-26304

patches/server/0066-Fix-MC-26304.patch

@@ -0,0 +1,76 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martijn Muijsers <martijnmuijsers@live.nl>
+Date: Fri, 23 Dec 2022 16:42:04 +0100
+Subject: [PATCH] Fix MC-26304
+
+License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+Gale - https://galemc.org
+
+This patch is based on the following patch:
+"Fix brewing stands resetting their brewTime when being unloaded"
+By: etil2jz <81570777+etil2jz@users.noreply.github.com>
+As part of: Mirai (https://github.com/etil2jz/Mirai)
+Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
+index 55006724ccec9f3de828ec18693728e9741ff65f..7dfc0081591b1c8e5a7c704ebc5e9d83951cb300 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
+@@ -6,6 +6,7 @@ import javax.annotation.Nullable;
+ import net.minecraft.core.BlockPos;
+ import net.minecraft.core.Direction;
+ import net.minecraft.core.NonNullList;
++import net.minecraft.core.registries.BuiltInRegistries;
+ import net.minecraft.nbt.CompoundTag;
+ import net.minecraft.network.chat.Component;
+ import net.minecraft.world.ContainerHelper;
+@@ -47,6 +48,7 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
+     public static final int DATA_BREW_TIME = 0;
+     public static final int DATA_FUEL_USES = 1;
+     public static final int NUM_DATA_VALUES = 2;
++    private static final String[] INGREDIENT_NBT_KEYS = {"Gale.Ingredient", "Mirai.ingredient"}; // Gale - Mirai - fix MC-26304
+     private NonNullList<ItemStack> items;
+     public int brewTime;
+     private boolean[] lastPotionCount;
+@@ -295,6 +297,22 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
+         ContainerHelper.loadAllItems(nbt, this.items);
+         this.brewTime = nbt.getShort("BrewTime");
+         this.fuel = nbt.getByte("Fuel");
++        // Gale start - Mirai - fix MC-26304
++        if (this.ingredient == null || this.ingredient == Items.AIR) {
++            for (String nbtKey : INGREDIENT_NBT_KEYS) {
++                try {
++                    if (nbt.contains(nbtKey)) {
++                        this.ingredient = BuiltInRegistries.ITEM.get(new net.minecraft.resources.ResourceLocation(nbt.getString(nbtKey)));
++                        if (this.ingredient != null && this.ingredient != Items.AIR) {
++                            break;
++                        }
++                    }
++                } catch (Throwable ignored) {
++                    // Cannot be helped
++                }
++            }
++        }
++        // Gale end - Mirai - fix MC-26304
+     }
+ 
+     @Override
+@@ -303,6 +321,18 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
+         nbt.putShort("BrewTime", (short) this.brewTime);
+         ContainerHelper.saveAllItems(nbt, this.items);
+         nbt.putByte("Fuel", (byte) this.fuel);
++        // Gale start - Mirai - fix MC-26304
++        if (this.ingredient != null && this.ingredient != Items.AIR) {
++            try {
++                String value = BuiltInRegistries.ITEM.getKey(this.ingredient).toString();
++                for (String nbtKey : INGREDIENT_NBT_KEYS) {
++                    nbt.putString(nbtKey, value);
++                }
++            } catch (Throwable ignored) {
++                // Cannot be helped
++            }
++        }
++        // Gale end - Mirai - fix MC-26304
+     }
+ 
+     @Override