From fca726caa4e408a84707dce0f027ff82aec6be4d Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Mon, 27 Feb 2023 20:09:07 +0100 Subject: [PATCH 1/3] version bump (#3585) seems like aternos depends on this to show the latest version iirc; should be bumped either way --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6996086b9..2fd09eb8f 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The ultimate goal of this project is to allow Minecraft: Bedrock Edition users t Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here! -### Currently supporting Minecraft Bedrock 1.19.20 - 1.19.62 and Minecraft Java 1.19.3. +### Currently supporting Minecraft Bedrock 1.19.20 - 1.19.63 and Minecraft Java 1.19.3. ## Setting Up Take a look [here](https://wiki.geysermc.org/geyser/setup/) for how to set up Geyser. From 95d10fb7fc499cedc38b05b3b58ba1523109a0ca Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Thu, 2 Mar 2023 18:40:40 -0500 Subject: [PATCH 2/3] Don't throw an AssertionError on failed locale download Fixes #3589 --- core/src/main/java/org/geysermc/geyser/util/WebUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/org/geysermc/geyser/util/WebUtils.java b/core/src/main/java/org/geysermc/geyser/util/WebUtils.java index c0889f1c5..e4a98b3fc 100644 --- a/core/src/main/java/org/geysermc/geyser/util/WebUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/WebUtils.java @@ -91,7 +91,7 @@ public class WebUtils { InputStream in = con.getInputStream(); Files.copy(in, Paths.get(fileLocation), StandardCopyOption.REPLACE_EXISTING); } catch (Exception e) { - throw new AssertionError("Unable to download and save file: " + fileLocation + " (" + reqURL + ")", e); + throw new RuntimeException("Unable to download and save file: " + fileLocation + " (" + reqURL + ")", e); } } From 10c2e51da42ea65bf1402ee24c606b58c31e78cf Mon Sep 17 00:00:00 2001 From: apex_ Date: Fri, 3 Mar 2023 15:09:52 +0100 Subject: [PATCH 3/3] Fix closing inventory confirmation behavior (#3587) --- .../main/java/org/geysermc/geyser/inventory/Inventory.java | 4 ++++ .../main/java/org/geysermc/geyser/util/InventoryUtils.java | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/geysermc/geyser/inventory/Inventory.java b/core/src/main/java/org/geysermc/geyser/inventory/Inventory.java index f01d242ad..624d0df27 100644 --- a/core/src/main/java/org/geysermc/geyser/inventory/Inventory.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/Inventory.java @@ -89,6 +89,10 @@ public abstract class Inventory { @Setter private boolean pending = false; + @Getter + @Setter + private boolean displayed = false; + protected Inventory(int id, int size, ContainerType containerType) { this("Inventory", id, size, containerType); } diff --git a/core/src/main/java/org/geysermc/geyser/util/InventoryUtils.java b/core/src/main/java/org/geysermc/geyser/util/InventoryUtils.java index 1f31d917b..1c07a0b1e 100644 --- a/core/src/main/java/org/geysermc/geyser/util/InventoryUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/InventoryUtils.java @@ -95,6 +95,7 @@ public class InventoryUtils { if (openInv != null && openInv.getJavaId() == inventory.getJavaId()) { translator.openInventory(session, inventory); translator.updateInventory(session, inventory); + openInv.setDisplayed(true); } else if (openInv != null && openInv.isPending()) { // Presumably, this inventory is no longer relevant, and the client doesn't care about it displayInventory(session, openInv); @@ -103,6 +104,7 @@ public class InventoryUtils { } else { translator.openInventory(session, inventory); translator.updateInventory(session, inventory); + inventory.setDisplayed(true); } } else { session.setOpenInventory(null); @@ -117,7 +119,7 @@ public class InventoryUtils { if (inventory != null) { InventoryTranslator translator = session.getInventoryTranslator(); translator.closeInventory(session, inventory); - if (confirm && !inventory.isPending() && !(translator instanceof LecternInventoryTranslator)) { + if (confirm && inventory.isDisplayed() && !inventory.isPending() && !(translator instanceof LecternInventoryTranslator)) { session.setClosingInventory(true); } }