OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-04-17 19:12:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixes related to hacky plugins that spam open screen packets

Browse source
This commit is contained in:
onebeastchris 2025-03-31 18:57:27 +02:00
parent a925cd0b36
commit 4b789b8d3e
4 changed files with 25 additions and 35 deletions
core/src/main/java/org/geysermc/geyser
session
GeyserSession.java
translator/protocol/bedrock
BedrockContainerCloseTranslator.javaBedrockNetworkStackLatencyTranslator.java
util
InventoryUtils.java

3
core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
View file

@ -299,9 +299,10 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
/**
* Stores the bedrock inventory id of the pending inventory, or -1 if no inventory is pending.
* This id is only set when the block that should be opened exists.
*/
@Setter
private int pendingInventoryId = -1;
private int pendingOrCurrentBedrockInventoryId = -1;
/**
* Use {@link #getNextItemNetId()} instead for consistency

28
core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockContainerCloseTranslator.java
View file

@ -31,6 +31,7 @@ import org.geysermc.geyser.GeyserImpl;
import org.geysermc.geyser.inventory.Inventory;
import org.geysermc.geyser.inventory.MerchantContainer;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.translator.inventory.MerchantInventoryTranslator;
import org.geysermc.geyser.translator.protocol.PacketTranslator;
import org.geysermc.geyser.translator.protocol.Translator;
import org.geysermc.geyser.translator.protocol.java.inventory.JavaMerchantOffersTranslator;
@ -56,28 +57,26 @@ public class BedrockContainerCloseTranslator extends PacketTranslator<ContainerC
Inventory openInventory = session.getOpenInventory();
if (bedrockId == -1 && openInventory != null) {
// 1.16.200 - window ID is always -1 sent from Bedrock for merchant containers
bedrockId = (byte) openInventory.getBedrockId();
if (openInventory.getTranslator() instanceof MerchantInventoryTranslator) {
bedrockId = (byte) openInventory.getBedrockId();
}
// If virtual inventories are opened too quickly, they can be occasionally rejected
// We just try and queue a new one.
if (openInventory.getTranslator().requiresOpeningDelay(session, openInventory)) {
if (openInventory.getBedrockId() == session.getPendingOrCurrentBedrockInventoryId()) {
// Before making another attempt to re-open, let's make sure we actually need this inventory open.
if (session.getContainerOpenAttempts() < 3) {
openInventory.setPending(true);
openInventory.setDelayed(true);
session.setPendingInventoryId(openInventory.getBedrockId());
session.setPendingOrCurrentBedrockInventoryId(openInventory.getBedrockId());
byte finalBedrockId = bedrockId;
session.scheduleInEventLoop(() -> {
if (InventoryUtils.shouldQueueRejectedInventory(session)) {
NetworkStackLatencyPacket latencyPacket = new NetworkStackLatencyPacket();
latencyPacket.setFromServer(true);
latencyPacket.setTimestamp(MAGIC_VIRTUAL_INVENTORY_HACK);
session.sendUpstreamPacket(latencyPacket);
GeyserImpl.getInstance().getLogger().debug(session, "Unable to open a virtual inventory, sending another latency packet!");
} else {
closeCurrentOrOpenPending(session, finalBedrockId, session.getOpenInventory());
}
}, 200, TimeUnit.MILLISECONDS);
NetworkStackLatencyPacket latencyPacket = new NetworkStackLatencyPacket();
latencyPacket.setFromServer(true);
latencyPacket.setTimestamp(MAGIC_VIRTUAL_INVENTORY_HACK);
session.sendUpstreamPacket(latencyPacket);
GeyserImpl.getInstance().getLogger().debug(session, "Unable to open a virtual inventory, sent another latency packet!");
}, 100, TimeUnit.MILLISECONDS);
return;
} else {
GeyserImpl.getInstance().getLogger().debug(session, "Exceeded 3 attempts to open a virtual inventory!");
@ -86,6 +85,7 @@ public class BedrockContainerCloseTranslator extends PacketTranslator<ContainerC
}
}
session.setPendingOrCurrentBedrockInventoryId(-1);
session.setContainerOpenAttempts(0);
closeCurrentOrOpenPending(session, bedrockId, openInventory);
}

2
core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockNetworkStackLatencyTranslator.java
View file

@ -65,7 +65,7 @@ public class BedrockNetworkStackLatencyTranslator extends PacketTranslator<Netwo
return;
}
if (session.getPendingInventoryId() != -1) {
if (session.getPendingOrCurrentBedrockInventoryId() != -1) {
InventoryUtils.openPendingInventory(session);
} else {
session.scheduleInEventLoop(() -> {

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

@ -100,12 +100,12 @@ public class InventoryUtils {
*/
public static void openInventory(GeyserSession session, Inventory inventory) {
session.setOpenInventory(inventory);
if (session.isClosingInventory() || !session.getUpstream().isInitialized() || session.getPendingInventoryId() != -1) {
if (session.isClosingInventory() || !session.getUpstream().isInitialized() || session.getPendingOrCurrentBedrockInventoryId() != -1) {
// Wait for close confirmation from client before opening the new inventory.
// Handled in BedrockContainerCloseTranslator
// or - client hasn't yet loaded in; wait until inventory is shown
GeyserImpl.getInstance().getLogger().debug(session, "Inventory (%s) set pending: closing inv? %s, pending inv id? %s", debugInventory(inventory), session.isClosingInventory(), session.getPendingInventoryId());
inventory.setPending(true);
GeyserImpl.getInstance().getLogger().debug(session, "Inventory (%s) set pending: closing inv? %s, pending inv id? %s", debugInventory(inventory), session.isClosingInventory(), session.getPendingOrCurrentBedrockInventoryId());
return;
}
displayInventory(session, inventory);
@ -119,32 +119,21 @@ public class InventoryUtils {
public static void openPendingInventory(GeyserSession session) {
Inventory currentInventory = session.getOpenInventory();
if (currentInventory == null || !currentInventory.isPending()) {
session.setPendingOrCurrentBedrockInventoryId(-1);
GeyserImpl.getInstance().getLogger().debug(session, "No pending inventory, not opening an inventory! Current inventory: %s", debugInventory(currentInventory));
session.setPendingInventoryId(-1);
return;
}
// Current inventory isn't null! Let's see if we need to open it.
if (currentInventory.isDelayed() && currentInventory.getBedrockId() == session.getPendingInventoryId()) {
if (currentInventory.isDelayed() && currentInventory.getBedrockId() == session.getPendingOrCurrentBedrockInventoryId()) {
GeyserImpl.getInstance().getLogger().debug(session, "Attempting to open currently delayed inventory with matching bedrock id! " + currentInventory.getBedrockId());
openAndUpdateInventory(session, currentInventory);
return;
}
GeyserImpl.getInstance().getLogger().debug(session, "Opening any pending inventory! " + debugInventory(currentInventory));
session.setPendingInventoryId(-1);
openInventory(session, currentInventory);
}
public static boolean shouldQueueRejectedInventory(GeyserSession session) {
Inventory currentInventory = session.getOpenInventory();
if (currentInventory == null || !currentInventory.isDelayed() || currentInventory.getBedrockId() != session.getPendingInventoryId()) {
GeyserImpl.getInstance().getLogger().debug(session, "Aborting NetworkStackLatency hack as the inventory has changed!");
return false;
}
return true;
session.setPendingOrCurrentBedrockInventoryId(-1);
displayInventory(session, currentInventory);
}
/**
@ -157,7 +146,7 @@ public class InventoryUtils {
if (translator.requiresOpeningDelay(session, inventory)) {
inventory.setPending(true);
inventory.setDelayed(true);
session.setPendingInventoryId(inventory.getBedrockId());
session.setPendingOrCurrentBedrockInventoryId(inventory.getBedrockId());
NetworkStackLatencyPacket latencyPacket = new NetworkStackLatencyPacket();
latencyPacket.setFromServer(true);
@ -184,7 +173,6 @@ public class InventoryUtils {
inventory.setDisplayed(true);
inventory.setPending(false);
inventory.setDelayed(false);
session.setPendingInventoryId(-1);
}
/**
@ -221,6 +209,7 @@ public class InventoryUtils {
GeyserImpl.getInstance().getLogger().debug(session, "Closed inventory: (java id: %s/bedrock id: %s), waiting on confirm? %s", inventory.getJavaId(), inventory.getBedrockId(), session.isClosingInventory());
}
session.setPendingOrCurrentBedrockInventoryId(-1);
session.setOpenInventory(null);
}