From a625b7caf29ab1eb888db599f4436592d7867104 Mon Sep 17 00:00:00 2001
From: maxomatic458 <104733404+maxomatic458@users.noreply.github.com>
Date: Fri, 25 Oct 2024 02:20:06 +0200
Subject: [PATCH] resync readonly inventory after block interaction

---
 crates/valence_inventory/src/lib.rs | 33 ++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/crates/valence_inventory/src/lib.rs b/crates/valence_inventory/src/lib.rs
index b05d13c33..d74f56c46 100644
--- a/crates/valence_inventory/src/lib.rs
+++ b/crates/valence_inventory/src/lib.rs
@@ -12,6 +12,7 @@ use player_inventory::PlayerInventory;
 use tracing::{debug, warn};
 use valence_server::client::{Client, FlushPacketsSet, SpawnClientsSet};
 use valence_server::event_loop::{EventLoopPreUpdate, PacketEvent};
+use valence_server::interact_block::InteractBlockEvent;
 pub use valence_server::protocol::packets::play::click_slot_c2s::{ClickMode, SlotChange};
 use valence_server::protocol::packets::play::open_screen_s2c::WindowType;
 pub use valence_server::protocol::packets::play::player_action_c2s::PlayerAction;
@@ -22,7 +23,7 @@ use valence_server::protocol::packets::play::{
 };
 use valence_server::protocol::{VarInt, WritePacket};
 use valence_server::text::IntoText;
-use valence_server::{GameMode, ItemKind, ItemStack, Text};
+use valence_server::{GameMode, Hand, ItemKind, ItemStack, Text};
 
 pub mod player_inventory;
 mod validate;
@@ -54,6 +55,7 @@ impl Plugin for InventoryPlugin {
                 handle_creative_inventory_action,
                 handle_close_handled_screen,
                 handle_player_actions,
+                resync_readonly_inventory_after_block_interaction,
             ),
         )
         .init_resource::<InventorySettings>()
@@ -1336,6 +1338,35 @@ fn handle_player_actions(
     }
 }
 
+/// If the player tries to place a block while their inventory is readonly
+/// it will be desynced, therefore we set the slot as changed.
+fn resync_readonly_inventory_after_block_interaction(
+    mut clients: Query<(&mut Inventory, &HeldItem)>,
+    mut events: EventReader<InteractBlockEvent>,
+) {
+    for event in events.read() {
+        let Ok((mut inventory, held_item)) = clients.get_mut(event.client) else {
+            continue;
+        };
+
+        if !inventory.readonly {
+            continue;
+        }
+
+        let slot = if event.hand == Hand::Main {
+            held_item.slot()
+        } else {
+            PlayerInventory::SLOT_OFFHAND
+        };
+
+        if inventory.slot(slot).is_empty() {
+            continue;
+        }
+
+        inventory.changed |= 1 << slot;
+    }
+}
+
 // TODO: make this event user friendly.
 #[derive(Event, Clone, Debug)]
 pub struct CreativeInventoryActionEvent {