Update Server.Events.cs

ObsidianMC · Apr 29, 2023 · 29980a4 · 29980a4
1 parent 0a3e470
commit 29980a4
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/Obsidian/Server.Events.cs b/Obsidian/Server.Events.cs
@@ -22,7 +22,19 @@ private async Task PlayerAttack(PlayerAttackEntityEventArgs e)
 
     private async Task OnContainerClosed(ContainerClosedEventArgs e)
     {
-        if (e.Cancel || e.Container is not IBlockEntity blockEntity)
+        var player = (e.Player as Player)!;
+
+        if (e.Cancel)
+        {
+            //Resend open container again.
+            await player.OpenInventoryAsync(e.Container);
+            return;
+        }
+
+        //Player successfully exited container
+        player.OpenedContainer = null;
+
+        if (e.Container is not IBlockEntity blockEntity)
             return;
 
         var position = blockEntity.BlockPosition;
@@ -31,8 +43,6 @@ private async Task OnContainerClosed(ContainerClosedEventArgs e)
         if (block is null)
             return;
 
-        var player = (e.Player as Player)!;
-
         switch (block.Material)
         {
             case Material.Chest:
@@ -66,7 +76,7 @@ await player.SendSoundAsync(SoundEffectBuilder.Create(SoundId.BlockEnderChestClo
                     .Build());
                 break;
             }
-            case Material.Barrel:
+            case Material.Barrel://Barrels don't have a block action
             {
                 await player.SendSoundAsync(SoundEffectBuilder.Create(SoundId.BlockBarrelClose)
                     .WithSoundPosition(position.SoundPosition)
@@ -91,8 +101,6 @@ await player.SendSoundAsync(SoundEffectBuilder.Create(SoundId.BlockShulkerBoxClo
                 break;
             }
         }
-
-        player.OpenedContainer = null;
     }
 
     private async Task OnPlayerInteract(PlayerInteractEventArgs e)