Upstream
/
Paper
mirror of https://github.com/PaperMC/Paper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

properly get drag type

This commit is contained in:
Tamion 2024-05-12 16:26:34 +02:00
parent 7f900a98bd
commit 0e2386d284
No known key found for this signature in database
GPG Key ID: 01E616386DBAE296
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/1049-Fix-CraftBukkit-drag-system.patch
View File

@ -3,9 +3,11 @@ From: Tamion <70228790+notTamion@users.noreply.github.com>
Date: Sun, 12 May 2024 12:08:07 +0200
Subject: [PATCH] Fix CraftBukkit drag system
== AT ==
public net.minecraft.world.inventory.AbstractContainerMenu quickcraftType
diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
index 32910f677b0522ac8ec513fa0d00b714b52cfae4..8d2de2e2822c5179901454d5a58d74a391dcb4b6 100644
index 34357f2040069a4d42d15e8726a980baf08bdfd4..5505f4e13abfdba48f9ae37b6bcb3cf43fca9c74 100644
--- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
@@ -379,7 +379,7 @@ public abstract class AbstractContainerMenu {
@ -76,7 +78,7 @@ index 32910f677b0522ac8ec513fa0d00b714b52cfae4..8d2de2e2822c5179901454d5a58d74a3
private SlotAccess createCarriedSlotAccess() {
diff --git a/src/main/java/net/minecraft/world/inventory/Slot.java b/src/main/java/net/minecraft/world/inventory/Slot.java
index c39c773112fb8b534b926f2f2b47fe6fbb69fcb2..6c8a4d8ba0d27e6e5e58ec1f39b03ac6cd1f17ae 100644
index c39c773112fb8b534b926f2f2b47fe6fbb69fcb2..e62373600edd148d30d978f82f1feebed71214cb 100644
--- a/src/main/java/net/minecraft/world/inventory/Slot.java
+++ b/src/main/java/net/minecraft/world/inventory/Slot.java
@@ -7,6 +7,7 @@ import net.minecraft.resources.ResourceLocation;
@ -114,7 +116,7 @@ index c39c773112fb8b534b926f2f2b47fe6fbb69fcb2..6c8a4d8ba0d27e6e5e58ec1f39b03ac6
+ container.getBukkitView(),
+ CraftItemStack.asCraftMirror(newCursor),
+ CraftItemStack.asBukkitCopy(stack),
+ count == 1,
+ container.quickcraftType != 0,
+ java.util.Map.of(this.index, CraftItemStack.asBukkitCopy(stack.copyWithCount(this.getItem().getCount() + i)))
+ );
+
@ -138,7 +140,7 @@ index c39c773112fb8b534b926f2f2b47fe6fbb69fcb2..6c8a4d8ba0d27e6e5e58ec1f39b03ac6
public boolean allowModification(Player player) {
diff --git a/src/main/java/net/minecraft/world/item/BundleItem.java b/src/main/java/net/minecraft/world/item/BundleItem.java
index 233c50af05085c1ecb069dd2e90d17c85f27e5ab..a19e58a627107b80a7f97bcfa6a74da7ff908820 100644
index 233c50af05085c1ecb069dd2e90d17c85f27e5ab..2bd2ba588a225d9c5c19c55a3d75e97dc5f080f0 100644
--- a/src/main/java/net/minecraft/world/item/BundleItem.java
+++ b/src/main/java/net/minecraft/world/item/BundleItem.java
@@ -22,6 +22,7 @@ import net.minecraft.world.inventory.tooltip.TooltipComponent;
@ -211,7 +213,7 @@ index 233c50af05085c1ecb069dd2e90d17c85f27e5ab..a19e58a627107b80a7f97bcfa6a74da7
+ container.getBukkitView(),
+ CraftItemStack.asCraftMirror(newCursor),
+ CraftItemStack.asBukkitCopy(bundle),
+ count == 1,
+ container.quickcraftType != 0,
+ java.util.Map.of(slot.index, CraftItemStack.asBukkitCopy(stack.copyWithCount(slot.getItem().getCount() + i)))
+ );
+