Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
12dec20 Bump paerweight to 1.1.7
e33ed89 Get short commit ref using a more proper method
7d6147d Remove now unneeded patch due to paperweight 1.1.7
e72fa41 Update task dependency for includeMappings so the new task isn't skipped
0ad5526 Trim whitspace off of git hash (oops)

Tuinity Changes:
e878ba9 Update paper
2bd2849 Bring back fix codec spam patch

patches/api/0018-Player-invulnerabilities.patch

@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <Blake.Galbreath@GMail.com>
+Date: Sat, 2 May 2020 20:55:31 -0500
+Subject: [PATCH] Player invulnerabilities
+
+
+diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
+index 13970eb20ed6bbc12720cf6c0b609e6cf2952933..4f9a182f777712b6d266b7c1acee541f85740085 100644
+--- a/src/main/java/org/bukkit/entity/Player.java
++++ b/src/main/java/org/bukkit/entity/Player.java
+@@ -2186,5 +2186,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      * Reset the idle timer back to 0
+      */
+     void resetIdleTimer();
++
++    /**
++     * Check if player is invulnerable from recently spawning or accepting a resource pack
++     *
++     * @return True if invulnerable
++     */
++    boolean isSpawnInvulnerable();
++
++    /**
++     * Get invulnerable ticks remaining
++     *
++     * @return Invulnerable ticks
++     */
++    int getSpawnInvulnerableTicks();
++
++    /**
++     * Set invulnerable ticks remaining
++     *
++     * @param invulnerableTicks Invulnerable ticks remaining
++     */
++    void setSpawnInvulnerableTicks(int invulnerableTicks);
+     // Purpur end
+ }