Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appear 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:
0c5d8709 SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends
255c4fdb SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot

CraftBukkit Changes:
b6b514b7e SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends
fcff84de9 SPIGOT-7399: Revert null check in CraftMetaItem#safelyAdd
44a4b5649 SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot
676969d01 SPIGOT-7389: Handle setting null items in ChiseledBookshelf Inventory

patches/server/0692-Manually-inline-methods-in-BlockPosition.patch

@@ -0,0 +1,63 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Spottedleaf <Spottedleaf@users.noreply.github.com>
+Date: Mon, 6 Jul 2020 22:48:48 -0700
+Subject: [PATCH] Manually inline methods in BlockPosition
+
+
+diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
+index 441ea6b9fd55a5288f264472d7297728d0546d6b..83cab746d1d6fe25c043c8aee28c39412b90c127 100644
+--- a/src/main/java/net/minecraft/core/BlockPos.java
++++ b/src/main/java/net/minecraft/core/BlockPos.java
+@@ -515,9 +515,9 @@ public class BlockPos extends Vec3i {
+         }
+ 
+         public BlockPos.MutableBlockPos set(int x, int y, int z) {
+-            this.setX(x);
+-            this.setY(y);
+-            this.setZ(z);
++            this.x = x; // Paper - force inline
++            this.y = y; // Paper - force inline
++            this.z = z; // Paper - force inline
+             return this;
+         }
+ 
+@@ -581,19 +581,19 @@ public class BlockPos extends Vec3i {
+         // Paper start - comment out useless overrides @Override - TODO figure out why this is suddenly important to keep
+         @Override
+         public BlockPos.MutableBlockPos setX(int i) {
+-            super.setX(i);
++            this.x = i; // Paper
+             return this;
+         }
+ 
+         @Override
+         public BlockPos.MutableBlockPos setY(int i) {
+-            super.setY(i);
++            this.y = i; // Paper
+             return this;
+         }
+ 
+         @Override
+         public BlockPos.MutableBlockPos setZ(int i) {
+-            super.setZ(i);
++            this.z = i; // Paper
+             return this;
+         }
+         // Paper end
+diff --git a/src/main/java/net/minecraft/core/Vec3i.java b/src/main/java/net/minecraft/core/Vec3i.java
+index e87ef99260bff134529e00b9a75381cecaec01a4..74a3f2ba6aaec39ba4721fb546bfccb325c86343 100644
+--- a/src/main/java/net/minecraft/core/Vec3i.java
++++ b/src/main/java/net/minecraft/core/Vec3i.java
+@@ -19,9 +19,9 @@ public class Vec3i implements Comparable<Vec3i> {
+         return IntStream.of(vec.getX(), vec.getY(), vec.getZ());
+     });
+     public static final Vec3i ZERO = new Vec3i(0, 0, 0);
+-    private int x;
+-    private int y;
+-    private int z;
++    protected int x; // Paper - protected
++    protected int y; // Paper - protected
++    protected int z; // Paper - protected
+ 
+     public static Codec<Vec3i> offsetCodec(int maxAbsValue) {
+         return ExtraCodecs.validate(CODEC, (vec) -> {