GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into feature/blocky

Browse source
This commit is contained in:
Joshua Castle 2023-03-05 18:31:05 -08:00
commit f59d72843f
No known key found for this signature in database
GPG key ID: F674F38216C35D5D
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -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! 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 ## Setting Up
Take a look [here](https://wiki.geysermc.org/geyser/setup/) for how to set up Geyser. Take a look [here](https://wiki.geysermc.org/geyser/setup/) for how to set up Geyser.

4
core/src/main/java/org/geysermc/geyser/inventory/Inventory.java
View file

@ -89,6 +89,10 @@ public abstract class Inventory {
@Setter @Setter
private boolean pending = false; private boolean pending = false;
@Getter
@Setter
private boolean displayed = false;
protected Inventory(int id, int size, ContainerType containerType) { protected Inventory(int id, int size, ContainerType containerType) {
this("Inventory", id, size, containerType); this("Inventory", id, size, containerType);
} }

4
core/src/main/java/org/geysermc/geyser/util/InventoryUtils.java
View file

@ -95,6 +95,7 @@ public class InventoryUtils {
if (openInv != null && openInv.getJavaId() == inventory.getJavaId()) { if (openInv != null && openInv.getJavaId() == inventory.getJavaId()) {
translator.openInventory(session, inventory); translator.openInventory(session, inventory);
translator.updateInventory(session, inventory); translator.updateInventory(session, inventory);
openInv.setDisplayed(true);
} else if (openInv != null && openInv.isPending()) { } else if (openInv != null && openInv.isPending()) {
// Presumably, this inventory is no longer relevant, and the client doesn't care about it // Presumably, this inventory is no longer relevant, and the client doesn't care about it
displayInventory(session, openInv); displayInventory(session, openInv);
@ -103,6 +104,7 @@ public class InventoryUtils {
} else { } else {
translator.openInventory(session, inventory); translator.openInventory(session, inventory);
translator.updateInventory(session, inventory); translator.updateInventory(session, inventory);
inventory.setDisplayed(true);
} }
} else { } else {
session.setOpenInventory(null); session.setOpenInventory(null);
@ -117,7 +119,7 @@ public class InventoryUtils {
if (inventory != null) { if (inventory != null) {
InventoryTranslator translator = session.getInventoryTranslator(); InventoryTranslator translator = session.getInventoryTranslator();
translator.closeInventory(session, inventory); translator.closeInventory(session, inventory);
if (confirm && !inventory.isPending() && !(translator instanceof LecternInventoryTranslator)) { if (confirm && inventory.isDisplayed() && !inventory.isPending() && !(translator instanceof LecternInventoryTranslator)) {
session.setClosingInventory(true); session.setClosingInventory(true);
} }
} }

2
core/src/main/java/org/geysermc/geyser/util/WebUtils.java
View file

@ -91,7 +91,7 @@ public class WebUtils {
InputStream in = con.getInputStream(); InputStream in = con.getInputStream();
Files.copy(in, Paths.get(fileLocation), StandardCopyOption.REPLACE_EXISTING); Files.copy(in, Paths.get(fileLocation), StandardCopyOption.REPLACE_EXISTING);
} catch (Exception e) { } 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);
} }
} }