diff options
| author | Shane Freeder <[email protected]> | 2024-07-08 22:30:01 +0100 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2024-07-08 22:30:01 +0100 |
| commit | a74d9bf629ab2d502831fb36a251cdac0ab30522 (patch) | |
| tree | 44af854a258c4f9119f2caa6db257e4e3a1e6e52 /patches/server/0600-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch | |
| parent | 6723f5498616da919762c68978e13c518943ef40 (diff) | |
| parent | 70b0e844767131681400b3dbace06c2dea13f87c (diff) | |
| download | Paper-a74d9bf629ab2d502831fb36a251cdac0ab30522.tar.gz Paper-a74d9bf629ab2d502831fb36a251cdac0ab30522.zip | |
Merge remote-tracking branch 'origin/master' into chore/terminalchore/terminal
Diffstat (limited to 'patches/server/0600-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch')
| -rw-r--r-- | patches/server/0600-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0600-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0600-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch index dd5139ae7a..e615b2ea62 100644 --- a/patches/server/0600-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch +++ b/patches/server/0600-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch @@ -28,7 +28,7 @@ index efc27bb4072172f10839c181de9b5fba1f488b6f..4c739717fcf53b28312e8a98f9bf0989 } // Spigot End diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index ce894b31e391786fe98742b9bf22d653df018570..ecd43bbca7ea0e74f506f49fd14f2dd5d467efa1 100644 +index fdf73f71ca34099081f9f80994bbe411052c0149..d868d0776a8ca26deefe2e6b77838c2b502fff57 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1718,6 +1718,18 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { @@ -51,10 +51,10 @@ index ce894b31e391786fe98742b9bf22d653df018570..ecd43bbca7ea0e74f506f49fd14f2dd5 @Override public void doCloseContainer() { diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 6a0c177859da18d8b1ccaa45eab477d2f5822888..028dc5eda7bb93bb4714f6b223379803307add93 100644 +index e772b6a501b225f13399365ad743cabe5f6f792e..fab56040ecf496e74f583ec5d6c6c9861cfa4e13 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -509,6 +509,11 @@ public abstract class Player extends LivingEntity { +@@ -510,6 +510,11 @@ public abstract class Player extends LivingEntity { this.containerMenu = this.inventoryMenu; } // Paper end - Inventory close reason |