mirror of
https://github.com/PaperMC/Paper.git
synced 2025-07-26 09:42:06 -07: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:
@@ -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)) {
|
||||
|
Submodule work/Bukkit updated: 1cb03826eb...0ca45a21b9
Submodule work/CraftBukkit updated: dc7c3c61fa...145921e2a6
Submodule work/Spigot updated: 4d9262cf9f...beb7d47c1d
Reference in New Issue
Block a user