Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-02 14:38:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #452 from Moulberry/master

Browse Source 
Fix cursor being set to air due to incorrect window items packet
This commit is contained in:
TheMode 2021-09-08 15:57:51 +02:00 committed by GitHub
commit 7c043b163e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/minestom/server/inventory/Inventory.java
View File

@ -130,7 +130,9 @@ public class Inventory extends AbstractInventory implements Viewable {
*/ */
@Override @Override
public void update() { public void update() {
sendPacketToViewers(createNewWindowItemsPacket()); for(Player player : viewers) {
player.getPlayerConnection().sendPacket(createNewWindowItemsPacket(player));
}
} }
/** /**
@ -145,7 +147,7 @@ public class Inventory extends AbstractInventory implements Viewable {
return; return;
final PlayerConnection playerConnection = player.getPlayerConnection(); final PlayerConnection playerConnection = player.getPlayerConnection();
playerConnection.sendPacket(createNewWindowItemsPacket()); playerConnection.sendPacket(createNewWindowItemsPacket(player));
} }
@NotNull @NotNull
@ -227,8 +229,8 @@ public class Inventory extends AbstractInventory implements Viewable {
* *
* @return a new {@link WindowItemsPacket} packet * @return a new {@link WindowItemsPacket} packet
*/ */
private @NotNull WindowItemsPacket createNewWindowItemsPacket() { private @NotNull WindowItemsPacket createNewWindowItemsPacket(Player player) {
return new WindowItemsPacket(getWindowId(), 0, getItemStacks(), ItemStack.AIR); return new WindowItemsPacket(getWindowId(), 0, getItemStacks(), cursorPlayersItem.getOrDefault(player, ItemStack.AIR));
} }
/** /**

2
src/main/java/net/minestom/server/network/packet/server/play/SetSlotPacket.java
View File

@ -53,6 +53,6 @@ public class SetSlotPacket implements ServerPacket {
* @return a set slot packet to change a player cursor item * @return a set slot packet to change a player cursor item
*/ */
public static @NotNull SetSlotPacket createCursorPacket(@NotNull ItemStack cursorItem) { public static @NotNull SetSlotPacket createCursorPacket(@NotNull ItemStack cursorItem) {
return new SetSlotPacket((byte) -1, -1, (short) 0, cursorItem); return new SetSlotPacket((byte) -1, 0, (short) -1, cursorItem);
} }
} }