mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 04:02:50 +01:00
0cdce89d59
If a playerdata doesn't contain a valid, loaded world, reset to the main world spawn point
51 lines
3.3 KiB
Diff
51 lines
3.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Fri, 14 Jan 2022 10:20:40 -0800
|
|
Subject: [PATCH] Sync offhand slot in menus
|
|
|
|
Menus don't add slots for the offhand, so on sendAllDataToRemote calls the
|
|
offhand slot isn't sent. This is not correct because you *can* put stuff into the offhand
|
|
by pressing the offhand swap item
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
index cd0f542a04ba23fc1bc3ac0a5a1910874f9d7c2c..18518aaa8fad4130b7c89e8a36ed5434258d14f6 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
@@ -341,6 +341,13 @@ public class ServerPlayer extends Player {
|
|
|
|
}
|
|
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public void sendOffHandSlotChange() {
|
|
+ ServerPlayer.this.connection.send(new ClientboundContainerSetSlotPacket(ServerPlayer.this.inventoryMenu.containerId, ServerPlayer.this.inventoryMenu.incrementStateId(), net.minecraft.world.inventory.InventoryMenu.SHIELD_SLOT, ServerPlayer.this.inventoryMenu.getSlot(net.minecraft.world.inventory.InventoryMenu.SHIELD_SLOT).getItem().copy()));
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public void sendSlotChange(AbstractContainerMenu handler, int slot, ItemStack stack) {
|
|
ServerPlayer.this.connection.send(new ClientboundContainerSetSlotPacket(handler.containerId, handler.incrementStateId(), slot, stack));
|
|
diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
|
|
index 176c8048f2fb3822fc14af9bfe5676c9d0768ca3..3ef712299fe248602b0b117c0a8e285cdf4e05c2 100644
|
|
--- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
|
|
+++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
|
|
@@ -200,6 +200,7 @@ public abstract class AbstractContainerMenu {
|
|
|
|
if (this.synchronizer != null) {
|
|
this.synchronizer.sendInitialData(this, this.remoteSlots, this.remoteCarried, this.remoteDataSlots.toIntArray());
|
|
+ this.synchronizer.sendOffHandSlotChange(); // Paper - update player's offhand since the offhand slot is not added to the slots for menus but can be changed by swapping from a menu slot
|
|
}
|
|
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/world/inventory/ContainerSynchronizer.java b/src/main/java/net/minecraft/world/inventory/ContainerSynchronizer.java
|
|
index ff4fa86f9408e83e505f7e27692d3423f8570c48..db6c290dcbb8f5cb502f85e154b42ac89350a460 100644
|
|
--- a/src/main/java/net/minecraft/world/inventory/ContainerSynchronizer.java
|
|
+++ b/src/main/java/net/minecraft/world/inventory/ContainerSynchronizer.java
|
|
@@ -6,6 +6,7 @@ import net.minecraft.world.item.ItemStack;
|
|
public interface ContainerSynchronizer {
|
|
void sendInitialData(AbstractContainerMenu handler, NonNullList<ItemStack> stacks, ItemStack cursorStack, int[] properties);
|
|
|
|
+ default void sendOffHandSlotChange() {} // Paper
|
|
void sendSlotChange(AbstractContainerMenu handler, int slot, ItemStack stack);
|
|
|
|
void sendCarriedChange(AbstractContainerMenu handler, ItemStack stack);
|