Update upstream

Author: froobynooby

gradle.properties

@@ -2,7 +2,7 @@ group=com.froobworld.nabulus
 version=1.21.1-R0.1-SNAPSHOT
 
 mcVersion=1.21.1
-paperRef=c789f72f4b10e74ce601d99415ac2ba7d06b98e3
+paperRef=63ce67dafd4b5a4a6e561b84a6a47095b3c02fd1
 
 org.gradle.caching=true
 org.gradle.parallel=true

patches/server/0002-Separate-creative-levels.patch

@@ -17,7 +17,7 @@ index c1510d9167f466d3b7e3756353224f12f3876442..d4f0561741e71e10bf08448a02373207
              WalkerUtils.convert(MCTypeRegistry.ENTITY, data, "ShoulderEntityLeft", fromVersion, toVersion);
              WalkerUtils.convert(MCTypeRegistry.ENTITY, data, "ShoulderEntityRight", fromVersion, toVersion);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6c280abdef5f80b668d6090f9d35283a33e21e0c..b73bb378e86b60363bc5d7542890837a08881bd9 100644
+index c396580a9cfd86ff261bed439bb4662ae88010b5..7e5f08b33abc93d98622c504a48a295b6a8bfb50 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -697,6 +697,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -36,7 +36,7 @@ index 6c280abdef5f80b668d6090f9d35283a33e21e0c..b73bb378e86b60363bc5d7542890837a
                  this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
                  this.connection.resetPosition();
                  worldserver.addDuringTeleport(this);
-@@ -2031,12 +2033,22 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -2035,12 +2037,22 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
      }
 
      public void restoreFrom(ServerPlayer oldPlayer, boolean alive) {
@@ -59,7 +59,7 @@ index 6c280abdef5f80b668d6090f9d35283a33e21e0c..b73bb378e86b60363bc5d7542890837a
          if (alive) {
              this.getInventory().replaceWith(oldPlayer.getInventory());
              this.setHealth(oldPlayer.getHealth());
-@@ -2072,6 +2084,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -2076,6 +2088,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
          this.seenCredits = oldPlayer.seenCredits;
          this.enteredNetherPosition = oldPlayer.enteredNetherPosition;
          this.chunkTrackingView = oldPlayer.chunkTrackingView;
@@ -68,7 +68,7 @@ index 6c280abdef5f80b668d6090f9d35283a33e21e0c..b73bb378e86b60363bc5d7542890837a
          this.setShoulderEntityRight(oldPlayer.getShoulderEntityRight());
          this.setLastDeathLocation(oldPlayer.getLastDeathLocation());
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0368d6ba9cc9fe557d3c7172a87a7a5b15445e47..3c61cfed065c6df6274ea5a68388469267e60e73 100644
+index c13922d2fb1c15f895b14d4cb6d5379b59ea1ef8..69fedcdafa25a9015546ae1367b1a65f6cecbe9a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -819,9 +819,27 @@ public abstract class PlayerList {
@@ -114,17 +114,17 @@ index 0368d6ba9cc9fe557d3c7172a87a7a5b15445e47..3c61cfed065c6df6274ea5a683884692
          DimensionTransition dimensiontransition;
          if (location == null) {
              dimensiontransition = entityplayer.findRespawnPositionAndUseSpawnBlock(flag, DimensionTransition.DO_NOTHING, reason);
-@@ -857,6 +877,8 @@ public abstract class PlayerList {
+@@ -858,6 +878,8 @@ public abstract class PlayerList {
          } else {
              dimensiontransition = new DimensionTransition(((CraftWorld) location.getWorld()).getHandle(), CraftLocation.toVec3D(location), Vec3.ZERO, location.getYaw(), location.getPitch(), DimensionTransition.DO_NOTHING);
          }
 +        */
 +        // Nabulus end
          // Spigot Start
-         if (dimensiontransition == null) {
+         if (dimensiontransition == null) { // Paper - Add PlayerPostRespawnEvent - diff on change - spigot early returns if respawn pos is null, that is how they handle disconnected player in respawn event
              return entityplayer;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3f7812c55dae82433336d6e091aa83434615fa04..57e95261d53ef97525ec623eb90ad3c317195b8f 100644
+index e12cbbe9eea3f243808fad547c91bd546fd4bbc8..c3dc41d0b13212965821c135ac49e409cb177f64 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3731,6 +3731,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0003-Show-hidden-players-in-playerlist-and-tab-suggestion.patch

@@ -18,7 +18,7 @@ index 73180c617945610e11b777733655f9e2c4c1dd0c..aec6ec9bc92dc784ea1c2907b051a3f9
          List<ServerPlayer> list = players;
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3c61cfed065c6df6274ea5a68388469267e60e73..a3c75398898d5593f7231961624009730f3f3e27 100644
+index 69fedcdafa25a9015546ae1367b1a65f6cecbe9a..ab4879409c44d3ee38442e958d461a694d1f6426 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -365,7 +365,7 @@ public abstract class PlayerList {
@@ -47,7 +47,7 @@ index 3c61cfed065c6df6274ea5a68388469267e60e73..a3c75398898d5593f723196162400973
                  entityplayer2.getBukkitEntity().onEntityRemove(entityplayer);
              }
          }
-@@ -1002,7 +1003,7 @@ public abstract class PlayerList {
+@@ -1008,7 +1009,7 @@ public abstract class PlayerList {
                  target.connection.send(new ClientboundPlayerInfoUpdatePacket(EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LATENCY), this.players.stream().filter(new Predicate<ServerPlayer>() {
                      @Override
                      public boolean test(ServerPlayer input) {
@@ -57,7 +57,7 @@ index 3c61cfed065c6df6274ea5a68388469267e60e73..a3c75398898d5593f723196162400973
                  }).collect(Collectors.toList())));
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1b36e94617d4e777c419660936460d5cf8a4b3e8..6a6d07452819c10b3e0dd53e0d759bba9335c74f 100644
+index b7af2d4300facf41a025c8ca322bf6541949b3ab..fbd4d677ef32a306d9f5004486db20dd630b38a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2598,7 +2598,7 @@ public final class CraftServer implements Server {
@@ -70,10 +70,10 @@ index 1b36e94617d4e777c419660936460d5cf8a4b3e8..6a6d07452819c10b3e0dd53e0d759bba
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a0d5082590ee03060f0dbb4770d196efc316c328..7412679974a42973ba0d9c654e02fa41ae8c6adb 100644
+index ad740739437be632fc7fedec488a7d0c49534688..9e0c66ab0fbb81a2ae1dcab5376fa55e27cab562 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -551,7 +551,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -553,7 +553,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          getHandle().listName = name == null ? null : io.papermc.paper.adventure.PaperAdventure.asVanilla(name);
          if (getHandle().connection == null) return; // Updates are possible before the player has fully joined
          for (ServerPlayer player : server.getHandle().players) {
@@ -82,7 +82,7 @@ index a0d5082590ee03060f0dbb4770d196efc316c328..7412679974a42973ba0d9c654e02fa41
                  player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, getHandle()));
              }
          }
-@@ -582,7 +582,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -584,7 +584,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().listName = name.equals(this.getName()) ? null : CraftChatMessage.fromStringOrNull(name);
          if (this.getHandle().connection == null) return; // Paper - Updates are possible before the player has fully joined
          for (ServerPlayer player : (List<ServerPlayer>) this.server.getHandle().players) {
@@ -91,7 +91,7 @@ index a0d5082590ee03060f0dbb4770d196efc316c328..7412679974a42973ba0d9c654e02fa41
                  player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
              }
          }
-@@ -2053,11 +2053,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2052,11 +2052,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Remove this entity from the hidden player's EntityTrackerEntry
          // Paper start
          Entity other = ((CraftEntity) entity).getHandle();
@@ -109,7 +109,7 @@ index a0d5082590ee03060f0dbb4770d196efc316c328..7412679974a42973ba0d9c654e02fa41
          // Paper end
          ChunkMap tracker = ((ServerLevel) this.getHandle().level()).getChunkSource().chunkMap;
          ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
-@@ -2066,7 +2071,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2065,7 +2070,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
 
          // Remove the hidden entity from this player user list, if they're on it