diff --git a/Paper-MojangAPI/pom.xml b/Paper-MojangAPI/pom.xml
index 03a17db372..0ac10a3f00 100644
--- a/Paper-MojangAPI/pom.xml
+++ b/Paper-MojangAPI/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>com.destroystokyo.paper</groupId>
     <artifactId>paper-mojangapi</artifactId>
-    <version>1.16.2-R0.1-SNAPSHOT</version>
+    <version>1.16.3-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Paper-MojangAPI</name>
diff --git a/Spigot-API-Patches/POM-changes.patch b/Spigot-API-Patches/POM-changes.patch
index 49f97fad5f..a866301f58 100644
--- a/Spigot-API-Patches/POM-changes.patch
+++ b/Spigot-API-Patches/POM-changes.patch
@@ -22,7 +22,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -    <artifactId>spigot-api</artifactId>
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper-api</artifactId>
-     <version>1.16.2-R0.1-SNAPSHOT</version>
+     <version>1.16.3-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Spigot-API</name>
diff --git a/Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch
index e500ed615f..ff0274f21a 100644
--- a/Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -36,7 +36,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -0,0 +0,0 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
      public boolean hasEquipmentLock(EquipmentSlot equipmentSlot, LockType lockType) {
-         return (getHandle().bv & (1 << CraftEquipmentSlot.getNMS(equipmentSlot).c() + lockType.ordinal() * 8)) != 0;
+         return (getHandle().disabledSlots & (1 << CraftEquipmentSlot.getNMS(equipmentSlot).getSlotFlag() + lockType.ordinal() * 8)) != 0;
      }
 +    // Paper start
 +    @Override
