mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-17 02:34:30 +01:00
Updated Upstream (Bukkit/CraftBukkit/Spigot)
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: 0ca45a21 #503: Add PlayerHarvestBlockEvent dfa80a52 SPIGOT-5930: Add PlayerRespawnEvent#isAnchorSpawn CraftBukkit Changes:145921e2
#676: Add PlayerHarvestBlockEvent47abffa2
SPIGOT-5929: Angered zombified piglins do not inherit killed_by_player status7f6b4f58
SPIGOT-5930: Add PlayerRespawnEvent#isAnchorSpawn94eff632
SPIGOT-5867, MC-193339: NPE during shutdown when rcon enabled with no password068618eb
SPIGOT-5927: Some items NBT data disappears Spigot Changes: beb7d47c Rebuild patches Fixes #3738
This commit is contained in:
parent
23ae9ca116
commit
d6e23b14a7
4 changed files with 13 additions and 16 deletions
|
@ -40,23 +40,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
NBTTagCompound entityTag;
|
||||
|
||||
CraftMetaArmorStand(CraftMetaItem meta) {
|
||||
super(meta);
|
||||
+
|
||||
@@ -0,0 +0,0 @@ public class CraftMetaArmorStand extends CraftMetaItem {
|
||||
}
|
||||
|
||||
CraftMetaArmorStand armorStand = (CraftMetaArmorStand) meta;
|
||||
+ // Paper start
|
||||
+ if (!(meta instanceof CraftMetaArmorStand)) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ CraftMetaArmorStand standMeta = (CraftMetaArmorStand) meta;
|
||||
+ this.invisible = standMeta.invisible;
|
||||
+ this.noBasePlate = standMeta.noBasePlate;
|
||||
+ this.showArms = standMeta.showArms;
|
||||
+ this.small = standMeta.small;
|
||||
+ this.marker = standMeta.marker;
|
||||
+ this.invisible = armorStand.invisible;
|
||||
+ this.noBasePlate = armorStand.noBasePlate;
|
||||
+ this.showArms = armorStand.showArms;
|
||||
+ this.small = armorStand.small;
|
||||
+ this.marker = armorStand.marker;
|
||||
+ // Paper end
|
||||
this.entityTag = armorStand.entityTag;
|
||||
}
|
||||
|
||||
CraftMetaArmorStand(NBTTagCompound tag) {
|
||||
@@ -0,0 +0,0 @@ public class CraftMetaArmorStand extends CraftMetaItem {
|
||||
|
||||
if (tag.hasKey(ENTITY_TAG.NBT)) {
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 1cb03826ebde4ef887519ce37b0a2a341494a183
|
||||
Subproject commit 0ca45a21b94ba986a410ad495ad40b0ee2aa6de4
|
|
@ -1 +1 @@
|
|||
Subproject commit dc7c3c61fa061c87eca5d158f1f1c369620622b6
|
||||
Subproject commit 145921e2a6ca99081f6019321b63e80756f9cac9
|
|
@ -1 +1 @@
|
|||
Subproject commit 4d9262cf9f7cf1a38525d21734708c3fe4a28bcb
|
||||
Subproject commit beb7d47c1d386faa934fceb3b8bd914721074b59
|
Loading…
Add table
Reference in a new issue