Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
23214fa1a Fix chicken jockey chicken persistence (#6005)
a23eb53e1 Fix use of universe flag and forceUpgrade

Tuinity Changes:
b1d612f3c Update paper

gradle.properties

@@ -1,12 +1,12 @@
-group=net.pl3x.purpur
+group = net.pl3x.purpur
-version=1.17-R0.1-SNAPSHOT
+version = 1.17-R0.1-SNAPSHOT
 
-mcVersion=1.17
+mcVersion = 1.17
-packageVersion=1_17_R1
+packageVersion = 1_17_R1
 
-paperCommit=9e07703fb7ca6a6c1d558fb4773f2cd1fbb3c438
+paperCommit = 23214fa1a7c651a2a687f5fa11b925b839014bb9
-tuinityCommit=1ff46415479b2030076889f5b09f0801fbe34afa
+tuinityCommit = 46444d45bc04ba5f51b75cd4fab42b582eba0c28
 
-org.gradle.parallel=true
+org.gradle.parallel = true
-org.gradle.vfs.watch=false
+org.gradle.vfs.watch = false
-org.gradle.jvmargs=-Xmx3G
+org.gradle.jvmargs = -Xmx3G

patches/server/0215-Fix-MC-229490.patch

@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 25 Jun 2021 22:03:45 -0500
-Subject: [PATCH] Fix MC-229490
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-index a907520c2cd9eacf2fe80d87004afc5f30b6a630..38b260fd4b202d4ec3e97a407171d60c09d4eeed 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-@@ -45,6 +45,7 @@ public class Chicken extends Animal {
-     private float nextFlap = 1.0F;
-     public int eggTime;
-     public boolean isChickenJockey;
-+    public boolean jockey; // Purpur
- 
-     public Chicken(EntityType<? extends Chicken> type, Level world) {
-         super(type, world);
-@@ -194,7 +195,7 @@ public class Chicken extends Animal {
-     @Override
-     public void readAdditionalSaveData(CompoundTag nbt) {
-         super.readAdditionalSaveData(nbt);
--        this.isChickenJockey = nbt.getBoolean("IsChickenJockey");
-+        this.jockey = nbt.getBoolean("IsChickenJockey"); // Purpur
-         if (nbt.contains("EggLayTime")) {
-             this.eggTime = nbt.getInt("EggLayTime");
-         }
-@@ -204,7 +205,7 @@ public class Chicken extends Animal {
-     @Override
-     public void addAdditionalSaveData(CompoundTag nbt) {
-         super.addAdditionalSaveData(nbt);
--        nbt.putBoolean("IsChickenJockey", this.isChickenJockey);
-+        nbt.putBoolean("IsChickenJockey", this.jockey); // Purpur
-         nbt.putInt("EggLayTime", this.eggTime);
-     }
- 
-@@ -229,10 +230,10 @@ public class Chicken extends Animal {
-     }
- 
-     public boolean isChickenJockey() {
--        return this.isChickenJockey;
-+        return this.jockey; // Purpur
-     }
- 
-     public void setChickenJockey(boolean hasJockey) {
--        this.isChickenJockey = hasJockey;
-+        this.jockey = hasJockey; // Purpur
-     }
- }