mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 19:56:52 +01:00
e4d10a6d67
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58eSPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579fAdd FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
34 lines
1.8 KiB
Diff
34 lines
1.8 KiB
Diff
From e4ed1181f339cd1c902b1f47268f8d5d3d68b191 Mon Sep 17 00:00:00 2001
|
|
From: Michael Himing <mhiming@gmail.com>
|
|
Date: Sun, 16 Dec 2018 13:07:33 +1100
|
|
Subject: [PATCH] Fix PlayerEditBookEvent
|
|
|
|
- Updating book writing (not signing) mutated the original item, making
|
|
it impossible to properly cancel the event or modify the book meta
|
|
|
|
- When the event was cancelled, the client's book would keep the
|
|
cancelled writing
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
index 784f0a3f22..4b3ddfd990 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -871,9 +871,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
|
itemstack2.a("pages", (NBTBase) nbttaglist);
|
|
this.player.a(packetplayinbedit.d(), CraftEventFactory.handleEditBookEvent(player, enumitemslot, itemstack1, itemstack2)); // CraftBukkit
|
|
} else {
|
|
- ItemStack old = itemstack1.cloneItemStack(); // CraftBukkit
|
|
- itemstack1.a("pages", (NBTBase) itemstack.getTag().getList("pages", 8));
|
|
- CraftEventFactory.handleEditBookEvent(player, enumitemslot, old, itemstack1); // CraftBukkit
|
|
+ // Paper start - dont mutate players current item, set it from the event
|
|
+ ItemStack newBook = itemstack1.cloneItemStack();
|
|
+ newBook.getOrCreateTagAndSet("pages", (NBTBase)itemstack.getTag().getList("pages", 8));
|
|
+ this.player.setSlot(enumitemslot, CraftEventFactory.handleEditBookEvent(player, enumitemslot, itemstack1, newBook));
|
|
+ // Paper end
|
|
}
|
|
}
|
|
|
|
--
|
|
2.25.1
|
|
|