mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-24 08:06:41 +01:00
27 lines
2.1 KiB
Diff
27 lines
2.1 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
|
Date: Sat, 25 May 2024 09:51:13 -0700
|
||
|
|
Subject: [PATCH] Deprecate InvAction#HOTBAR_MOVE_AND_READD
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
index c450447585af4c8cdc87abe871c229ff895c3e53..4ae88bfcead40cd05f9514a48a922a37767cb3cf 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
@@ -3054,14 +3054,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||
|
|
Slot clickedSlot = this.player.containerMenu.getSlot(packet.getSlotNum());
|
||
|
|
if (clickedSlot.mayPickup(this.player)) {
|
||
|
|
ItemStack hotbar = this.player.getInventory().getItem(packet.getButtonNum());
|
||
|
|
- boolean canCleanSwap = hotbar.isEmpty() || (clickedSlot.container == this.player.getInventory() && clickedSlot.mayPlace(hotbar)); // the slot will accept the hotbar item
|
||
|
|
- if (clickedSlot.hasItem()) {
|
||
|
|
- if (canCleanSwap) {
|
||
|
|
- action = InventoryAction.HOTBAR_SWAP;
|
||
|
|
- } else {
|
||
|
|
- action = InventoryAction.HOTBAR_MOVE_AND_READD;
|
||
|
|
- }
|
||
|
|
- } else if (!clickedSlot.hasItem() && !hotbar.isEmpty() && clickedSlot.mayPlace(hotbar)) {
|
||
|
|
+ if ((!hotbar.isEmpty() && clickedSlot.mayPlace(hotbar)) || (hotbar.isEmpty() && clickedSlot.hasItem())) { // Paper - modernify this logic (no such thing as a "hotbar move and readd"
|
||
|
|
action = InventoryAction.HOTBAR_SWAP;
|
||
|
|
} else {
|
||
|
|
action = InventoryAction.NOTHING;
|