Mirror von
https://github.com/GeyserMC/Geyser.git
synchronisiert 2024-12-25 15:50:14 +01:00
Fix closing inventory confirmation behavior (#3587)
Dieser Commit ist enthalten in:
Ursprung
95d10fb7fc
Commit
10c2e51da4
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren