Updated Upstream (Paper & Pufferfish)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2033dba Updated Upstream (CraftBukkit)
PaperMC/Paper@a3ad720 Remove ChatColor usages (#7543)
PaperMC/Paper@8fc0999 Fix some nullability things (#7275)
PaperMC/Paper@fd069dd Remove incorrect throws javadoc in Team (#7869)
PaperMC/Paper@bed5cb2 Limit resolved selectors when enabled
PaperMC/Paper@4d83ed0 [ci skip] Changing the order of the rebase with autosquash command in the contributing.md (#6974)
PaperMC/Paper@071a4a2 throw exception if worlds are created while being ticked (#7653)
PaperMC/Paper@5b6397a Make leave messages for kicks the same as for quitting (#7874)
PaperMC/Paper@5befb55 Updated Upstream (Bukkit/CraftBukkit) (#7875)
PaperMC/Paper@b3deb25 Move some methods to RegionAccessor (#7635)
PaperMC/Paper@d8ef841 [DataConverter] Fix generator options parsing
PaperMC/Paper@4b27254 Fix treasure maps discovered settings (#7627)
PaperMC/Paper@276d830 Fix campfire walker in V1920

Pufferfish Changes:
pufferfish-gg/Pufferfish@671d68b Add Entity TTLs
pufferfish-gg/Pufferfish@aaca13d Updated Upstream (Paper)

patches/server/0138-Toggle-for-water-sensitive-mob-damage.patch

@@ -62,7 +62,7 @@ index 3b272c0e3710885fa0a4ef9b39bfa8874a972e0d..1490c6d10824d556972a77aaa23eac3a
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index 8091e7afb8cbf2285842f1d9ffa3c8d06bffacbe..803007e93efe4e36ef4e5843721e222df38da5b7 100644
+index 0f28682db47708e81fea0a043f51cba3a3702014..31930b5936dcaea92afc54a583efcd5c3cedac3b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
 @@ -157,6 +157,11 @@ public class Cat extends TamableAnimal {
@@ -78,7 +78,7 @@ index 8091e7afb8cbf2285842f1d9ffa3c8d06bffacbe..803007e93efe4e36ef4e5843721e222d
  
      public ResourceLocation getResourceLocation() {
 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 002a66c13074a887b6525085ca57227ff858bac7..d7ddb71ae59ab0a0e10717e5c678ef5e5476aba4 100644
+index 839cb9ff15132f3461317c5ead7c486a0b6fe5e0..439ce2e01cb861f2b3abb86090f49498e2a47142 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 @@ -80,6 +80,11 @@ public class Chicken extends Animal {
@@ -190,7 +190,7 @@ index d7c68775fc39222be66bc82e0e7a1b0ae3238f7a..047404f4e38b9d796ceecb4e07740942
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-index 5aaeec3df43820bbaa839b9bfd9a756db7377cc2..5442baf10ca180b104bf1fd9cbcc12bb7a6146fc 100644
+index 0719a17e886b6525d7ed091f1759eed12a945034..b0f133931815155f1dab02e2853bbcde5c96bac6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 @@ -93,6 +93,11 @@ public class Ocelot extends Animal {
@@ -395,7 +395,7 @@ index e3bf2c2bc16bc03c17d90f2ce1620c6b895e9bf7..3c38345b32d106a169d1e6abcae54f28
  
      public void setHomePos(BlockPos pos) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index 5e8294b0eb7b06264d16ce6d8112aa30dc2bd09d..8a1fdb8e358be2730304b68813cd5fb2997dda6d 100644
+index ba6acbf7b78e063dcc61c12f740b928642c2f8e6..79fdf8f0512fb9bff730b0a3674aba2f121dbb6f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -207,6 +207,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -411,7 +411,7 @@ index 5e8294b0eb7b06264d16ce6d8112aa30dc2bd09d..8a1fdb8e358be2730304b68813cd5fb2
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index a554d836635826bbe3fc562675ae982f33b409d1..b7e2ed08864f5bde346faebf9498254dc9794ce6 100644
+index 0f38b65d490cde61cfc256719f91cc0a955b4080..efc02d00f3b95f4f6b6204b91ce15e03b23a6e6b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 @@ -129,6 +129,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
@@ -641,10 +641,10 @@ index f4aeaeef7d781a655e765993fb38a9d920c47109..614baf25654c770a6cdac02f8cd4301a
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index 3dd6dd92f5f8334b43f50447ac259b2d06f9af95..8a68469769cfe8ac596b3f2c990e0375d7d1dcaf 100644
+index 346c274e81be8541b61c66a0a0574811ddf59ff9..195cbb1870caf48830ea8c3f294a258c3839431d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-@@ -107,6 +107,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
+@@ -108,6 +108,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
      public boolean jockeyTryExistingChickens() {
          return level.purpurConfig.drownedJockeyTryExistingChickens;
      }
@@ -919,7 +919,7 @@ index e239bcc4d4afe48e9fc204ad38d8bc76833994f4..8ce46cc00a01a678270e906078097aa7
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index b1894c88682201ed5fca5e98bedab73b4b08a065..9582332f8fb211b41110d0fcda97521c2035ebb3 100644
+index d26f6bfb961cced818cfcf700bfd58f6703c7f39..8cf06d7e4537ff93fee4377ad4988e78084ff4a8 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
 @@ -135,6 +135,11 @@ public class Slime extends Mob implements Enemy {
@@ -989,7 +989,7 @@ index bec84c1dba34d61de9199b1b46cad49d46ee9731..5ff3373c9c73691d7f21c05b0f044c19
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java
-index ca645932aff82c260f875dd11f373c1a282ff369..e34acf855b2c93801cd98a8e7d983a4145314747 100644
+index ee8a1b2e5ace89a1b2f457608903fbbc80e05973..dfcaaa245d229328d4227969bf747fd150c02f10 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
 @@ -105,6 +105,11 @@ public class Vex extends Monster {
@@ -1005,7 +1005,7 @@ index ca645932aff82c260f875dd11f373c1a282ff369..e34acf855b2c93801cd98a8e7d983a41
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-index acd4e282841708d7ef0145757899e355a6410a4a..729eb8a30b35ef5c70be30b3141b9da5c74388f6 100644
+index a5a6bcf79db034394068ab1db246b4444bdc3c27..5308f5d1dd226e2c73df69e729d93bf593ee467d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 @@ -79,6 +79,11 @@ public class Vindicator extends AbstractIllager {
@@ -1069,7 +1069,7 @@ index a91ec2e385940b12bc41d9c09819c9081edc5c44..9928af5318c1cc4676c5cf215840ce0f
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index eaffa791ce73f6b2c2fa5b940909346e9f0fda0f..15bbf62f1dab73b501044c6ada0f6f3b09ab07df 100644
+index 3cea172a1a54b34f5fbd62ace84661da429c44d6..52e6eb5269249e586683de647c350651e2c96c91 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -136,6 +136,11 @@ public class Zombie extends Monster {
@@ -1085,7 +1085,7 @@ index eaffa791ce73f6b2c2fa5b940909346e9f0fda0f..15bbf62f1dab73b501044c6ada0f6f3b
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index b925e0ffbdc8f388a7b2162284e8356c3e969454..ba6875089c122baaf99f21cda5c65228c78e0fa1 100644
+index 36f748fb4b4e6e0c3a39ab3f9c11bf178aced7df..322ba3293d170a81e1d501d590a18d435968456f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 @@ -119,6 +119,11 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
@@ -1117,7 +1117,7 @@ index 21610fa723b22894a4ff316ee34d8aabfb707526..918cd5c51849e3de4915016a76bbd4b6
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index 35e758e7630cbba6ff80307261cf1f84b278829e..5ac9a41daee27b305a68a91b13a20a1a3f5264ab 100644
+index 5f879e65f3a6c0fea3e962716b61651fd54bcf6d..7a7508dcf15a3cb932944240816d63640aa8be61 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 @@ -92,6 +92,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@@ -1133,7 +1133,7 @@ index 35e758e7630cbba6ff80307261cf1f84b278829e..5ac9a41daee27b305a68a91b13a20a1a
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index f35e5c9e85583c8f599460c0ccd23a0f3bb88d6a..2fc82bccca7ff0bd63212bdb1ea1bf4dbe7c0ded 100644
+index 644ec458325049cb97a181dea6c6857c3d35ef1f..d5388ea5d88b2fb6e6f499e9e7f05f176136d023 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 @@ -116,6 +116,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento