From 465e97513b5bf1950dbbc2b73a59a0d301d93ab5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Sep 2020 19:56:58 -0400 Subject: [PATCH] (1.16.3) Missed some fixes to include in commit --- .../Implement-Expanded-ArmorStand-API.patch | 16 +--------------- .../Improved-Watchdog-Support.patch | 2 ++ .../incremental-chunk-saving.patch | 2 +- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/Spigot-Server-Patches/Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/Implement-Expanded-ArmorStand-API.patch index 30dffa9a40..4bb2c564f8 100644 --- a/Spigot-Server-Patches/Implement-Expanded-ArmorStand-API.patch +++ b/Spigot-Server-Patches/Implement-Expanded-ArmorStand-API.patch @@ -23,20 +23,6 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/ index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java -@@ -0,0 +0,0 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { - } - - @Override -+ @Deprecated // Paper - public ItemStack getItemInHand() { - return getEquipment().getItemInHand(); - } - - @Override -+ @Deprecated // Paper - public void setItemInHand(ItemStack item) { - getEquipment().setItemInHand(item); - } @@ -0,0 +0,0 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { public void setCanMove(boolean move) { getHandle().canMove = move; @@ -91,7 +77,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + for (org.bukkit.inventory.EquipmentSlot slot : slots) { + if (slot == org.bukkit.inventory.EquipmentSlot.OFF_HAND) continue; + net.minecraft.server.EnumItemSlot nmsSlot = org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot); -+ disabled += (1 << nmsSlot.c()) + (1 << (nmsSlot.c() + 8)) + (1 << (nmsSlot.c() + 16)); ++ disabled += (1 << nmsSlot.getSlotFlag()) + (1 << (nmsSlot.getSlotFlag() + 8)) + (1 << (nmsSlot.getSlotFlag() + 16)); + } + getHandle().disabledSlots = disabled; + } diff --git a/Spigot-Server-Patches/Improved-Watchdog-Support.patch b/Spigot-Server-Patches/Improved-Watchdog-Support.patch index 59af55de21..d303427fec 100644 --- a/Spigot-Server-Patches/Improved-Watchdog-Support.patch +++ b/Spigot-Server-Patches/Improved-Watchdog-Support.patch @@ -403,6 +403,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + tryPreloadClass("co.aikar.timings.TimingHistory$MinuteReport"); + tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext"); + tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext$11"); ++ tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext$12"); ++ tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext$13"); + tryPreloadClass("io.netty.channel.AbstractChannel$AbstractUnsafe$8"); + tryPreloadClass("io.netty.util.concurrent.DefaultPromise"); + tryPreloadClass("io.netty.util.concurrent.DefaultPromise$1"); diff --git a/Spigot-Server-Patches/incremental-chunk-saving.patch b/Spigot-Server-Patches/incremental-chunk-saving.patch index 25dfd04fce..52e9320c86 100644 --- a/Spigot-Server-Patches/incremental-chunk-saving.patch +++ b/Spigot-Server-Patches/incremental-chunk-saving.patch @@ -297,7 +297,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + + worldDataServer.a(worldserver1.getWorldBorder().t()); + worldDataServer.setCustomBossEvents(this.server.getBossBattleCustomData().save()); -+ convertable.a(this.server.f, this.worldDataServer, this.server.getPlayerList().save()); ++ convertable.a(this.server.customRegistry, this.worldDataServer, this.server.getPlayerList().save()); + } + // CraftBukkit end + }