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

Add better destroy support

Browse source
This commit is contained in:
Camotoy 2021-01-13 13:37:20 -05:00
parent d3cb069594
commit 454fd102d6
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
connector/src/main/java/org/geysermc/connector/network/translators/inventory/InventoryTranslator.java
View file

@ -465,7 +465,6 @@ public abstract class InventoryTranslator {
} }
case DESTROY: { case DESTROY: {
// Only called when a creative client wants to destroy an item... I think - Camotoy // Only called when a creative client wants to destroy an item... I think - Camotoy
//TODO there is a Count here we don't use
DestroyStackRequestActionData destroyAction = (DestroyStackRequestActionData) action; DestroyStackRequestActionData destroyAction = (DestroyStackRequestActionData) action;
if (!session.getGameMode().equals(GameMode.CREATIVE)) { if (!session.getGameMode().equals(GameMode.CREATIVE)) {
// If this happens, let's throw an error and figure out why. // If this happens, let's throw an error and figure out why.
@ -474,13 +473,23 @@ public abstract class InventoryTranslator {
if (!isCursor(destroyAction.getSource())) { if (!isCursor(destroyAction.getSource())) {
// Item exists; let's remove it from the inventory // Item exists; let's remove it from the inventory
int javaSlot = bedrockSlotToJava(destroyAction.getSource()); int javaSlot = bedrockSlotToJava(destroyAction.getSource());
ClientCreativeInventoryActionPacket destroyItemPacket = new ClientCreativeInventoryActionPacket( GeyserItemStack existingItem = inventory.getItem(javaSlot);
javaSlot, existingItem.setAmount(existingItem.getAmount() - destroyAction.getCount());
new ItemStack(0) ClientCreativeInventoryActionPacket destroyItemPacket;
); if (existingItem.isEmpty()) {
destroyItemPacket = new ClientCreativeInventoryActionPacket(
javaSlot,
new ItemStack(0)
);
inventory.setItem(javaSlot, GeyserItemStack.EMPTY, session);
} else {
destroyItemPacket = new ClientCreativeInventoryActionPacket(
javaSlot,
existingItem.getItemStack()
);
}
session.sendDownstreamPacket(destroyItemPacket); session.sendDownstreamPacket(destroyItemPacket);
System.out.println(destroyItemPacket); System.out.println(destroyItemPacket);
inventory.setItem(javaSlot, GeyserItemStack.EMPTY, session);
affectedSlots.add(javaSlot); affectedSlots.add(javaSlot);
} else { } else {
// Just sync up the item on our end, since the server doesn't care what's in our cursor // Just sync up the item on our end, since the server doesn't care what's in our cursor