diff --git a/Spigot-Server-Patches/Add-tick-times-API-and-mspt-command.patch b/Spigot-Server-Patches/Add-tick-times-API-and-mspt-command.patch
index b3a2f69298..4530750b10 100644
--- a/Spigot-Server-Patches/Add-tick-times-API-and-mspt-command.patch
+++ b/Spigot-Server-Patches/Add-tick-times-API-and-mspt-command.patch
@@ -116,8 +116,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          this.methodProfiler.exit();
          org.spigotmc.WatchdogThread.tick(); // Spigot
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
-     public IRegistryCustom aX() {
-         return this.f;
+     public IRegistryCustom getCustomRegistry() {
+         return this.customRegistry;
      }
 +
 +    // Paper start
diff --git a/Spigot-Server-Patches/Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/Allow-overriding-the-java-version-check.patch
index ddaed6ac9f..7ff9c2c284 100644
--- a/Spigot-Server-Patches/Allow-overriding-the-java-version-check.patch
+++ b/Spigot-Server-Patches/Allow-overriding-the-java-version-check.patch
@@ -11,8 +11,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -0,0 +0,0 @@ public class Main {
              float javaVersion = Float.parseFloat(System.getProperty("java.class.version"));
-             if (javaVersion > 58.0) {
-                 System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 14 is supported.");
+             if (javaVersion > 59.0) {
+                 System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 15 is supported.");
 -                return;
 +                if (!Boolean.getBoolean("Paper.IgnoreJavaVersion")) return; // Paper
              }
diff --git a/Spigot-Server-Patches/Anti-Xray.patch b/Spigot-Server-Patches/Anti-Xray.patch
index 3bbfa57094..d1154312d5 100644
--- a/Spigot-Server-Patches/Anti-Xray.patch
+++ b/Spigot-Server-Patches/Anti-Xray.patch
@@ -1197,18 +1197,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          int j = along.length * 64 / 4096;
  
          if (this.h == this.b) {
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
-         return this.saveData;
-     }
- 
-+    public final IRegistryCustom getCustomRegistry() { return aX(); } // Paper - OBFHELPER
-     public IRegistryCustom aX() {
-         return this.f;
-     }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
diff --git a/Spigot-Server-Patches/Do-not-load-chunks-for-Pathfinding.patch b/Spigot-Server-Patches/Do-not-load-chunks-for-Pathfinding.patch
index 756b6de907..7875c809de 100644
--- a/Spigot-Server-Patches/Do-not-load-chunks-for-Pathfinding.patch
+++ b/Spigot-Server-Patches/Do-not-load-chunks-for-Pathfinding.patch
@@ -14,9 +14,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private float r;
 -    private final Pathfinder s;
 +    private final Pathfinder s; public Pathfinder getPathfinder() { return this.s; } // Paper - OBFHELPER
+     private boolean t;
  
      public NavigationAbstract(EntityInsentient entityinsentient, World world) {
-         this.g = Vec3D.a;
 diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/Pathfinder.java
diff --git a/Spigot-Server-Patches/Entity-Activation-Range-2.0.patch b/Spigot-Server-Patches/Entity-Activation-Range-2.0.patch
index 987d94f1df..e2e9d1e2b2 100644
--- a/Spigot-Server-Patches/Entity-Activation-Range-2.0.patch
+++ b/Spigot-Server-Patches/Entity-Activation-Range-2.0.patch
@@ -40,15 +40,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              if (enummovetype == EnumMoveType.PISTON) {
 +                this.activatedTick = MinecraftServer.currentTick + 20; // Paper
                  vec3d = this.b(vec3d);
-                 if (vec3d.equals(Vec3D.a)) {
+                 if (vec3d.equals(Vec3D.ORIGIN)) {
                      return;
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-                 this.x = Vec3D.a;
-                 this.setMot(Vec3D.a);
+                 this.x = Vec3D.ORIGIN;
+                 this.setMot(Vec3D.ORIGIN);
              }
 +            // Paper start - ignore movement changes while inactive.
 +            if (isTemporarilyActive && !(this instanceof EntityItem || this instanceof EntityMinecartAbstract) && vec3d == getMot() && enummovetype == EnumMoveType.SELF) {
-+                setMot(Vec3D.a);
++                setMot(Vec3D.ORIGIN);
 +                this.world.getMethodProfiler().exit();
 +                return;
 +            }
@@ -422,7 +422,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                    if (isActive) {
                      entity1.passengerTick();
 +                    } else {
-+                        entity1.setMot(Vec3D.a);
++                        entity1.setMot(Vec3D.ORIGIN);
 +                        entity1.inactiveTick();
 +                        // copied from inside of if (isPassenger()) of passengerTick, but that ifPassenger is unnecessary
 +                        entity.syncPositionOf(entity1);
diff --git a/Spigot-Server-Patches/EntityPathfindEvent.patch b/Spigot-Server-Patches/EntityPathfindEvent.patch
index fc162ac9f9..2164ff0c74 100644
--- a/Spigot-Server-Patches/EntityPathfindEvent.patch
+++ b/Spigot-Server-Patches/EntityPathfindEvent.patch
@@ -17,7 +17,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return this.a(entity.getChunkCoordinates(), entity, i); // Paper - Forward target entity
      }
  
-     private int t() {
+     private int u() {
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
diff --git a/Spigot-Server-Patches/Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/Implement-Expanded-ArmorStand-API.patch
index f04a5e3c17..30dffa9a40 100644
--- a/Spigot-Server-Patches/Implement-Expanded-ArmorStand-API.patch
+++ b/Spigot-Server-Patches/Implement-Expanded-ArmorStand-API.patch
@@ -11,22 +11,13 @@ diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
-@@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
-     private final NonNullList<ItemStack> armorItems;
-     private boolean armorStandInvisible;
-     public long bi;
--    public int bv; //PAIL private -> public, rename disabledSlots
-+    public int bv; public final void setDisabledSlots(int i) { bv = i; } public final int getDisabledSlots() { return bv; } // Paper - OBFHELPER
-     public Vector3f headPose;
-     public Vector3f bodyPose;
-     public Vector3f leftArmPose;
 @@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
          return enumitemslot;
      }
  
 +    public final boolean isSlotDisabled(EnumItemSlot slot) { return this.d(slot); } // Paper - OBFHELPER
      private boolean d(EnumItemSlot enumitemslot) {
-         return (this.bv & 1 << enumitemslot.c()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms();
+         return (this.disabledSlots & 1 << enumitemslot.getSlotFlag()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
@@ -102,7 +93,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            net.minecraft.server.EnumItemSlot nmsSlot = org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot);
 +            disabled += (1 << nmsSlot.c()) + (1 << (nmsSlot.c() + 8)) + (1 << (nmsSlot.c() + 16));
 +        }
-+        getHandle().setDisabledSlots(disabled);
++        getHandle().disabledSlots = disabled;
 +    }
 +
 +    @Override
diff --git a/Spigot-Server-Patches/Improve-EntityShootBowEvent.patch b/Spigot-Server-Patches/Improve-EntityShootBowEvent.patch
index 486b122a8c..2288e3565c 100644
--- a/Spigot-Server-Patches/Improve-EntityShootBowEvent.patch
+++ b/Spigot-Server-Patches/Improve-EntityShootBowEvent.patch
@@ -28,7 +28,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // Paper end
      }
  
-     class a extends EntityIllagerWizard.c {
+     class a extends EntityIllagerWizard.PathfinderGoalCastSpell {
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
diff --git a/Spigot-Server-Patches/POM-Changes.patch b/Spigot-Server-Patches/POM-Changes.patch
index 29e3d0ea24..71ab781a8c 100644
--- a/Spigot-Server-Patches/POM-Changes.patch
+++ b/Spigot-Server-Patches/POM-Changes.patch
@@ -16,7 +16,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -    <artifactId>spigot</artifactId>
 +    <artifactId>paper</artifactId>
      <packaging>jar</packaging>
-     <version>1.16.2-R0.1-SNAPSHOT</version>
+     <version>1.16.3-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 +    <name>Paper</name>
@@ -27,7 +27,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          <api.version>unknown</api.version>
-         <minecraft.version>1.16.2</minecraft.version>
+         <minecraft.version>1.16.3</minecraft.version>
 @@ -0,0 +0,0 @@
      </properties>
  
diff --git a/Spigot-Server-Patches/Send-absolute-position-the-first-time-an-entity-is-s.patch b/Spigot-Server-Patches/Send-absolute-position-the-first-time-an-entity-is-s.patch
index b855e2175b..90447ce06f 100644
--- a/Spigot-Server-Patches/Send-absolute-position-the-first-time-an-entity-is-s.patch
+++ b/Spigot-Server-Patches/Send-absolute-position-the-first-time-an-entity-is-s.patch
@@ -48,7 +48,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // Paper end
          this.trackedPlayers = trackedPlayers;
          // CraftBukkit end
-         this.m = Vec3D.a;
+         this.m = Vec3D.ORIGIN;
 @@ -0,0 +0,0 @@ public class EntityTrackerEntry {
                  }
  
diff --git a/Spigot-Server-Patches/Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/Use-a-Shared-Random-for-Entities.patch
index 7b858352dd..8add76f630 100644
--- a/Spigot-Server-Patches/Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/Use-a-Shared-Random-for-Entities.patch
@@ -32,7 +32,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      public CraftEntity getBukkitEntity() {
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-         this.x = Vec3D.a;
+         this.x = Vec3D.ORIGIN;
          this.am = 1.0F;
          this.an = 1.0F;
 -        this.random = new Random();
diff --git a/work/BuildData b/work/BuildData
index 2589242cca..b2025bdddd 160000
--- a/work/BuildData
+++ b/work/BuildData
@@ -1 +1 @@
-Subproject commit 2589242ccafbffaeb0a36d16e9f59f97ab3411b7
+Subproject commit b2025bdddde79aea004399ec5f3652a1bce56b7a
diff --git a/work/Bukkit b/work/Bukkit
index 0e90062a29..84fcddbf95 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 0e90062a2976d944b4c58187cbd8af95b9764b11
+Subproject commit 84fcddbf950c5414164ec4767c77b5a113aeca6e
diff --git a/work/CraftBukkit b/work/CraftBukkit
index b8ee6a89fd..bf3d720714 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit b8ee6a89fd17f377a356cdd88be1453389cc647f
+Subproject commit bf3d7207140a295c35d4024a43cd188824c5a359
diff --git a/work/Spigot b/work/Spigot
index b5a13e6d36..3a70bd92b9 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit b5a13e6d369902135ae04e4e218846ad10201c85
+Subproject commit 3a70bd92b96d836dd046576a57deb7c8573c88a7