Update to Minecraft 1.19.4

By: md_5 <git@md-5.net>

paper-server/nms-patches/net/minecraft/server/AdvancementDataPlayer.patch

@@ -1,19 +1,19 @@
 --- a/net/minecraft/server/AdvancementDataPlayer.java
 +++ b/net/minecraft/server/AdvancementDataPlayer.java
-@@ -179,7 +179,11 @@
+@@ -144,7 +144,11 @@
                          Advancement advancement = advancementdataworld.getAdvancement((MinecraftKey) entry.getKey());
  
                          if (advancement == null) {
--                            AdvancementDataPlayer.LOGGER.warn("Ignored advancement '{}' in progress file {} - it doesn't exist anymore?", entry.getKey(), this.file);
+-                            AdvancementDataPlayer.LOGGER.warn("Ignored advancement '{}' in progress file {} - it doesn't exist anymore?", entry.getKey(), this.playerSavePath);
 +                            // CraftBukkit start
 +                            if (entry.getKey().getNamespace().equals("minecraft")) {
-+                                AdvancementDataPlayer.LOGGER.warn("Ignored advancement '{}' in progress file {} - it doesn't exist anymore?", entry.getKey(), this.file);
++                                AdvancementDataPlayer.LOGGER.warn("Ignored advancement '{}' in progress file {} - it doesn't exist anymore?", entry.getKey(), this.playerSavePath);
 +                            }
 +                            // CraftBukkit end
                          } else {
                              this.startProgress(advancement, (AdvancementProgress) entry.getValue());
-                         }
-@@ -274,6 +278,7 @@
+                             this.progressChanged.add(advancement);
+@@ -227,6 +231,7 @@
              this.progressChanged.add(advancement);
              flag = true;
              if (!flag1 && advancementprogress.isDone()) {

paper-server/nms-patches/net/minecraft/server/Main.patch

@@ -1,15 +1,15 @@
 --- a/net/minecraft/server/Main.java
 +++ b/net/minecraft/server/Main.java
-@@ -59,6 +59,16 @@
+@@ -64,6 +64,16 @@
  import net.minecraft.world.level.storage.WorldInfo;
  import org.slf4j.Logger;
  
 +// CraftBukkit start
 +import com.google.common.base.Charsets;
-+import com.mojang.bridge.game.PackType;
 +import java.io.InputStreamReader;
 +import java.util.concurrent.atomic.AtomicReference;
 +import net.minecraft.SharedConstants;
++import net.minecraft.server.packs.EnumResourcePackType;
 +import net.minecraft.world.level.dimension.WorldDimension;
 +import org.bukkit.configuration.file.YamlConfiguration;
 +// CraftBukkit end
@@ -17,7 +17,7 @@
  public class Main {
  
      private static final Logger LOGGER = LogUtils.getLogger();
-@@ -66,8 +76,9 @@
+@@ -71,8 +81,9 @@
      public Main() {}
  
      @DontObfuscate
@@ -28,7 +28,7 @@
          OptionParser optionparser = new OptionParser();
          OptionSpec<Void> optionspec = optionparser.accepts("nogui");
          OptionSpec<Void> optionspec1 = optionparser.accepts("initSettings", "Initializes 'server.properties' and 'eula.txt', then quits");
-@@ -92,9 +103,12 @@
+@@ -98,15 +109,18 @@
                  optionparser.printHelpOn(System.err);
                  return;
              }
@@ -36,22 +36,29 @@
 +
 +        try {
  
+-            Path path = (Path) optionset.valueOf(optionspec14);
++            Path path = (Path) optionset.valueOf("pidFile"); // CraftBukkit
+ 
+             if (path != null) {
+                 writePidFile(path);
+             }
+ 
              CrashReport.preload();
 -            if (optionset.has(optionspec13)) {
 +            if (optionset.has("jfrProfile")) { // CraftBukkit
                  JvmProfiler.INSTANCE.start(Environment.SERVER);
              }
  
-@@ -102,13 +116,26 @@
+@@ -114,13 +128,26 @@
              DispenserRegistry.validate();
              SystemUtils.startTimerHackThread();
-             Path path = Paths.get("server.properties");
--            DedicatedServerSettings dedicatedserversettings = new DedicatedServerSettings(path);
+             Path path1 = Paths.get("server.properties");
+-            DedicatedServerSettings dedicatedserversettings = new DedicatedServerSettings(path1);
 +            DedicatedServerSettings dedicatedserversettings = new DedicatedServerSettings(optionset); // CraftBukkit - CLI argument support
  
              dedicatedserversettings.forceSave();
-             Path path1 = Paths.get("eula.txt");
-             EULA eula = new EULA(path1);
+             Path path2 = Paths.get("eula.txt");
+             EULA eula = new EULA(path2);
  
 -            if (optionset.has(optionspec1)) {
 +            if (optionset.has("initSettings")) { // CraftBukkit
@@ -68,10 +75,10 @@
 +                commandsConfiguration.setDefaults(YamlConfiguration.loadConfiguration(new InputStreamReader(Main.class.getClassLoader().getResourceAsStream("configurations/commands.yml"), Charsets.UTF_8)));
 +                commandsConfiguration.save(commandFile);
 +                // CraftBukkit end
-                 Main.LOGGER.info("Initialized '{}' and '{}'", path.toAbsolutePath(), path1.toAbsolutePath());
+                 Main.LOGGER.info("Initialized '{}' and '{}'", path1.toAbsolutePath(), path2.toAbsolutePath());
                  return;
              }
-@@ -118,11 +145,12 @@
+@@ -130,11 +157,12 @@
                  return;
              }
  
@@ -87,7 +94,7 @@
              WorldInfo worldinfo = convertable_conversionsession.getSummary();
  
              if (worldinfo != null) {
-@@ -137,13 +165,31 @@
+@@ -149,13 +177,31 @@
                  }
              }
  
@@ -109,7 +116,7 @@
 +                com.google.common.io.Files.write("{\n"
 +                        + "    \"pack\": {\n"
 +                        + "        \"description\": \"Data pack for resources provided by Bukkit plugins\",\n"
-+                        + "        \"pack_format\": " + SharedConstants.getCurrentVersion().getPackVersion(PackType.DATA) + "\n"
++                        + "        \"pack_format\": " + SharedConstants.getCurrentVersion().getPackVersion(EnumResourcePackType.SERVER_DATA) + "\n"
 +                        + "    }\n"
 +                        + "}\n", mcMeta, com.google.common.base.Charsets.UTF_8);
 +            } catch (java.io.IOException ex) {
@@ -120,7 +127,7 @@
  
              WorldStem worldstem;
  
-@@ -152,6 +198,7 @@
+@@ -164,6 +210,7 @@
  
                  worldstem = (WorldStem) SystemUtils.blockUntilDone((executor) -> {
                      return WorldLoader.load(worldloader_c, (worldloader_a) -> {
@@ -128,7 +135,7 @@
                          IRegistry<WorldDimension> iregistry = worldloader_a.datapackDimensions().registryOrThrow(Registries.LEVEL_STEM);
                          DynamicOps<NBTBase> dynamicops = RegistryOps.create(DynamicOpsNBT.INSTANCE, (HolderLookup.b) worldloader_a.datapackWorldgen());
                          Pair<SaveData, WorldDimensions.b> pair = convertable_conversionsession.getDataTag(dynamicops, worldloader_a.dataConfiguration(), iregistry, worldloader_a.datapackWorldgen().allRegistriesLifecycle());
-@@ -163,7 +210,7 @@
+@@ -175,7 +222,7 @@
                              WorldOptions worldoptions;
                              WorldDimensions worlddimensions;
  
@@ -137,7 +144,7 @@
                                  worldsettings = MinecraftServer.DEMO_SETTINGS;
                                  worldoptions = WorldOptions.DEMO_OPTIONS;
                                  worlddimensions = WorldPresets.createNormalWorldDimensions(worldloader_a.datapackWorldgen());
-@@ -171,7 +218,7 @@
+@@ -183,7 +230,7 @@
                                  DedicatedServerProperties dedicatedserverproperties = dedicatedserversettings.getProperties();
  
                                  worldsettings = new WorldSettings(dedicatedserverproperties.levelName, dedicatedserverproperties.gamemode, dedicatedserverproperties.hardcore, dedicatedserverproperties.difficulty, false, new GameRules(), worldloader_a.dataConfiguration());
@@ -146,7 +153,7 @@
                                  worlddimensions = dedicatedserverproperties.createDimensions(worldloader_a.datapackWorldgen());
                              }
  
-@@ -187,6 +234,7 @@
+@@ -199,6 +246,7 @@
                  return;
              }
  
@@ -154,7 +161,7 @@
              IRegistryCustom.Dimension iregistrycustom_dimension = worldstem.registries().compositeAccess();
  
              if (optionset.has(optionspec4)) {
-@@ -198,21 +246,32 @@
+@@ -210,21 +258,32 @@
              SaveData savedata = worldstem.worldData();
  
              convertable_conversionsession.saveDataTag(iregistrycustom_dimension, savedata);
@@ -189,7 +196,7 @@
              Thread thread = new Thread("Server Shutdown Thread") {
                  public void run() {
                      dedicatedserver.halt(true);
-@@ -221,6 +280,7 @@
+@@ -233,6 +292,7 @@
  
              thread.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(Main.LOGGER));
              Runtime.getRuntime().addShutdownHook(thread);
@@ -197,7 +204,7 @@
          } catch (Exception exception1) {
              Main.LOGGER.error(LogUtils.FATAL_MARKER, "Failed to start the minecraft server", exception1);
          }
-@@ -246,7 +306,7 @@
+@@ -268,7 +328,7 @@
      }
  
      public static void forceUpgrade(Convertable.ConversionSession convertable_conversionsession, DataFixer datafixer, boolean flag, BooleanSupplier booleansupplier, IRegistry<WorldDimension> iregistry) {

paper-server/nms-patches/net/minecraft/server/MinecraftServer.patch

@@ -1,7 +1,7 @@
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -165,6 +165,32 @@
- import org.apache.commons.lang3.Validate;
+ import net.minecraft.world.phys.Vec3D;
  import org.slf4j.Logger;
  
 +// CraftBukkit start
@@ -33,7 +33,7 @@
  public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTask> implements ICommandListener, AutoCloseable {
  
      public static final Logger LOGGER = LogUtils.getLogger();
-@@ -247,6 +273,20 @@
+@@ -250,6 +276,20 @@
      protected SaveData worldData;
      private volatile boolean isSaving;
  
@@ -54,7 +54,7 @@
      public static <S extends MinecraftServer> S spin(Function<Thread, S> function) {
          AtomicReference<S> atomicreference = new AtomicReference();
          Thread thread = new Thread(() -> {
-@@ -260,14 +300,14 @@
+@@ -263,14 +303,14 @@
              thread.setPriority(8);
          }
  
@@ -71,7 +71,7 @@
          super("Server");
          this.metricsRecorder = InactiveMetricsRecorder.INSTANCE;
          this.profiler = this.metricsRecorder.getProfiler();
-@@ -288,7 +328,7 @@
+@@ -290,7 +330,7 @@
          this.frameTimer = new CircularTimer();
          this.registries = worldstem.registries();
          this.worldData = worldstem.worldData();
@@ -80,7 +80,7 @@
              throw new IllegalStateException("Missing Overworld dimension data");
          } else {
              this.proxy = proxy;
-@@ -311,13 +351,40 @@
+@@ -313,13 +353,40 @@
              this.serverThread = thread;
              this.executor = SystemUtils.backgroundExecutor();
          }
@@ -122,7 +122,7 @@
          ScoreboardServer scoreboardserver1 = this.getScoreboard();
  
          Objects.requireNonNull(scoreboardserver1);
-@@ -326,7 +393,7 @@
+@@ -328,7 +395,7 @@
  
      protected abstract boolean initServer() throws IOException;
  
@@ -131,7 +131,7 @@
          if (!JvmProfiler.INSTANCE.isRunning()) {
              ;
          }
-@@ -334,12 +401,8 @@
+@@ -336,12 +403,8 @@
          boolean flag = false;
          ProfiledDuration profiledduration = JvmProfiler.INSTANCE.onWorldLoadedStarted();
  
@@ -145,7 +145,7 @@
          if (profiledduration != null) {
              profiledduration.finish();
          }
-@@ -354,25 +417,183 @@
+@@ -356,25 +419,183 @@
  
      }
  
@@ -223,9 +223,7 @@
 +                        MinecraftServer.LOGGER.info("---- Migration of old " + worldType + " folder failed ----");
 +                    }
 +                }
- 
--        this.levels.put(World.OVERWORLD, worldserver);
--        WorldPersistentData worldpersistentdata = worldserver.getDataStorage();
++
 +                try {
 +                    worldSession = Convertable.createDefault(server.getWorldContainer().toPath()).createAccess(name, dimensionKey);
 +                } catch (IOException ex) {
@@ -235,9 +233,7 @@
 +
 +            org.bukkit.generator.ChunkGenerator gen = this.server.getGenerator(name);
 +            org.bukkit.generator.BiomeProvider biomeProvider = this.server.getBiomeProvider(name);
- 
--        this.readScoreboard(worldpersistentdata);
--        this.commandStorage = new PersistentCommandStorage(worldpersistentdata);
++
 +            WorldDataServer worlddata;
 +            WorldLoader.a worldloader_a = this.worldLoader;
 +            IRegistry<WorldDimension> iregistry = worldloader_a.datapackDimensions().registryOrThrow(Registries.LEVEL_STEM);
@@ -293,9 +289,13 @@
 +            if (dimensionKey == WorldDimension.OVERWORLD) {
 +                this.worldData = worlddata;
 +                this.worldData.setGameType(((DedicatedServer) this).getProperties().gamemode); // From DedicatedServer.init
-+
+ 
+-        this.levels.put(World.OVERWORLD, worldserver);
+-        WorldPersistentData worldpersistentdata = worldserver.getDataStorage();
 +                WorldLoadListener worldloadlistener = this.progressListenerFactory.create(11);
-+
+ 
+-        this.readScoreboard(worldpersistentdata);
+-        this.commandStorage = new PersistentCommandStorage(worldpersistentdata);
 +                world = new WorldServer(this, this.executor, worldSession, iworlddataserver, worldKey, worlddimension, worldloadlistener, flag, j, list, true, org.bukkit.World.Environment.getEnvironment(dimension), gen, biomeProvider);
 +                WorldPersistentData worldpersistentdata = world.getDataStorage();
 +                this.readScoreboard(worldpersistentdata);
@@ -344,7 +344,7 @@
  
          if (!iworlddataserver.isInitialized()) {
              try {
-@@ -396,29 +617,8 @@
+@@ -398,29 +619,8 @@
              iworlddataserver.setInitialized(true);
          }
  
@@ -375,7 +375,7 @@
  
      private static void setInitialSpawn(WorldServer worldserver, IWorldDataServer iworlddataserver, boolean flag, boolean flag1) {
          if (flag1) {
-@@ -426,6 +626,21 @@
+@@ -428,6 +628,21 @@
          } else {
              ChunkProviderServer chunkproviderserver = worldserver.getChunkSource();
              ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(chunkproviderserver.randomState().sampler().findSpawnPosition());
@@ -397,7 +397,7 @@
              int i = chunkproviderserver.getGenerator().getSpawnHeight(worldserver);
  
              if (i < worldserver.getMinBuildHeight()) {
-@@ -485,8 +700,11 @@
+@@ -487,8 +702,11 @@
          iworlddataserver.setGameType(EnumGamemode.SPECTATOR);
      }
  
@@ -411,7 +411,7 @@
  
          MinecraftServer.LOGGER.info("Preparing start region for dimension {}", worldserver.dimension().location());
          BlockPosition blockposition = worldserver.getSharedSpawnPos();
-@@ -496,19 +714,23 @@
+@@ -498,19 +716,23 @@
  
          chunkproviderserver.getLightEngine().setTaskPerBatch(500);
          this.nextTickTime = SystemUtils.getMillis();
@@ -444,7 +444,7 @@
              ForcedChunk forcedchunk = (ForcedChunk) worldserver1.getDataStorage().get(ForcedChunk::load, "chunks");
  
              if (forcedchunk != null) {
-@@ -523,11 +745,18 @@
+@@ -525,11 +747,18 @@
              }
          }
  
@@ -466,7 +466,7 @@
      }
  
      public EnumGamemode getDefaultGameType() {
-@@ -557,12 +786,16 @@
+@@ -559,12 +788,16 @@
              worldserver.save((IProgressUpdate) null, flag1, worldserver.noSave && !flag2);
          }
  
@@ -483,7 +483,7 @@
          if (flag1) {
              Iterator iterator1 = this.getAllLevels().iterator();
  
-@@ -597,12 +830,33 @@
+@@ -599,12 +832,33 @@
          this.stopServer();
      }
  
@@ -517,7 +517,7 @@
          if (this.getConnection() != null) {
              this.getConnection().stop();
          }
-@@ -612,6 +866,7 @@
+@@ -614,6 +868,7 @@
              MinecraftServer.LOGGER.info("Saving players");
              this.playerList.saveAll();
              this.playerList.removeAll();
@@ -525,7 +525,14 @@
          }
  
          MinecraftServer.LOGGER.info("Saving worlds");
-@@ -707,9 +962,10 @@
+@@ -701,15 +956,16 @@
+             }
+ 
+             this.nextTickTime = SystemUtils.getMillis();
+-            this.statusIcon = (ServerPing.a) this.loadStatusIcon().orElse((Object) null);
++            this.statusIcon = (ServerPing.a) this.loadStatusIcon().orElse(null); // CraftBukkit - decompile error
+             this.status = this.buildServerStatus();
+ 
              while (this.running) {
                  long i = SystemUtils.getMillis() - this.nextTickTime;
  
@@ -585,8 +592,8 @@
          this.getProfiler().incrementCounter("runTask");
          super.doRunTask(ticktask);
      }
-@@ -909,7 +1179,7 @@
-             }
+@@ -891,7 +1161,7 @@
+             this.status = this.buildServerStatus();
          }
  
 -        if (this.tickCount % 6000 == 0) {
@@ -594,7 +601,7 @@
              MinecraftServer.LOGGER.debug("Autosave started");
              this.profiler.push("save");
              this.saveEverything(true, false, false);
-@@ -928,22 +1198,39 @@
+@@ -938,22 +1208,39 @@
      }
  
      public void tickChildren(BooleanSupplier booleansupplier) {
@@ -627,14 +634,14 @@
 +            /* Drop global time updates
              if (this.tickCount % 20 == 0) {
                  this.profiler.push("timeSync");
-                 this.playerList.broadcastAll(new PacketPlayOutUpdateTime(worldserver.getGameTime(), worldserver.getDayTime(), worldserver.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)), worldserver.dimension());
+                 this.synchronizeTime(worldserver);
                  this.profiler.pop();
              }
 +            // CraftBukkit end */
  
              this.profiler.push("tick");
  
-@@ -1006,6 +1293,22 @@
+@@ -1033,6 +1320,22 @@
          return (WorldServer) this.levels.get(resourcekey);
      }
  
@@ -657,7 +664,7 @@
      public Set<ResourceKey<World>> levelKeys() {
          return this.levels.keySet();
      }
-@@ -1032,7 +1335,7 @@
+@@ -1059,7 +1362,7 @@
  
      @DontObfuscate
      public String getServerModName() {
@@ -666,7 +673,7 @@
      }
  
      public SystemReport fillSystemReport(SystemReport systemreport) {
-@@ -1370,11 +1673,11 @@
+@@ -1398,11 +1701,11 @@
      public CompletableFuture<Void> reloadResources(Collection<String> collection) {
          IRegistryCustom.Dimension iregistrycustom_dimension = this.registries.getAccessForLoading(RegistryLayer.RELOADABLE);
          CompletableFuture<Void> completablefuture = CompletableFuture.supplyAsync(() -> {
@@ -680,7 +687,7 @@
          }, this).thenCompose((immutablelist) -> {
              ResourceManager resourcemanager = new ResourceManager(EnumResourcePackType.SERVER_DATA, immutablelist);
  
-@@ -1389,6 +1692,7 @@
+@@ -1417,6 +1720,7 @@
          }).thenAcceptAsync((minecraftserver_reloadableresources) -> {
              this.resources.close();
              this.resources = minecraftserver_reloadableresources;
@@ -688,7 +695,7 @@
              this.packRepository.setSelected(collection);
              WorldDataConfiguration worlddataconfiguration = new WorldDataConfiguration(getSelectedPacks(this.packRepository), this.worldData.enabledFeatures());
  
-@@ -1757,7 +2061,7 @@
+@@ -1785,7 +2089,7 @@
              try {
                  label51:
                  {
@@ -697,7 +704,7 @@
  
                      try {
                          arraylist = Lists.newArrayList(NativeModuleLister.listModules());
-@@ -1807,6 +2111,22 @@
+@@ -1835,6 +2139,22 @@
  
      }
  
@@ -720,7 +727,7 @@
      private void startMetricsRecordingTick() {
          if (this.willStartRecordingMetrics) {
              this.metricsRecorder = ActiveMetricsRecorder.createStarted(new ServerMetricsSamplersProvider(SystemUtils.timeSource, this.isDedicatedServer()), SystemUtils.timeSource, SystemUtils.ioPool(), new MetricsPersister("server"), this.onMetricsRecordingStopped, (path) -> {
-@@ -1933,8 +2253,30 @@
+@@ -1961,8 +2281,30 @@
  
      }
  

paper-server/nms-patches/net/minecraft/server/commands/CommandEffect.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/commands/CommandEffect.java
 +++ b/net/minecraft/server/commands/CommandEffect.java
-@@ -76,7 +76,7 @@
+@@ -84,7 +84,7 @@
              if (entity instanceof EntityLiving) {
                  MobEffect mobeffect = new MobEffect(mobeffectlist, k, i, false, flag);
  
@@ -9,7 +9,7 @@
                      ++j;
                  }
              }
-@@ -102,7 +102,7 @@
+@@ -110,7 +110,7 @@
          while (iterator.hasNext()) {
              Entity entity = (Entity) iterator.next();
  
@@ -18,7 +18,7 @@
                  ++i;
              }
          }
-@@ -128,7 +128,7 @@
+@@ -136,7 +136,7 @@
          while (iterator.hasNext()) {
              Entity entity = (Entity) iterator.next();
  

paper-server/nms-patches/net/minecraft/server/commands/CommandLoot.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/commands/CommandLoot.java
 +++ b/net/minecraft/server/commands/CommandLoot.java
-@@ -91,7 +91,7 @@
+@@ -90,7 +90,7 @@
      }
  
      private static <T extends ArgumentBuilder<CommandListenerWrapper, T>> T addTargets(T t0, CommandLoot.c commandloot_c) {
@@ -9,7 +9,7 @@
              return entityReplace(ArgumentEntity.getEntities(commandcontext, "entities"), ArgumentInventorySlot.getSlot(commandcontext, "slot"), list.size(), list, commandloot_a);
          }).then(commandloot_c.construct(net.minecraft.commands.CommandDispatcher.argument("count", IntegerArgumentType.integer(0)), (commandcontext, list, commandloot_a) -> {
              return entityReplace(ArgumentEntity.getEntities(commandcontext, "entities"), ArgumentInventorySlot.getSlot(commandcontext, "slot"), IntegerArgumentType.getInteger(commandcontext, "count"), list, commandloot_a);
-@@ -248,6 +248,7 @@
+@@ -247,6 +247,7 @@
      private static int dropInWorld(CommandListenerWrapper commandlistenerwrapper, Vec3D vec3d, List<ItemStack> list, CommandLoot.a commandloot_a) throws CommandSyntaxException {
          WorldServer worldserver = commandlistenerwrapper.getLevel();
  

paper-server/nms-patches/net/minecraft/server/commands/CommandSpreadPlayers.patch

@@ -21,7 +21,7 @@
 @@ -312,7 +312,7 @@
  
          public boolean isSafe(IBlockAccess iblockaccess, int i) {
-             BlockPosition blockposition = new BlockPosition(this.x, (double) (this.getSpawnY(iblockaccess, i) - 1), this.z);
+             BlockPosition blockposition = BlockPosition.containing(this.x, (double) (this.getSpawnY(iblockaccess, i) - 1), this.z);
 -            IBlockData iblockdata = iblockaccess.getBlockState(blockposition);
 +            IBlockData iblockdata = getBlockState(iblockaccess, blockposition); // CraftBukkit
              Material material = iblockdata.getMaterial();

paper-server/nms-patches/net/minecraft/server/commands/CommandSummon.patch

@@ -8,4 +8,4 @@
 +                if (!worldserver.tryAddFreshEntityWithPassengers(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.COMMAND)) { // CraftBukkit - pass a spawn reason of "COMMAND"
                      throw CommandSummon.ERROR_DUPLICATE_UUID.create();
                  } else {
-                     commandlistenerwrapper.sendSuccess(IChatBaseComponent.translatable("commands.summon.success", entity.getDisplayName()), true);
+                     return entity;

paper-server/nms-patches/net/minecraft/server/commands/CommandTeleport.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/commands/CommandTeleport.java
 +++ b/net/minecraft/server/commands/CommandTeleport.java
-@@ -35,6 +35,12 @@
+@@ -33,6 +33,13 @@
  import net.minecraft.world.phys.Vec2F;
  import net.minecraft.world.phys.Vec3D;
  
@@ -8,27 +8,23 @@
 +import org.bukkit.Location;
 +import org.bukkit.craftbukkit.CraftWorld;
 +import org.bukkit.event.entity.EntityTeleportEvent;
++import org.bukkit.event.player.PlayerTeleportEvent;
 +// CraftBukkit end
 +
  public class CommandTeleport {
  
      private static final SimpleCommandExceptionType INVALID_POSITION = new SimpleCommandExceptionType(IChatBaseComponent.translatable("commands.teleport.invalidPosition"));
-@@ -159,14 +165,29 @@
-                 }
+@@ -147,7 +154,30 @@
+             float f2 = MathHelper.wrapDegrees(f);
+             float f3 = MathHelper.wrapDegrees(f1);
  
-                 if (worldserver == entity.level) {
--                    ((EntityPlayer) entity).connection.teleport(d0, d1, d2, f2, f3, set);
-+                    ((EntityPlayer) entity).connection.teleport(d0, d1, d2, f2, f3, set, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.COMMAND); // CraftBukkit
-                 } else {
--                    ((EntityPlayer) entity).teleportTo(worldserver, d0, d1, d2, f2, f3);
-+                    ((EntityPlayer) entity).teleportTo(worldserver, d0, d1, d2, f2, f3, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.COMMAND); // CraftBukkit
-                 }
- 
-                 entity.setYHeadRot(f2);
-             } else {
-                 float f4 = MathHelper.clamp(f3, -90.0F, 90.0F);
-+                // CraftBukkit start - Teleport event
-+                Location to = new Location(worldserver.getWorld(), d0, d1, d2, f2, f4);
+-            if (entity.teleportTo(worldserver, d0, d1, d2, set, f2, f3)) {
++            // CraftBukkit start - Teleport event
++            boolean result;
++            if (entity instanceof EntityPlayer player) {
++                result = player.teleportTo(worldserver, d0, d1, d2, set, f2, f3, PlayerTeleportEvent.TeleportCause.COMMAND);
++            } else {
++                Location to = new Location(worldserver.getWorld(), d0, d1, d2, f2, f3);
 +                EntityTeleportEvent event = new EntityTeleportEvent(entity.getBukkitEntity(), entity.getBukkitEntity().getLocation(), to);
 +                worldserver.getCraftServer().getPluginManager().callEvent(event);
 +                if (event.isCancelled()) {
@@ -39,9 +35,14 @@
 +                d1 = to.getY();
 +                d2 = to.getZ();
 +                f2 = to.getYaw();
-+                f4 = to.getPitch();
++                f3 = to.getPitch();
 +                worldserver = ((CraftWorld) to.getWorld()).getHandle();
++
++                result = entity.teleportTo(worldserver, d0, d1, d2, set, f2, f3);
++            }
++
++            if (result) {
 +                // CraftBukkit end
- 
-                 if (worldserver == entity.level) {
-                     entity.moveTo(d0, d1, d2, f2, f4);
+                 if (commandteleport_a != null) {
+                     commandteleport_a.perform(commandlistenerwrapper, entity);
+                 }

paper-server/nms-patches/net/minecraft/server/level/EntityPlayer.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/EntityPlayer.java
 +++ b/net/minecraft/server/level/EntityPlayer.java
-@@ -150,6 +150,35 @@
+@@ -155,6 +155,35 @@
  import net.minecraft.world.scores.criteria.IScoreboardCriteria;
  import org.slf4j.Logger;
  
@@ -36,7 +36,7 @@
  public class EntityPlayer extends EntityHuman {
  
      private static final Logger LOGGER = LogUtils.getLogger();
-@@ -207,6 +236,21 @@
+@@ -212,6 +241,21 @@
      public int latency;
      public boolean wonGame;
  
@@ -58,9 +58,9 @@
      public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile) {
          super(worldserver, worldserver.getSharedSpawnPos(), worldserver.getSharedSpawnAngle(), gameprofile);
          this.chatVisibility = EnumChatVisibility.FULL;
-@@ -270,12 +314,56 @@
+@@ -275,12 +319,56 @@
          this.advancements = minecraftserver.getPlayerList().getPlayerAdvancements(this);
-         this.maxUpStep = 1.0F;
+         this.setMaxUpStep(1.0F);
          this.fudgeSpawnLocation(worldserver);
 +
 +        // CraftBukkit start
@@ -116,7 +116,7 @@
              int i = Math.max(0, this.server.getSpawnRadius(worldserver));
              int j = MathHelper.floor(worldserver.getWorldBorder().getDistanceToBorder((double) blockposition.getX(), (double) blockposition.getZ()));
  
-@@ -324,7 +412,7 @@
+@@ -329,7 +417,7 @@
      public void readAdditionalSaveData(NBTTagCompound nbttagcompound) {
          super.readAdditionalSaveData(nbttagcompound);
          if (nbttagcompound.contains("warden_spawn_tracker", 10)) {
@@ -125,7 +125,7 @@
              Logger logger = EntityPlayer.LOGGER;
  
              Objects.requireNonNull(logger);
-@@ -343,17 +431,26 @@
+@@ -348,17 +436,26 @@
          if (nbttagcompound.contains("recipeBook", 10)) {
              this.recipeBook.fromNbt(nbttagcompound.getCompound("recipeBook"), this.server.getRecipeManager());
          }
@@ -153,7 +153,7 @@
                  Logger logger1 = EntityPlayer.LOGGER;
  
                  Objects.requireNonNull(logger1);
-@@ -366,7 +463,7 @@
+@@ -371,7 +468,7 @@
      @Override
      public void addAdditionalSaveData(NBTTagCompound nbttagcompound) {
          super.addAdditionalSaveData(nbttagcompound);
@@ -162,7 +162,7 @@
          Logger logger = EntityPlayer.LOGGER;
  
          Objects.requireNonNull(logger);
-@@ -387,7 +484,20 @@
+@@ -392,7 +489,20 @@
          Entity entity = this.getRootVehicle();
          Entity entity1 = this.getVehicle();
  
@@ -184,7 +184,7 @@
              NBTTagCompound nbttagcompound2 = new NBTTagCompound();
              NBTTagCompound nbttagcompound3 = new NBTTagCompound();
  
-@@ -412,9 +522,33 @@
+@@ -417,9 +527,33 @@
                  nbttagcompound.put("SpawnDimension", nbtbase);
              });
          }
@@ -218,7 +218,7 @@
      public void setExperiencePoints(int i) {
          float f = (float) this.getXpNeededForNextLevel();
          float f1 = (f - 1.0F) / f;
-@@ -473,6 +607,11 @@
+@@ -478,6 +612,11 @@
  
      @Override
      public void tick() {
@@ -230,7 +230,7 @@
          this.gameMode.tick();
          this.wardenSpawnTracker.tick();
          --this.spawnInvulnerableTime;
-@@ -529,7 +668,7 @@
+@@ -534,7 +673,7 @@
              }
  
              if (this.getHealth() != this.lastSentHealth || this.lastSentFood != this.foodData.getFoodLevel() || this.foodData.getSaturationLevel() == 0.0F != this.lastFoodSaturationZero) {
@@ -239,7 +239,7 @@
                  this.lastSentHealth = this.getHealth();
                  this.lastSentFood = this.foodData.getFoodLevel();
                  this.lastFoodSaturationZero = this.foodData.getSaturationLevel() == 0.0F;
-@@ -560,6 +699,12 @@
+@@ -565,6 +704,12 @@
                  this.updateScoreForCriteria(IScoreboardCriteria.EXPERIENCE, MathHelper.ceil((float) this.lastRecordedExperience));
              }
  
@@ -252,7 +252,7 @@
              if (this.experienceLevel != this.lastRecordedLevel) {
                  this.lastRecordedLevel = this.experienceLevel;
                  this.updateScoreForCriteria(IScoreboardCriteria.LEVEL, MathHelper.ceil((float) this.lastRecordedLevel));
-@@ -574,6 +719,20 @@
+@@ -579,6 +724,20 @@
                  CriterionTriggers.LOCATION.trigger(this);
              }
  
@@ -273,7 +273,7 @@
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Ticking player");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.addCategory("Player being ticked");
-@@ -616,7 +775,8 @@
+@@ -621,7 +780,8 @@
      }
  
      private void updateScoreForCriteria(IScoreboardCriteria iscoreboardcriteria, int i) {
@@ -283,7 +283,7 @@
              scoreboardscore.setScore(i);
          });
      }
-@@ -625,9 +785,47 @@
+@@ -630,9 +790,47 @@
      public void die(DamageSource damagesource) {
          this.gameEvent(GameEvent.ENTITY_DIE);
          boolean flag = this.level.getGameRules().getBoolean(GameRules.RULE_SHOWDEATHMESSAGES);
@@ -333,7 +333,7 @@
  
              this.connection.send(new ClientboundPlayerCombatKillPacket(this.getCombatTracker(), ichatbasecomponent), PacketSendListener.exceptionallySend(() -> {
                  boolean flag1 = true;
-@@ -658,12 +856,18 @@
+@@ -663,12 +861,18 @@
          if (this.level.getGameRules().getBoolean(GameRules.RULE_FORGIVE_DEAD_PLAYERS)) {
              this.tellNeutralMobsThatIDied();
          }
@@ -356,7 +356,7 @@
          EntityLiving entityliving = this.getKillCredit();
  
          if (entityliving != null) {
-@@ -701,10 +905,12 @@
+@@ -706,10 +910,12 @@
              String s = this.getScoreboardName();
              String s1 = entity.getScoreboardName();
  
@@ -371,7 +371,7 @@
              } else {
                  this.awardStat(StatisticList.MOB_KILLS);
              }
-@@ -722,7 +928,8 @@
+@@ -727,7 +933,8 @@
              int i = scoreboardteam.getColor().getId();
  
              if (i >= 0 && i < aiscoreboardcriteria.length) {
@@ -381,7 +381,7 @@
              }
          }
  
-@@ -766,18 +973,20 @@
+@@ -777,18 +984,20 @@
      }
  
      private boolean isPvpAllowed() {
@@ -405,7 +405,7 @@
          } else {
              return shapedetectorshape;
          }
-@@ -786,11 +995,20 @@
+@@ -797,11 +1006,20 @@
      @Nullable
      @Override
      public Entity changeDimension(WorldServer worldserver) {
@@ -429,7 +429,7 @@
              this.unRide();
              this.getLevel().removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
              if (!this.wonGame) {
-@@ -801,6 +1019,8 @@
+@@ -812,6 +1030,8 @@
  
              return this;
          } else {
@@ -438,7 +438,7 @@
              WorldData worlddata = worldserver.getLevelData();
  
              this.connection.send(new PacketPlayOutRespawn(worldserver.dimensionTypeId(), worldserver.dimension(), BiomeManager.obfuscateSeed(worldserver.getSeed()), this.gameMode.getGameModeForPlayer(), this.gameMode.getPreviousGameModeForPlayer(), worldserver.isDebug(), worldserver.isFlat(), (byte) 3, this.getLastDeathLocation()));
-@@ -810,20 +1030,50 @@
+@@ -821,20 +1041,50 @@
              playerlist.sendPlayerPermissionLevel(this);
              worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
              this.unsetRemoved();
@@ -455,7 +455,7 @@
                      this.enteredNetherPosition = this.position();
 -                } else if (worldserver.dimension() == World.END) {
 +                } else if (worldserver.getTypeKey() == WorldDimension.END && shapedetectorshape.portalEventInfo != null && shapedetectorshape.portalEventInfo.getCanCreatePortal()) { // CraftBukkit
-                     this.createEndPlatform(worldserver, new BlockPosition(shapedetectorshape.pos));
+                     this.createEndPlatform(worldserver, BlockPosition.containing(shapedetectorshape.pos));
                  }
 +                // CraftBukkit start
 +            } else {
@@ -494,7 +494,7 @@
                  this.connection.resetPosition();
                  worldserver.addDuringPortalTeleport(this);
                  worldserver1.getProfiler().pop();
-@@ -843,39 +1093,66 @@
+@@ -854,39 +1104,66 @@
                  this.lastSentExp = -1;
                  this.lastSentHealth = -1.0F;
                  this.lastSentFood = -1;
@@ -567,7 +567,7 @@
              }
  
              return optional1;
-@@ -885,13 +1162,21 @@
+@@ -896,13 +1173,21 @@
      public void triggerDimensionChangeTriggers(WorldServer worldserver) {
          ResourceKey<World> resourcekey = worldserver.dimension();
          ResourceKey<World> resourcekey1 = this.level.dimension();
@@ -592,7 +592,7 @@
              this.enteredNetherPosition = null;
          }
  
-@@ -908,12 +1193,10 @@
+@@ -919,12 +1204,10 @@
          this.containerMenu.broadcastChanges();
      }
  
@@ -608,7 +608,7 @@
                  return Either.left(EntityHuman.EnumBedResult.NOT_POSSIBLE_HERE);
              } else if (!this.bedInRange(blockposition, enumdirection)) {
                  return Either.left(EntityHuman.EnumBedResult.TOO_FAR_AWAY);
-@@ -937,7 +1220,36 @@
+@@ -948,7 +1231,36 @@
                          }
                      }
  
@@ -646,7 +646,7 @@
                          this.awardStat(StatisticList.SLEEP_IN_BED);
                          CriterionTriggers.SLEPT_IN_BED.trigger(this);
                      });
-@@ -950,9 +1262,8 @@
+@@ -961,9 +1273,8 @@
                      return either;
                  }
              }
@@ -657,7 +657,7 @@
      }
  
      @Override
-@@ -979,6 +1290,24 @@
+@@ -990,6 +1301,24 @@
  
      @Override
      public void stopSleepInBed(boolean flag, boolean flag1) {
@@ -682,7 +682,7 @@
          if (this.isSleeping()) {
              this.getLevel().getChunkSource().broadcastAndSend(this, new PacketPlayOutAnimation(this, 2));
          }
-@@ -1060,8 +1389,9 @@
+@@ -1038,8 +1367,9 @@
          this.connection.send(new PacketPlayOutOpenSignEditor(tileentitysign.getBlockPos()));
      }
  
@@ -693,7 +693,7 @@
      }
  
      @Override
-@@ -1069,13 +1399,35 @@
+@@ -1047,13 +1377,35 @@
          if (itileinventory == null) {
              return OptionalInt.empty();
          } else {
@@ -729,7 +729,7 @@
              if (container == null) {
                  if (this.isSpectator()) {
                      this.displayClientMessage(IChatBaseComponent.translatable("container.spectatorCantOpen").withStyle(EnumChatFormat.RED), true);
-@@ -1083,9 +1435,11 @@
+@@ -1061,9 +1413,11 @@
  
                  return OptionalInt.empty();
              } else {
@@ -743,7 +743,7 @@
                  return OptionalInt.of(this.containerCounter);
              }
          }
-@@ -1098,13 +1452,24 @@
+@@ -1076,13 +1430,24 @@
  
      @Override
      public void openHorseInventory(EntityHorseAbstract entityhorseabstract, IInventory iinventory) {
@@ -770,7 +770,7 @@
          this.initMenu(this.containerMenu);
      }
  
-@@ -1127,6 +1492,7 @@
+@@ -1105,6 +1470,7 @@
  
      @Override
      public void closeContainer() {
@@ -778,7 +778,7 @@
          this.connection.send(new PacketPlayOutCloseWindow(this.containerMenu.containerId));
          this.doCloseContainer();
      }
-@@ -1157,7 +1523,7 @@
+@@ -1135,7 +1501,7 @@
      @Override
      public void awardStat(Statistic<?> statistic, int i) {
          this.stats.increment(this, statistic, i);
@@ -787,7 +787,7 @@
              scoreboardscore.add(i);
          });
      }
-@@ -1165,7 +1531,7 @@
+@@ -1143,7 +1509,7 @@
      @Override
      public void resetStat(Statistic<?> statistic) {
          this.stats.setValue(this, statistic, 0);
@@ -796,7 +796,7 @@
      }
  
      @Override
-@@ -1181,7 +1547,7 @@
+@@ -1159,7 +1525,7 @@
  
          for (int j = 0; j < i; ++j) {
              MinecraftKey minecraftkey = aminecraftkey1[j];
@@ -805,7 +805,7 @@
  
              Objects.requireNonNull(list);
              optional.ifPresent(list::add);
-@@ -1216,6 +1582,7 @@
+@@ -1194,6 +1560,7 @@
  
      public void resetSentInfo() {
          this.lastSentHealth = -1.0E8F;
@@ -813,7 +813,7 @@
      }
  
      @Override
-@@ -1274,7 +1641,7 @@
+@@ -1252,7 +1619,7 @@
          this.lastSentExp = -1;
          this.lastSentHealth = -1.0F;
          this.lastSentFood = -1;
@@ -822,8 +822,33 @@
          this.seenCredits = entityplayer.seenCredits;
          this.enteredNetherPosition = entityplayer.enteredNetherPosition;
          this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft());
-@@ -1415,7 +1782,20 @@
-         return s;
+@@ -1302,6 +1669,12 @@
+ 
+     @Override
+     public boolean teleportTo(WorldServer worldserver, double d0, double d1, double d2, Set<RelativeMovement> set, float f, float f1) {
++        // CraftBukkit start
++        return teleportTo(worldserver, 0, 0, 0, set, 0, 0, TeleportCause.UNKNOWN);
++    }
++
++    public boolean teleportTo(WorldServer worldserver, double d0, double d1, double d2, Set<RelativeMovement> set, float f, float f1, TeleportCause cause) {
++        // CraftBukkit end
+         ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(BlockPosition.containing(d0, d1, d2));
+ 
+         worldserver.getChunkSource().addRegionTicket(TicketType.POST_TELEPORT, chunkcoordintpair, 1, this.getId());
+@@ -1311,9 +1684,9 @@
+         }
+ 
+         if (worldserver == this.level) {
+-            this.connection.teleport(d0, d1, d2, f, f1, set);
++            this.connection.teleport(d0, d1, d2, f, f1, set, cause); // CraftBukkit
+         } else {
+-            this.teleportTo(worldserver, d0, d1, d2, f, f1);
++            this.teleportTo(worldserver, d0, d1, d2, f, f1, cause); // CraftBukkit
+         }
+ 
+         this.setYHeadRot(f);
+@@ -1417,7 +1790,20 @@
+         }
      }
  
 +    public String locale = "en_us"; // CraftBukkit - add, lowercase
@@ -843,16 +868,16 @@
          this.chatVisibility = packetplayinsettings.chatVisibility();
          this.canChatColor = packetplayinsettings.chatColors();
          this.textFilteringEnabled = packetplayinsettings.textFilteringEnabled();
-@@ -1486,7 +1866,7 @@
-         this.camera = (Entity) (entity == null ? this : entity);
-         if (entity1 != this.camera) {
-             this.connection.send(new PacketPlayOutCamera(this.camera));
--            this.connection.teleport(this.camera.getX(), this.camera.getY(), this.camera.getZ(), this.getYRot(), this.getXRot());
-+            this.connection.teleport(this.camera.getX(), this.camera.getY(), this.camera.getZ(), this.getYRot(), this.getXRot(), TeleportCause.SPECTATE); // CraftBukkit
-             this.connection.resetPosition();
-         }
+@@ -1492,7 +1878,7 @@
+             if (world instanceof WorldServer) {
+                 WorldServer worldserver = (WorldServer) world;
  
-@@ -1516,7 +1896,7 @@
+-                this.teleportTo(worldserver, this.camera.getX(), this.camera.getY(), this.camera.getZ(), Set.of(), this.getYRot(), this.getXRot());
++                this.teleportTo(worldserver, this.camera.getX(), this.camera.getY(), this.camera.getZ(), Set.of(), this.getYRot(), this.getXRot(), TeleportCause.SPECTATE); // CraftBukkit
+             }
+ 
+             if (entity != null) {
+@@ -1529,7 +1915,7 @@
  
      @Nullable
      public IChatBaseComponent getTabListDisplayName() {
@@ -861,7 +886,7 @@
      }
  
      @Override
-@@ -1537,9 +1917,16 @@
+@@ -1550,9 +1936,16 @@
          return this.advancements;
      }
  
@@ -878,7 +903,7 @@
          if (worldserver == this.level) {
              this.connection.teleport(d0, d1, d2, f, f1);
          } else {
-@@ -1559,6 +1946,9 @@
+@@ -1572,6 +1965,9 @@
              this.server.getPlayerList().sendLevelInfo(this, worldserver);
              this.server.getPlayerList().sendAllPlayerInfo(this);
          }
@@ -888,9 +913,9 @@
  
      }
  
-@@ -1743,4 +2133,146 @@
-     public RemoteChatSession getChatSession() {
-         return this.chatSession;
+@@ -1762,4 +2158,146 @@
+         this.hurtDir = (float) (MathHelper.atan2(d1, d0) * 57.2957763671875D - (double) this.getYRot());
+         this.connection.send(new ClientboundHurtAnimationPacket(this));
      }
 +
 +    // CraftBukkit start - Add per-player time and weather.

paper-server/nms-patches/net/minecraft/server/level/EntityTrackerEntry.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/EntityTrackerEntry.java
 +++ b/net/minecraft/server/level/EntityTrackerEntry.java
-@@ -42,6 +42,12 @@
+@@ -44,6 +44,12 @@
  import net.minecraft.world.phys.Vec3D;
  import org.slf4j.Logger;
  
@@ -13,7 +13,7 @@
  public class EntityTrackerEntry {
  
      private static final Logger LOGGER = LogUtils.getLogger();
-@@ -63,8 +69,12 @@
+@@ -65,8 +71,12 @@
      private boolean wasOnGround;
      @Nullable
      private List<DataWatcher.b<?>> trackedDataValues;
@@ -27,16 +27,16 @@
          this.ap = Vec3D.ZERO;
          this.lastPassengers = Collections.emptyList();
          this.level = worldserver;
-@@ -85,7 +95,7 @@
+@@ -86,7 +96,7 @@
+         List<Entity> list = this.entity.getPassengers();
  
          if (!list.equals(this.lastPassengers)) {
-             this.lastPassengers = list;
 -            this.broadcast.accept(new PacketPlayOutMount(this.entity));
 +            this.broadcastAndSend(new PacketPlayOutMount(this.entity)); // CraftBukkit
-         }
- 
-         Entity entity = this.entity;
-@@ -93,18 +103,18 @@
+             this.changedPassengers(list, this.lastPassengers).forEach((entity) -> {
+                 if (entity instanceof EntityPlayer) {
+                     EntityPlayer entityplayer = (EntityPlayer) entity;
+@@ -105,18 +115,18 @@
          if (entity instanceof EntityItemFrame) {
              EntityItemFrame entityitemframe = (EntityItemFrame) entity;
  
@@ -59,7 +59,7 @@
  
                              worldmap.tickCarriedBy(entityplayer, itemstack);
                              Packet<?> packet = worldmap.getUpdatePacket(integer, entityplayer);
-@@ -209,7 +219,27 @@
+@@ -229,7 +239,27 @@
  
          ++this.tickCount;
          if (this.entity.hurtMarked) {
@@ -88,17 +88,18 @@
              this.entity.hurtMarked = false;
          }
  
-@@ -224,13 +254,16 @@
-         PlayerConnection playerconnection = entityplayer.connection;
+@@ -252,14 +282,17 @@
+         List<Packet<PacketListenerPlayOut>> list = new ArrayList();
  
-         Objects.requireNonNull(entityplayer.connection);
--        this.sendPairingData(playerconnection::send);
-+        this.sendPairingData(playerconnection::send, entityplayer); // CraftBukkit - add player
+         Objects.requireNonNull(list);
+-        this.sendPairingData(list::add);
++        this.sendPairingData(list::add, entityplayer); // CraftBukkit - add player
+         entityplayer.connection.send(new ClientboundBundlePacket(list));
          this.entity.startSeenByPlayer(entityplayer);
      }
  
--    public void sendPairingData(Consumer<Packet<?>> consumer) {
-+    public void sendPairingData(Consumer<Packet<?>> consumer, EntityPlayer entityplayer) { // CraftBukkit - add player
+-    public void sendPairingData(Consumer<Packet<PacketListenerPlayOut>> consumer) {
++    public void sendPairingData(Consumer<Packet<PacketListenerPlayOut>> consumer, EntityPlayer entityplayer) { // CraftBukkit - add player
          if (this.entity.isRemoved()) {
 -            EntityTrackerEntry.LOGGER.warn("Fetching packet for removed entity {}", this.entity);
 +            // CraftBukkit start - Remove useless error spam, just return
@@ -108,7 +109,7 @@
          }
  
          Packet<PacketListenerPlayOut> packet = this.entity.getAddEntityPacket();
-@@ -246,6 +279,12 @@
+@@ -275,6 +308,12 @@
          if (this.entity instanceof EntityLiving) {
              Collection<AttributeModifiable> collection = ((EntityLiving) this.entity).getAttributes().getSyncableAttributes();
  
@@ -121,7 +122,7 @@
              if (!collection.isEmpty()) {
                  consumer.accept(new PacketPlayOutUpdateAttributes(this.entity.getId(), collection));
              }
-@@ -277,8 +316,14 @@
+@@ -306,8 +345,14 @@
              if (!list.isEmpty()) {
                  consumer.accept(new PacketPlayOutEntityEquipment(this.entity.getId(), list));
              }
@@ -136,7 +137,7 @@
          if (this.entity instanceof EntityLiving) {
              EntityLiving entityliving = (EntityLiving) this.entity;
              Iterator iterator = entityliving.getActiveEffects().iterator();
-@@ -321,6 +366,11 @@
+@@ -350,6 +395,11 @@
              Set<AttributeModifiable> set = ((EntityLiving) this.entity).getAttributes().getDirtyAttributes();
  
              if (!set.isEmpty()) {

paper-server/nms-patches/net/minecraft/server/level/PlayerChunkMap.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/net/minecraft/server/level/PlayerChunkMap.java
-@@ -106,6 +106,12 @@
+@@ -109,6 +109,12 @@
  import org.apache.commons.lang3.mutable.MutableObject;
  import org.slf4j.Logger;
  
@@ -13,7 +13,7 @@
  public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.e {
  
      private static final byte CHUNK_TYPE_REPLACEABLE = -1;
-@@ -149,6 +155,27 @@
+@@ -152,6 +158,27 @@
      private final Queue<Runnable> unloadQueue;
      int viewDistance;
  
@@ -41,7 +41,7 @@
      public PlayerChunkMap(WorldServer worldserver, Convertable.ConversionSession convertable_conversionsession, DataFixer datafixer, StructureTemplateManager structuretemplatemanager, Executor executor, IAsyncTaskHandler<Runnable> iasynctaskhandler, ILightAccess ilightaccess, ChunkGenerator chunkgenerator, WorldLoadListener worldloadlistener, ChunkStatusUpdateListener chunkstatusupdatelistener, Supplier<WorldPersistentData> supplier, int i, boolean flag) {
          super(convertable_conversionsession.getDimensionPath(worldserver.dimension()).resolve("region"), datafixer, flag);
          this.visibleChunkMap = this.updatingChunkMap.clone();
-@@ -167,6 +194,11 @@
+@@ -170,6 +197,11 @@
          this.storageName = path.getFileName().toString();
          this.level = worldserver;
          this.generator = chunkgenerator;
@@ -53,7 +53,7 @@
          IRegistryCustom iregistrycustom = worldserver.registryAccess();
          long j = worldserver.getSeed();
  
-@@ -326,9 +358,12 @@
+@@ -329,9 +361,12 @@
          CompletableFuture<List<Either<IChunkAccess, PlayerChunk.Failure>>> completablefuture1 = SystemUtils.sequence(list);
          CompletableFuture<Either<List<IChunkAccess>, PlayerChunk.Failure>> completablefuture2 = completablefuture1.thenApply((list2) -> {
              List<IChunkAccess> list3 = Lists.newArrayList();
@@ -68,7 +68,7 @@
                  final Either<IChunkAccess, PlayerChunk.Failure> either = (Either) iterator.next();
  
                  if (either == null) {
-@@ -533,7 +568,7 @@
+@@ -536,7 +571,7 @@
  
      private void scheduleUnload(long i, PlayerChunk playerchunk) {
          CompletableFuture<IChunkAccess> completablefuture = playerchunk.getChunkToSave();
@@ -77,7 +77,7 @@
              CompletableFuture<IChunkAccess> completablefuture1 = playerchunk.getChunkToSave();
  
              if (completablefuture1 != completablefuture) {
-@@ -622,9 +657,9 @@
+@@ -625,9 +660,9 @@
                  ProtoChunk protochunk = ChunkRegionLoader.read(this.level, this.poiManager, chunkcoordintpair, (NBTTagCompound) optional.get());
  
                  this.markPosition(chunkcoordintpair, protochunk.getStatus().getChunkType());
@@ -89,7 +89,7 @@
              }
          }, this.mainThreadExecutor).exceptionallyAsync((throwable) -> {
              return this.handleChunkLoadFailure(throwable, chunkcoordintpair);
-@@ -730,7 +765,21 @@
+@@ -733,7 +768,21 @@
  
      private static void postLoadProtoChunk(WorldServer worldserver, List<NBTTagCompound> list) {
          if (!list.isEmpty()) {
@@ -112,7 +112,7 @@
          }
  
      }
-@@ -829,7 +878,7 @@
+@@ -832,7 +881,7 @@
          if (!playerchunk.wasAccessibleSinceLastSave()) {
              return false;
          } else {
@@ -121,7 +121,7 @@
  
              if (!(ichunkaccess instanceof ProtoChunkExtension) && !(ichunkaccess instanceof Chunk)) {
                  return false;
-@@ -991,7 +1040,8 @@
+@@ -994,7 +1043,8 @@
                  return ichunkaccess instanceof Chunk ? Optional.of((Chunk) ichunkaccess) : Optional.empty();
              });
  
@@ -131,7 +131,7 @@
                  return chunk.getBlockEntities().size();
              }).orElse(0), tickingtracker.getTicketDebugString(i), tickingtracker.getLevel(i), optional1.map((chunk) -> {
                  return chunk.getBlockTicks().count();
-@@ -1004,7 +1054,7 @@
+@@ -1007,7 +1057,7 @@
  
      private static String printFuture(CompletableFuture<Either<Chunk, PlayerChunk.Failure>> completablefuture) {
          try {
@@ -140,7 +140,7 @@
  
              return either != null ? (String) either.map((chunk) -> {
                  return "done";
-@@ -1020,12 +1070,14 @@
+@@ -1023,12 +1073,14 @@
  
      private CompletableFuture<Optional<NBTTagCompound>> readChunk(ChunkCoordIntPair chunkcoordintpair) {
          return this.read(chunkcoordintpair).thenApplyAsync((optional) -> {
@@ -158,7 +158,7 @@
      }
  
      boolean anyPlayerCloseEnoughForSpawning(ChunkCoordIntPair chunkcoordintpair) {
-@@ -1471,7 +1523,7 @@
+@@ -1482,7 +1534,7 @@
          public final Set<ServerPlayerConnection> seenBy = Sets.newIdentityHashSet();
  
          public EntityTracker(Entity entity, int i, int j, boolean flag) {
@@ -167,7 +167,7 @@
              this.entity = entity;
              this.range = i;
              this.lastSectionPos = SectionPosition.of((EntityAccess) entity);
-@@ -1530,6 +1582,11 @@
+@@ -1541,6 +1593,11 @@
                  double d2 = d0 * d0;
                  boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(entityplayer);
  

paper-server/nms-patches/net/minecraft/server/level/WorldServer.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/WorldServer.java
 +++ b/net/minecraft/server/level/WorldServer.java
-@@ -156,6 +156,26 @@
+@@ -159,6 +159,26 @@
  import net.minecraft.world.ticks.TickListServer;
  import org.slf4j.Logger;
  
@@ -27,7 +27,7 @@
  public class WorldServer extends World implements GeneratorAccessSeed {
  
      public static final BlockPosition END_SPAWN_POINT = new BlockPosition(100, 50, 0);
-@@ -173,7 +193,7 @@
+@@ -172,7 +192,7 @@
      final List<EntityPlayer> players;
      private final ChunkProviderServer chunkSource;
      private final MinecraftServer server;
@@ -36,11 +36,12 @@
      final EntityTickList entityTickList;
      public final PersistentEntitySectionManager<Entity> entityManager;
      private final GameEventDispatcher gameEventDispatcher;
-@@ -197,11 +217,28 @@
+@@ -196,12 +216,30 @@
      private final StructureCheck structureCheck;
      private final boolean tickTime;
  
 -    public WorldServer(MinecraftServer minecraftserver, Executor executor, Convertable.ConversionSession convertable_conversionsession, IWorldDataServer iworlddataserver, ResourceKey<World> resourcekey, WorldDimension worlddimension, WorldLoadListener worldloadlistener, boolean flag, long i, List<MobSpawner> list, boolean flag1) {
+-        IRegistryCustom.Dimension iregistrycustom_dimension = minecraftserver.registryAccess();
 -        Holder holder = worlddimension.type();
 +    // CraftBukkit start
 +    public final Convertable.ConversionSession convertable;
@@ -56,12 +57,14 @@
 +    }
  
 -        Objects.requireNonNull(minecraftserver);
--        super(iworlddataserver, resourcekey, holder, minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates());
+-        super(iworlddataserver, resourcekey, iregistrycustom_dimension, holder, minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates());
 +    // Add env and gen to constructor, IWorldDataServer -> WorldDataServer
 +    public WorldServer(MinecraftServer minecraftserver, Executor executor, Convertable.ConversionSession convertable_conversionsession, WorldDataServer iworlddataserver, ResourceKey<World> resourcekey, WorldDimension worlddimension, WorldLoadListener worldloadlistener, boolean flag, long i, List<MobSpawner> list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
++        // IRegistryCustom.Dimension iregistrycustom_dimension = minecraftserver.registryAccess(); // CraftBukkit - decompile error
 +        // Holder holder = worlddimension.type(); // CraftBukkit - decompile error
++
 +        // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
-+        super(iworlddataserver, resourcekey, worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env);
++        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env);
 +        this.pvpMode = minecraftserver.isPvpAllowed();
 +        convertable = convertable_conversionsession;
 +        uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
@@ -69,7 +72,7 @@
          this.players = Lists.newArrayList();
          this.entityTickList = new EntityTickList();
          this.blockTicks = new TickListServer<>(this::isPositionTickingWithEntitiesLoaded, this.getProfilerSupplier());
-@@ -215,6 +252,22 @@
+@@ -215,6 +253,22 @@
          this.customSpawners = list;
          this.serverLevelData = iworlddataserver;
          ChunkGenerator chunkgenerator = worlddimension.generator();
@@ -92,7 +95,7 @@
          boolean flag2 = minecraftserver.forceSynchronousWrites();
          DataFixer datafixer = minecraftserver.getFixerUpper();
          EntityPersistentStorage<Entity> entitypersistentstorage = new EntityStorage(this, convertable_conversionsession.getDimensionPath(resourcekey).resolve("entities"), datafixer, flag2, minecraftserver);
-@@ -246,15 +299,16 @@
+@@ -246,15 +300,16 @@
          long l = minecraftserver.getWorldData().worldGenOptions().seed();
  
          this.structureCheck = new StructureCheck(this.chunkSource.chunkScanner(), this.registryAccess(), minecraftserver.getStructureManager(), resourcekey, chunkgenerator, this.chunkSource.randomState(), this, chunkgenerator.getBiomeSource(), l, datafixer);
@@ -112,7 +115,7 @@
      }
  
      public void setWeatherParameters(int i, int j, boolean flag, boolean flag1) {
-@@ -286,12 +340,20 @@
+@@ -286,12 +341,20 @@
          long j;
  
          if (this.sleepStatus.areEnoughSleeping(i) && this.sleepStatus.areEnoughDeepSleeping(i, this.players)) {
@@ -136,7 +139,7 @@
              if (this.getGameRules().getBoolean(GameRules.RULE_WEATHER_CYCLE) && this.isRaining()) {
                  this.resetWeatherCycle();
              }
-@@ -317,7 +379,7 @@
+@@ -317,7 +380,7 @@
          this.runBlockEvents();
          this.handlingTick = false;
          gameprofilerfiller.pop();
@@ -145,7 +148,7 @@
  
          if (flag) {
              this.resetEmptyTime();
-@@ -333,7 +395,7 @@
+@@ -333,7 +396,7 @@
  
              this.entityTickList.forEach((entity) -> {
                  if (!entity.isRemoved()) {
@@ -154,7 +157,7 @@
                          entity.discard();
                      } else {
                          gameprofilerfiller.push("checkDespawn");
-@@ -405,7 +467,7 @@
+@@ -405,7 +468,7 @@
  
      private void wakeUpAllPlayers() {
          this.sleepStatus.removeAllSleepers();
@@ -163,7 +166,7 @@
              entityplayer.stopSleepInBed(false, false);
          });
      }
-@@ -433,7 +495,7 @@
+@@ -433,7 +496,7 @@
                          entityhorseskeleton.setTrap(true);
                          entityhorseskeleton.setAge(0);
                          entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
@@ -172,7 +175,7 @@
                      }
                  }
  
-@@ -442,7 +504,7 @@
+@@ -442,7 +505,7 @@
                  if (entitylightning != null) {
                      entitylightning.moveTo(Vec3D.atBottomCenterOf(blockposition));
                      entitylightning.setVisualOnly(flag1);
@@ -181,7 +184,7 @@
                  }
              }
          }
-@@ -456,7 +518,7 @@
+@@ -456,7 +519,7 @@
              BiomeBase biomebase = (BiomeBase) this.getBiome(blockposition).value();
  
              if (biomebase.shouldFreeze(this, blockposition1)) {
@@ -190,7 +193,7 @@
              }
  
              if (flag) {
-@@ -471,10 +533,10 @@
+@@ -471,10 +534,10 @@
                              IBlockData iblockdata1 = (IBlockData) iblockdata.setValue(BlockSnow.LAYERS, l + 1);
  
                              Block.pushEntitiesUp(iblockdata, iblockdata1, this, blockposition);
@@ -203,7 +206,7 @@
                      }
                  }
  
-@@ -671,6 +733,7 @@
+@@ -670,6 +733,7 @@
              this.rainLevel = MathHelper.clamp(this.rainLevel, 0.0F, 1.0F);
          }
  
@@ -211,7 +214,7 @@
          if (this.oRainLevel != this.rainLevel) {
              this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, this.rainLevel), this.dimension());
          }
-@@ -689,14 +752,47 @@
+@@ -688,14 +752,47 @@
              this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, this.rainLevel));
              this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.THUNDER_LEVEL_CHANGE, this.thunderLevel));
          }
@@ -261,7 +264,7 @@
      }
  
      public void resetEmptyTime() {
-@@ -731,6 +827,7 @@
+@@ -730,6 +827,7 @@
          });
          gameprofilerfiller.incrementCounter("tickNonPassenger");
          entity.tick();
@@ -269,7 +272,7 @@
          this.getProfiler().pop();
          Iterator iterator = entity.getPassengers().iterator();
  
-@@ -754,6 +851,7 @@
+@@ -753,6 +851,7 @@
                  });
                  gameprofilerfiller.incrementCounter("tickPassenger");
                  entity1.rideTick();
@@ -277,7 +280,7 @@
                  gameprofilerfiller.pop();
                  Iterator iterator = entity1.getPassengers().iterator();
  
-@@ -778,6 +876,7 @@
+@@ -777,6 +876,7 @@
          ChunkProviderServer chunkproviderserver = this.getChunkSource();
  
          if (!flag1) {
@@ -285,7 +288,7 @@
              if (iprogressupdate != null) {
                  iprogressupdate.progressStartNoAbort(IChatBaseComponent.translatable("menu.savingLevel"));
              }
-@@ -795,11 +894,19 @@
+@@ -794,11 +894,19 @@
              }
  
          }
@@ -306,7 +309,7 @@
          }
  
          this.getChunkSource().getDataStorage().save();
-@@ -864,15 +971,37 @@
+@@ -863,15 +971,37 @@
  
      @Override
      public boolean addFreshEntity(Entity entity) {
@@ -347,7 +350,7 @@
      }
  
      public void addDuringCommandTeleport(EntityPlayer entityplayer) {
-@@ -903,24 +1032,37 @@
+@@ -902,24 +1032,37 @@
          this.entityManager.addNewEntity(entityplayer);
      }
  
@@ -389,7 +392,7 @@
              return true;
          }
      }
-@@ -934,10 +1076,32 @@
+@@ -933,10 +1076,32 @@
          entityplayer.remove(entity_removalreason);
      }
  
@@ -422,7 +425,7 @@
          while (iterator.hasNext()) {
              EntityPlayer entityplayer = (EntityPlayer) iterator.next();
  
-@@ -946,6 +1110,12 @@
+@@ -945,6 +1110,12 @@
                  double d1 = (double) blockposition.getY() - entityplayer.getY();
                  double d2 = (double) blockposition.getZ() - entityplayer.getZ();
  
@@ -435,7 +438,7 @@
                  if (d0 * d0 + d1 * d1 + d2 * d2 < 1024.0D) {
                      entityplayer.connection.send(new PacketPlayOutBlockBreakAnimation(i, blockposition, j));
                  }
-@@ -1005,7 +1175,18 @@
+@@ -1004,7 +1175,18 @@
              Iterator iterator = this.navigatingMobs.iterator();
  
              while (iterator.hasNext()) {
@@ -455,7 +458,7 @@
                  NavigationAbstract navigationabstract = entityinsentient.getNavigation();
  
                  if (navigationabstract.shouldRecomputePath(blockposition)) {
-@@ -1062,6 +1243,11 @@
+@@ -1066,6 +1248,11 @@
      @Override
      public Explosion explode(@Nullable Entity entity, @Nullable DamageSource damagesource, @Nullable ExplosionDamageCalculator explosiondamagecalculator, double d0, double d1, double d2, float f, boolean flag, World.a world_a) {
          Explosion explosion = this.explode(entity, damagesource, explosiondamagecalculator, d0, d1, d2, f, flag, world_a, false);
@@ -467,7 +470,7 @@
  
          if (!explosion.interactsWithBlocks()) {
              explosion.clearToBlow();
-@@ -1134,13 +1320,20 @@
+@@ -1138,13 +1325,20 @@
      }
  
      public <T extends ParticleParam> int sendParticles(T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6) {
@@ -490,7 +493,7 @@
                  ++j;
              }
          }
-@@ -1191,7 +1384,7 @@
+@@ -1195,7 +1389,7 @@
  
      @Nullable
      public BlockPosition findNearestMapStructure(TagKey<Structure> tagkey, BlockPosition blockposition, int i, boolean flag) {
@@ -499,7 +502,7 @@
              return null;
          } else {
              Optional<HolderSet.Named<Structure>> optional = this.registryAccess().registryOrThrow(Registries.STRUCTURE).getTag(tagkey);
-@@ -1233,11 +1426,21 @@
+@@ -1232,11 +1426,21 @@
      @Nullable
      @Override
      public WorldMap getMapData(String s) {
@@ -522,7 +525,7 @@
          this.getServer().overworld().getDataStorage().set(s, worldmap);
      }
  
-@@ -1535,6 +1738,11 @@
+@@ -1534,6 +1738,11 @@
      @Override
      public void blockUpdated(BlockPosition blockposition, Block block) {
          if (!this.isDebug()) {
@@ -534,7 +537,7 @@
              this.updateNeighborsAt(blockposition, block);
          }
  
-@@ -1554,12 +1762,12 @@
+@@ -1553,12 +1762,12 @@
      }
  
      public boolean isFlat() {
@@ -549,7 +552,7 @@
      }
  
      @Nullable
-@@ -1582,7 +1790,7 @@
+@@ -1581,7 +1790,7 @@
      private static <T> String getTypeCount(Iterable<T> iterable, Function<T, String> function) {
          try {
              Object2IntOpenHashMap<String> object2intopenhashmap = new Object2IntOpenHashMap();
@@ -558,7 +561,7 @@
  
              while (iterator.hasNext()) {
                  T t0 = iterator.next();
-@@ -1591,7 +1799,7 @@
+@@ -1590,7 +1799,7 @@
                  object2intopenhashmap.addTo(s, 1);
              }
  
@@ -567,7 +570,7 @@
                  String s1 = (String) entry.getKey();
  
                  return s1 + ":" + entry.getIntValue();
-@@ -1602,17 +1810,33 @@
+@@ -1601,17 +1810,33 @@
      }
  
      public static void makeObsidianPlatform(WorldServer worldserver) {
@@ -603,7 +606,7 @@
      }
  
      @Override
-@@ -1728,6 +1952,7 @@
+@@ -1727,6 +1952,7 @@
              }
  
              entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
@@ -611,7 +614,7 @@
          }
  
          public void onTrackingEnd(Entity entity) {
-@@ -1764,6 +1989,14 @@
+@@ -1763,6 +1989,14 @@
              }
  
              entity.updateDynamicGameEventListener(DynamicGameEventListener::remove);

paper-server/nms-patches/net/minecraft/server/network/HandshakeListener.patch

@@ -1,7 +1,7 @@
 --- a/net/minecraft/server/network/HandshakeListener.java
 +++ b/net/minecraft/server/network/HandshakeListener.java
-@@ -10,8 +10,17 @@
- import net.minecraft.network.protocol.login.PacketLoginOutDisconnect;
+@@ -11,8 +11,17 @@
+ import net.minecraft.network.protocol.status.ServerPing;
  import net.minecraft.server.MinecraftServer;
  
 +// CraftBukkit start
@@ -18,7 +18,7 @@
      private static final IChatBaseComponent IGNORE_STATUS_REASON = IChatBaseComponent.literal("Ignoring status request");
      private final MinecraftServer server;
      private final NetworkManager connection;
-@@ -23,9 +32,44 @@
+@@ -24,9 +33,44 @@
  
      @Override
      public void handleIntention(PacketHandshakingInSetProtocol packethandshakinginsetprotocol) {

paper-server/nms-patches/net/minecraft/server/network/LoginListener.patch

@@ -25,8 +25,8 @@
 +    // CraftBukkit end
 +
      @Override
-     public NetworkManager getConnection() {
-         return this.connection;
+     public boolean isAcceptingMessages() {
+         return this.connection.isConnected();
 @@ -104,10 +117,12 @@
              this.gameProfile = this.createFakeProfile(this.gameProfile);
          }

paper-server/nms-patches/net/minecraft/server/network/PacketStatusListener.patch

@@ -1,15 +1,18 @@
 --- a/net/minecraft/server/network/PacketStatusListener.java
 +++ b/net/minecraft/server/network/PacketStatusListener.java
-@@ -9,6 +9,18 @@
+@@ -9,6 +9,21 @@
  import net.minecraft.network.protocol.status.PacketStatusOutServerInfo;
- import net.minecraft.server.MinecraftServer;
+ import net.minecraft.network.protocol.status.ServerPing;
  
 +// CraftBukkit start
 +import com.mojang.authlib.GameProfile;
 +import java.net.InetSocketAddress;
++import java.util.Collections;
 +import java.util.Iterator;
++import java.util.Optional;
 +import net.minecraft.SharedConstants;
 +import net.minecraft.network.protocol.status.ServerPing;
++import net.minecraft.server.MinecraftServer;
 +import net.minecraft.server.level.EntityPlayer;
 +import org.bukkit.craftbukkit.util.CraftChatMessage;
 +import org.bukkit.craftbukkit.util.CraftIconCache;
@@ -19,13 +22,14 @@
  public class PacketStatusListener implements PacketStatusInListener {
  
      private static final IChatBaseComponent DISCONNECT_REASON = IChatBaseComponent.translatable("multiplayer.status.request_handled");
-@@ -35,7 +47,102 @@
+@@ -35,7 +50,101 @@
              this.connection.disconnect(PacketStatusListener.DISCONNECT_REASON);
          } else {
              this.hasRequestedStatus = true;
--            this.connection.send(new PacketStatusOutServerInfo(this.server.getStatus()));
+-            this.connection.send(new PacketStatusOutServerInfo(this.status));
 +            // CraftBukkit start
-+            // this.connection.send(new PacketStatusOutServerInfo(this.server.getStatus()));
++            // this.connection.send(new PacketStatusOutServerInfo(this.status));
++            MinecraftServer server = MinecraftServer.getServer();
 +            final Object[] players = server.getPlayerList().players.toArray();
 +            class ServerListPingEvent extends org.bukkit.event.server.ServerListPingEvent {
 +
@@ -92,7 +96,7 @@
 +            }
 +
 +            ServerListPingEvent event = new ServerListPingEvent();
-+            this.server.server.getPluginManager().callEvent(event);
++            server.server.getPluginManager().callEvent(event);
 +
 +            java.util.List<GameProfile> profiles = new java.util.ArrayList<GameProfile>(players.length);
 +            for (Object player : players) {
@@ -106,17 +110,15 @@
 +                }
 +            }
 +
-+            ServerPing.ServerPingPlayerSample playerSample = new ServerPing.ServerPingPlayerSample(event.getMaxPlayers(), profiles.size());
-+            if (!this.server.hidesOnlinePlayers()) {
-+                playerSample.setSample(profiles.toArray(new GameProfile[profiles.size()]));
-+            }
++            ServerPing.ServerPingPlayerSample playerSample = new ServerPing.ServerPingPlayerSample(event.getMaxPlayers(), profiles.size(), (server.hidesOnlinePlayers()) ? Collections.emptyList() : profiles);
 +
-+            ServerPing ping = new ServerPing();
-+            ping.setFavicon(event.icon.value);
-+            ping.setDescription(CraftChatMessage.fromString(event.getMotd(), true)[0]);
-+            ping.setPlayers(playerSample);
-+            int version = SharedConstants.getCurrentVersion().getProtocolVersion();
-+            ping.setVersion(new ServerPing.ServerData(server.getServerModName() + " " + server.getServerVersion(), version));
++            ServerPing ping = new ServerPing(
++                    CraftChatMessage.fromString(event.getMotd(), true)[0],
++                    Optional.of(playerSample),
++                    Optional.of(new ServerPing.ServerData(server.getServerModName() + " " + server.getServerVersion(), SharedConstants.getCurrentVersion().getProtocolVersion())),
++                    (event.icon.value != null) ? Optional.of(new ServerPing.a(event.icon.value)) : Optional.empty(),
++                    server.enforceSecureProfile()
++            );
 +
 +            this.connection.send(new PacketStatusOutServerInfo(ping));
 +            // CraftBukkit end

paper-server/nms-patches/net/minecraft/server/network/PlayerConnection.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/network/PlayerConnection.java
 +++ b/net/minecraft/server/network/PlayerConnection.java
-@@ -182,6 +182,67 @@
+@@ -184,6 +184,67 @@
  import net.minecraft.world.phys.shapes.VoxelShapes;
  import org.slf4j.Logger;
  
@@ -68,7 +68,7 @@
  public class PlayerConnection implements ServerPlayerConnection, TickablePacketListener, PacketListenerPlayIn {
  
      static final Logger LOGGER = LogUtils.getLogger();
-@@ -198,7 +259,9 @@
+@@ -200,7 +261,9 @@
      private long keepAliveTime;
      private boolean keepAlivePending;
      private long keepAliveChallenge;
@@ -79,7 +79,7 @@
      private int dropSpamTickCount;
      private double firstGoodX;
      private double firstGoodY;
-@@ -244,8 +307,31 @@
+@@ -246,8 +309,31 @@
          this.keepAliveTime = SystemUtils.getMillis();
          entityplayer.getTextFilter().join();
          this.signedMessageDecoder = minecraftserver.enforceSecureProfile() ? SignedMessageChain.b.REJECT_ALL : SignedMessageChain.b.unsigned(entityplayer.getUUID());
@@ -112,7 +112,7 @@
  
      @Override
      public void tick() {
-@@ -300,7 +386,7 @@
+@@ -302,7 +388,7 @@
          this.server.getProfiler().push("keepAlive");
          long i = SystemUtils.getMillis();
  
@@ -121,7 +121,7 @@
              if (this.keepAlivePending) {
                  this.disconnect(IChatBaseComponent.translatable("disconnect.timeout"));
              } else {
-@@ -312,15 +398,21 @@
+@@ -314,15 +400,21 @@
          }
  
          this.server.getProfiler().pop();
@@ -143,7 +143,7 @@
              this.disconnect(IChatBaseComponent.translatable("multiplayer.disconnect.idling"));
          }
  
-@@ -344,16 +436,67 @@
+@@ -346,16 +438,67 @@
          return this.server.isSingleplayerOwner(this.player.getGameProfile());
      }
  
@@ -212,7 +212,7 @@
      }
  
      private <T, R> CompletableFuture<R> filterTextPacket(T t0, BiFunction<ITextFilter, T, CompletableFuture<R>> bifunction) {
-@@ -417,7 +560,34 @@
+@@ -419,7 +562,34 @@
                  double d9 = entity.getDeltaMovement().lengthSqr();
                  double d10 = d6 * d6 + d7 * d7 + d8 * d8;
  
@@ -248,7 +248,7 @@
                      PlayerConnection.LOGGER.warn("{} (vehicle of {}) moved too quickly! {},{},{}", new Object[]{entity.getName().getString(), this.player.getName().getString(), d6, d7, d8});
                      this.connection.send(new PacketPlayOutVehicleMove(entity));
                      return;
-@@ -449,14 +619,72 @@
+@@ -451,14 +621,72 @@
                  }
  
                  entity.absMoveTo(d3, d4, d5, f, f1);
@@ -321,7 +321,7 @@
                  this.player.getLevel().getChunkSource().move(this.player);
                  this.player.checkMovementStatistics(this.player.getX() - d0, this.player.getY() - d1, this.player.getZ() - d2);
                  this.clientVehicleIsFloating = d11 >= -0.03125D && !flag1 && !this.server.isFlightAllowed() && !entity.isNoGravity() && this.noBlocksAround(entity);
-@@ -490,6 +718,7 @@
+@@ -492,6 +720,7 @@
              }
  
              this.awaitingPositionFromClient = null;
@@ -329,7 +329,7 @@
          }
  
      }
-@@ -497,7 +726,7 @@
+@@ -499,7 +728,7 @@
      @Override
      public void handleRecipeBookSeenRecipePacket(PacketPlayInRecipeDisplayed packetplayinrecipedisplayed) {
          PlayerConnectionUtils.ensureRunningOnSameThread(packetplayinrecipedisplayed, this, this.player.getLevel());
@@ -338,7 +338,7 @@
          RecipeBookServer recipebookserver = this.player.getRecipeBook();
  
          Objects.requireNonNull(recipebookserver);
-@@ -527,6 +756,12 @@
+@@ -529,6 +758,12 @@
      @Override
      public void handleCustomCommandSuggestions(PacketPlayInTabComplete packetplayintabcomplete) {
          PlayerConnectionUtils.ensureRunningOnSameThread(packetplayintabcomplete, this, this.player.getLevel());
@@ -351,7 +351,7 @@
          StringReader stringreader = new StringReader(packetplayintabcomplete.getCommand());
  
          if (stringreader.canRead() && stringreader.peek() == '/') {
-@@ -536,6 +771,7 @@
+@@ -538,6 +773,7 @@
          ParseResults<CommandListenerWrapper> parseresults = this.server.getCommands().getDispatcher().parse(stringreader, this.player.createCommandSourceStack());
  
          this.server.getCommands().getDispatcher().getCompletionSuggestions(parseresults).thenAccept((suggestions) -> {
@@ -359,7 +359,7 @@
              this.connection.send(new PacketPlayOutTabComplete(packetplayintabcomplete.getId(), suggestions));
          });
      }
-@@ -785,6 +1021,13 @@
+@@ -787,6 +1023,13 @@
  
          if (container instanceof ContainerMerchant) {
              ContainerMerchant containermerchant = (ContainerMerchant) container;
@@ -373,7 +373,7 @@
  
              if (!containermerchant.stillValid(this.player)) {
                  PlayerConnection.LOGGER.debug("Player {} interacted with invalid menu {}", this.player, containermerchant);
-@@ -799,6 +1042,13 @@
+@@ -801,6 +1044,13 @@
  
      @Override
      public void handleEditBook(PacketPlayInBEdit packetplayinbedit) {
@@ -387,7 +387,7 @@
          int i = packetplayinbedit.getSlot();
  
          if (PlayerInventory.isHotbarSlot(i) || i == 40) {
-@@ -807,7 +1057,7 @@
+@@ -809,7 +1059,7 @@
  
              Objects.requireNonNull(list);
              optional.ifPresent(list::add);
@@ -396,7 +396,7 @@
  
              Objects.requireNonNull(list);
              stream.forEach(list::add);
-@@ -825,7 +1075,7 @@
+@@ -827,7 +1077,7 @@
          ItemStack itemstack = this.player.getInventory().getItem(i);
  
          if (itemstack.is(Items.WRITABLE_BOOK)) {
@@ -405,7 +405,7 @@
          }
      }
  
-@@ -850,16 +1100,16 @@
+@@ -852,16 +1102,16 @@
  
              this.updateBookPages(list, (s) -> {
                  return IChatBaseComponent.ChatSerializer.toJson(IChatBaseComponent.literal(s));
@@ -426,7 +426,7 @@
                  return NBTTagString.valueOf((String) unaryoperator.apply(filteredtext.filteredOrEmpty()));
              });
  
-@@ -885,6 +1135,7 @@
+@@ -887,6 +1137,7 @@
          }
  
          itemstack.addTagElement("pages", nbttaglist);
@@ -434,7 +434,7 @@
      }
  
      @Override
-@@ -921,7 +1172,7 @@
+@@ -923,7 +1174,7 @@
          } else {
              WorldServer worldserver = this.player.getLevel();
  
@@ -443,7 +443,7 @@
                  if (this.tickCount == 0) {
                      this.resetPosition();
                  }
-@@ -931,7 +1182,7 @@
+@@ -933,7 +1184,7 @@
                          this.awaitingTeleportTime = this.tickCount;
                          this.teleport(this.awaitingPositionFromClient.x, this.awaitingPositionFromClient.y, this.awaitingPositionFromClient.z, this.player.getYRot(), this.player.getXRot());
                      }
@@ -452,7 +452,7 @@
                  } else {
                      this.awaitingTeleportTime = this.tickCount;
                      double d0 = clampHorizontal(packetplayinflying.getX(this.player.getX()));
-@@ -943,7 +1194,15 @@
+@@ -945,7 +1196,15 @@
                      if (this.player.isPassenger()) {
                          this.player.absMoveTo(this.player.getX(), this.player.getY(), this.player.getZ(), f, f1);
                          this.player.getLevel().getChunkSource().move(this.player);
@@ -468,7 +468,7 @@
                          double d3 = this.player.getX();
                          double d4 = this.player.getY();
                          double d5 = this.player.getZ();
-@@ -963,15 +1222,33 @@
+@@ -965,15 +1224,33 @@
                              ++this.receivedMovePacketCount;
                              int i = this.receivedMovePacketCount - this.knownMovePacketCount;
  
@@ -504,7 +504,7 @@
                                      PlayerConnection.LOGGER.warn("{} moved too quickly! {},{},{}", new Object[]{this.player.getName().getString(), d7, d8, d9});
                                      this.teleport(this.player.getX(), this.player.getY(), this.player.getZ(), this.player.getYRot(), this.player.getXRot());
                                      return;
-@@ -992,6 +1269,7 @@
+@@ -994,6 +1271,7 @@
                              boolean flag1 = this.player.verticalCollisionBelow;
  
                              this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
@@ -512,12 +512,12 @@
                              double d12 = d8;
  
                              d7 = d0 - this.player.getX();
-@@ -1011,9 +1289,72 @@
+@@ -1013,9 +1291,72 @@
  
                              this.player.absMoveTo(d0, d1, d2, f, f1);
                              if (!this.player.noPhysics && !this.player.isSleeping() && (flag2 && worldserver.noCollision(this.player, axisalignedbb) || this.isPlayerCollidingWithAnythingNew(worldserver, axisalignedbb))) {
 -                                this.teleport(d3, d4, d5, f, f1);
-+                                this.internalTeleport(d3, d4, d5, f, f1, Collections.emptySet(), false); // CraftBukkit - SPIGOT-1807: Don't call teleport event, when the client thinks the player is falling, because the chunks are not loaded on the client yet.
++                                this.internalTeleport(d3, d4, d5, f, f1, Collections.emptySet()); // CraftBukkit - SPIGOT-1807: Don't call teleport event, when the client thinks the player is falling, because the chunks are not loaded on the client yet.
                                  this.player.doCheckFallDamage(this.player.getY() - d6, packetplayinflying.isOnGround());
                              } else {
 +                                // CraftBukkit start - fire PlayerMoveEvent
@@ -586,40 +586,25 @@
                                  this.clientIsFloating = d12 >= -0.03125D && !flag1 && this.player.gameMode.getGameModeForPlayer() != EnumGamemode.SPECTATOR && !this.server.isFlightAllowed() && !this.player.getAbilities().mayfly && !this.player.hasEffect(MobEffects.LEVITATION) && !this.player.isFallFlying() && !this.player.isAutoSpinAttack() && this.noBlocksAround(this.player);
                                  this.player.getLevel().getChunkSource().move(this.player);
                                  this.player.doCheckFallDamage(this.player.getY() - d6, packetplayinflying.isOnGround());
-@@ -1052,19 +1393,80 @@
+@@ -1054,11 +1395,68 @@
          return true;
      }
  
 +    // CraftBukkit start - Delegate to teleport(Location)
-     public void dismount(double d0, double d1, double d2, float f, float f1) {
--        this.teleport(d0, d1, d2, f, f1, Collections.emptySet(), true);
-+        this.dismount(d0, d1, d2, f, f1, PlayerTeleportEvent.TeleportCause.DISMOUNT);
-+    }
-+
-+    public void dismount(double d0, double d1, double d2, float f, float f1, PlayerTeleportEvent.TeleportCause cause) {
-+        this.teleport(d0, d1, d2, f, f1, Collections.emptySet(), true, cause);
-     }
- 
      public void teleport(double d0, double d1, double d2, float f, float f1) {
--        this.teleport(d0, d1, d2, f, f1, Collections.emptySet(), false);
+-        this.teleport(d0, d1, d2, f, f1, Collections.emptySet());
 +        this.teleport(d0, d1, d2, f, f1, PlayerTeleportEvent.TeleportCause.UNKNOWN);
 +    }
 +
 +    public void teleport(double d0, double d1, double d2, float f, float f1, PlayerTeleportEvent.TeleportCause cause) {
-+        this.teleport(d0, d1, d2, f, f1, Collections.emptySet(), false, cause);
++        this.teleport(d0, d1, d2, f, f1, Collections.emptySet(), cause);
      }
  
-     public void teleport(double d0, double d1, double d2, float f, float f1, Set<PacketPlayOutPosition.EnumPlayerTeleportFlags> set) {
--        this.teleport(d0, d1, d2, f, f1, set, false);
+     public void teleport(double d0, double d1, double d2, float f, float f1, Set<RelativeMovement> set) {
 +        this.teleport(d0, d1, d2, f, f1, set, PlayerTeleportEvent.TeleportCause.UNKNOWN);
 +    }
 +
-+    public void teleport(double d0, double d1, double d2, float f, float f1, Set<PacketPlayOutPosition.EnumPlayerTeleportFlags> set, PlayerTeleportEvent.TeleportCause cause) {
-+        this.teleport(d0, d1, d2, f, f1, set, false, cause);
-     }
- 
--    public void teleport(double d0, double d1, double d2, float f, float f1, Set<PacketPlayOutPosition.EnumPlayerTeleportFlags> set, boolean flag) {
-+    public boolean teleport(double d0, double d1, double d2, float f, float f1, Set<PacketPlayOutPosition.EnumPlayerTeleportFlags> set, boolean flag, PlayerTeleportEvent.TeleportCause cause) { // CraftBukkit - Return event status
++    public boolean teleport(double d0, double d1, double d2, float f, float f1, Set<RelativeMovement> set, PlayerTeleportEvent.TeleportCause cause) { // CraftBukkit - Return event status
 +        Player player = this.getCraftPlayer();
 +        Location from = player.getLocation();
 +
@@ -632,7 +617,7 @@
 +        Location to = new Location(this.getCraftPlayer().getWorld(), x, y, z, yaw, pitch);
 +        // SPIGOT-5171: Triggered on join
 +        if (from.equals(to)) {
-+            this.internalTeleport(d0, d1, d2, f, f1, set, flag);
++            this.internalTeleport(d0, d1, d2, f, f1, set);
 +            return false; // CraftBukkit - Return event status
 +        }
 +
@@ -649,15 +634,15 @@
 +            f1 = to.getPitch();
 +        }
 +
-+        this.internalTeleport(d0, d1, d2, f, f1, set, flag);
++        this.internalTeleport(d0, d1, d2, f, f1, set);
 +        return event.isCancelled(); // CraftBukkit - Return event status
 +    }
 +
 +    public void teleport(Location dest) {
-+        internalTeleport(dest.getX(), dest.getY(), dest.getZ(), dest.getYaw(), dest.getPitch(), Collections.<PacketPlayOutPosition.EnumPlayerTeleportFlags>emptySet(), true);
++        internalTeleport(dest.getX(), dest.getY(), dest.getZ(), dest.getYaw(), dest.getPitch(), Collections.emptySet());
 +    }
 +
-+    private void internalTeleport(double d0, double d1, double d2, float f, float f1, Set<PacketPlayOutPosition.EnumPlayerTeleportFlags> set, boolean flag) {
++    private void internalTeleport(double d0, double d1, double d2, float f, float f1, Set<RelativeMovement> set) {
 +        // CraftBukkit start
 +        if (Float.isNaN(f)) {
 +            f = 0;
@@ -668,10 +653,10 @@
 +
 +        this.justTeleported = true;
 +        // CraftBukkit end
-         double d3 = set.contains(PacketPlayOutPosition.EnumPlayerTeleportFlags.X) ? this.player.getX() : 0.0D;
-         double d4 = set.contains(PacketPlayOutPosition.EnumPlayerTeleportFlags.Y) ? this.player.getY() : 0.0D;
-         double d5 = set.contains(PacketPlayOutPosition.EnumPlayerTeleportFlags.Z) ? this.player.getZ() : 0.0D;
-@@ -1076,6 +1478,14 @@
+         double d3 = set.contains(RelativeMovement.X) ? this.player.getX() : 0.0D;
+         double d4 = set.contains(RelativeMovement.Y) ? this.player.getY() : 0.0D;
+         double d5 = set.contains(RelativeMovement.Z) ? this.player.getZ() : 0.0D;
+@@ -1070,6 +1468,14 @@
              this.awaitingTeleport = 0;
          }
  
@@ -685,8 +670,8 @@
 +
          this.awaitingTeleportTime = this.tickCount;
          this.player.absMoveTo(d0, d1, d2, f, f1);
-         this.player.connection.send(new PacketPlayOutPosition(d0 - d3, d1 - d4, d2 - d5, f - f2, f1 - f3, set, this.awaitingTeleport, flag));
-@@ -1084,6 +1494,7 @@
+         this.player.connection.send(new PacketPlayOutPosition(d0 - d3, d1 - d4, d2 - d5, f - f2, f1 - f3, set, this.awaitingTeleport));
+@@ -1078,6 +1484,7 @@
      @Override
      public void handlePlayerAction(PacketPlayInBlockDig packetplayinblockdig) {
          PlayerConnectionUtils.ensureRunningOnSameThread(packetplayinblockdig, this, this.player.getLevel());
@@ -694,7 +679,7 @@
          BlockPosition blockposition = packetplayinblockdig.getPos();
  
          this.player.resetLastActionTime();
-@@ -1094,14 +1505,46 @@
+@@ -1088,14 +1495,46 @@
                  if (!this.player.isSpectator()) {
                      ItemStack itemstack = this.player.getItemInHand(EnumHand.OFF_HAND);
  
@@ -743,7 +728,7 @@
                      this.player.drop(false);
                  }
  
-@@ -1139,6 +1582,7 @@
+@@ -1133,6 +1572,7 @@
      @Override
      public void handleUseItemOn(PacketPlayInUseItem packetplayinuseitem) {
          PlayerConnectionUtils.ensureRunningOnSameThread(packetplayinuseitem, this, this.player.getLevel());
@@ -751,7 +736,7 @@
          this.player.connection.ackBlockChangesUpTo(packetplayinuseitem.getSequence());
          WorldServer worldserver = this.player.getLevel();
          EnumHand enumhand = packetplayinuseitem.getHand();
-@@ -1162,6 +1606,7 @@
+@@ -1156,6 +1596,7 @@
  
                      if (blockposition.getY() < i) {
                          if (this.awaitingPositionFromClient == null && this.player.distanceToSqr((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D) < 64.0D && worldserver.mayInteract(this.player, blockposition)) {
@@ -759,7 +744,7 @@
                              EnumInteractionResult enuminteractionresult = this.player.gameMode.useItemOn(this.player, worldserver, itemstack, enumhand, movingobjectpositionblock);
  
                              if (enumdirection == EnumDirection.UP && !enuminteractionresult.consumesAction() && blockposition.getY() >= i - 1 && wasBlockPlacementAttempt(this.player, itemstack)) {
-@@ -1190,6 +1635,7 @@
+@@ -1184,6 +1625,7 @@
      @Override
      public void handleUseItem(PacketPlayInBlockPlace packetplayinblockplace) {
          PlayerConnectionUtils.ensureRunningOnSameThread(packetplayinblockplace, this, this.player.getLevel());
@@ -767,7 +752,7 @@
          this.ackBlockChangesUpTo(packetplayinblockplace.getSequence());
          WorldServer worldserver = this.player.getLevel();
          EnumHand enumhand = packetplayinblockplace.getHand();
-@@ -1197,6 +1643,49 @@
+@@ -1191,6 +1633,49 @@
  
          this.player.resetLastActionTime();
          if (!itemstack.isEmpty() && itemstack.isItemEnabled(worldserver.enabledFeatures())) {
@@ -817,7 +802,7 @@
              EnumInteractionResult enuminteractionresult = this.player.gameMode.useItem(this.player, worldserver, itemstack, enumhand);
  
              if (enuminteractionresult.shouldSwing()) {
-@@ -1217,7 +1706,7 @@
+@@ -1211,7 +1696,7 @@
                  Entity entity = packetplayinspectate.getEntity(worldserver);
  
                  if (entity != null) {
@@ -826,7 +811,7 @@
                      return;
                  }
              }
-@@ -1232,6 +1721,7 @@
+@@ -1226,6 +1711,7 @@
              PlayerConnection.LOGGER.info("Disconnecting {} due to resource pack rejection", this.player.getName());
              this.disconnect(IChatBaseComponent.translatable("multiplayer.requiredTexturePrompt.disconnect"));
          }
@@ -834,7 +819,7 @@
  
      }
  
-@@ -1251,12 +1741,27 @@
+@@ -1247,12 +1733,27 @@
  
      @Override
      public void onDisconnect(IChatBaseComponent ichatbasecomponent) {
@@ -863,7 +848,7 @@
          this.player.getTextFilter().leave();
          if (this.isSingleplayerOwner()) {
              PlayerConnection.LOGGER.info("Stopping singleplayer server as player logged out");
-@@ -1279,6 +1784,15 @@
+@@ -1275,6 +1776,15 @@
      }
  
      public void send(Packet<?> packet, @Nullable PacketSendListener packetsendlistener) {
@@ -879,7 +864,7 @@
          try {
              this.connection.send(packet, packetsendlistener);
          } catch (Throwable throwable) {
-@@ -1295,7 +1809,16 @@
+@@ -1291,7 +1801,16 @@
      @Override
      public void handleSetCarriedItem(PacketPlayInHeldItemSlot packetplayinhelditemslot) {
          PlayerConnectionUtils.ensureRunningOnSameThread(packetplayinhelditemslot, this, this.player.getLevel());
@@ -896,7 +881,7 @@
              if (this.player.getInventory().selected != packetplayinhelditemslot.getSlot() && this.player.getUsedItemHand() == EnumHand.MAIN_HAND) {
                  this.player.stopUsingItem();
              }
-@@ -1304,18 +1827,25 @@
+@@ -1300,18 +1819,25 @@
              this.player.resetLastActionTime();
          } else {
              PlayerConnection.LOGGER.warn("{} tried to set an invalid carried item", this.player.getName().getString());
@@ -923,7 +908,7 @@
                      PlayerChatMessage playerchatmessage;
  
                      try {
-@@ -1333,9 +1863,9 @@
+@@ -1329,9 +1855,9 @@
                              PlayerChatMessage playerchatmessage1 = playerchatmessage.withUnsignedContent((IChatBaseComponent) completablefuture1.join()).filter(((FilteredText) completablefuture.join()).mask());
  
                              this.broadcastChatMessage(playerchatmessage1);
@@ -935,7 +920,7 @@
              }
  
          }
-@@ -1359,12 +1889,25 @@
+@@ -1355,12 +1881,25 @@
      }
  
      private void performChatCommand(ServerboundChatCommandPacket serverboundchatcommandpacket, LastSeenMessages lastseenmessages) {
@@ -963,7 +948,7 @@
          } catch (SignedMessageChain.a signedmessagechain_a) {
              this.handleMessageDecodeFailure(signedmessagechain_a);
              return;
-@@ -1372,10 +1915,10 @@
+@@ -1368,10 +1907,10 @@
  
          CommandSigningContext.a commandsigningcontext_a = new CommandSigningContext.a(map);
  
@@ -976,16 +961,16 @@
      }
  
      private void handleMessageDecodeFailure(SignedMessageChain.a signedmessagechain_a) {
-@@ -1413,7 +1956,7 @@
-             PlayerConnection.LOGGER.warn("{} sent out-of-order chat: '{}'", this.player.getName().getString(), s);
-             this.disconnect(IChatBaseComponent.translatable("multiplayer.disconnect.out_of_order_chat"));
-             return Optional.empty();
--        } else if (this.player.getChatVisibility() == EnumChatVisibility.HIDDEN) {
-+        } else if (this.player.isRemoved() || this.player.getChatVisibility() == EnumChatVisibility.HIDDEN) { // CraftBukkit - dead men tell no tales
-             this.send(new ClientboundSystemChatPacket(IChatBaseComponent.translatable("chat.disabled.options").withStyle(EnumChatFormat.RED), false));
-             return Optional.empty();
+@@ -1412,7 +1951,7 @@
          } else {
-@@ -1462,6 +2005,122 @@
+             Optional<LastSeenMessages> optional = this.unpackAndApplyLastSeen(lastseenmessages_b);
+ 
+-            if (this.player.getChatVisibility() == EnumChatVisibility.HIDDEN) {
++            if (this.player.isRemoved() || this.player.getChatVisibility() == EnumChatVisibility.HIDDEN) { // CraftBukkit - dead men tell no tales
+                 this.send(new ClientboundSystemChatPacket(IChatBaseComponent.translatable("chat.disabled.options").withStyle(EnumChatFormat.RED), false));
+                 return Optional.empty();
+             } else {
+@@ -1460,6 +1999,122 @@
          return false;
      }
  
@@ -1108,7 +1093,7 @@
      private PlayerChatMessage getSignedMessage(PacketPlayInChat packetplayinchat, LastSeenMessages lastseenmessages) throws SignedMessageChain.a {
          SignedMessageBody signedmessagebody = new SignedMessageBody(packetplayinchat.message(), packetplayinchat.timeStamp(), packetplayinchat.salt(), lastseenmessages);
  
-@@ -1469,13 +2128,33 @@
+@@ -1467,13 +2122,33 @@
      }
  
      private void broadcastChatMessage(PlayerChatMessage playerchatmessage) {
@@ -1145,7 +1130,7 @@
              this.disconnect(IChatBaseComponent.translatable("disconnect.spam"));
          }
  
-@@ -1497,13 +2176,59 @@
+@@ -1495,13 +2170,59 @@
      @Override
      public void handleAnimate(PacketPlayInArmAnimation packetplayinarmanimation) {
          PlayerConnectionUtils.ensureRunningOnSameThread(packetplayinarmanimation, this, this.player.getLevel());
@@ -1203,9 +1188,9 @@
 +        }
 +        // CraftBukkit end
          this.player.resetLastActionTime();
+         Entity entity;
          IJumpable ijumpable;
- 
-@@ -1583,6 +2308,12 @@
+@@ -1583,6 +2304,12 @@
      }
  
      public void sendPlayerChatMessage(PlayerChatMessage playerchatmessage, ChatMessageType.a chatmessagetype_a) {
@@ -1218,7 +1203,7 @@
          this.send(new ClientboundPlayerChatPacket(playerchatmessage.link().sender(), playerchatmessage.link().index(), playerchatmessage.signature(), playerchatmessage.signedBody().pack(this.messageSignatureCache), playerchatmessage.unsignedContent(), playerchatmessage.filterMask(), chatmessagetype_a.toNetwork(this.player.level.registryAccess())));
          this.addPendingMessage(playerchatmessage);
      }
-@@ -1594,6 +2325,7 @@
+@@ -1598,6 +2325,7 @@
      @Override
      public void handleInteract(PacketPlayInUseEntity packetplayinuseentity) {
          PlayerConnectionUtils.ensureRunningOnSameThread(packetplayinuseentity, this, this.player.getLevel());
@@ -1226,9 +1211,9 @@
          final WorldServer worldserver = this.player.getLevel();
          final Entity entity = packetplayinuseentity.getTarget(worldserver);
  
-@@ -1606,13 +2338,51 @@
+@@ -1612,13 +2340,51 @@
  
-             if (entity.distanceToSqr(this.player.getEyePosition()) < PlayerConnection.MAX_INTERACTION_DISTANCE) {
+             if (axisalignedbb.distanceToSqr(this.player.getEyePosition()) < PlayerConnection.MAX_INTERACTION_DISTANCE) {
                  packetplayinuseentity.dispatch(new PacketPlayInUseEntity.c() {
 -                    private void performInteraction(EnumHand enumhand, PlayerConnection.a playerconnection_a) {
 +                    private void performInteraction(EnumHand enumhand, PlayerConnection.a playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit
@@ -1279,7 +1264,7 @@
                              if (enuminteractionresult.consumesAction()) {
                                  CriterionTriggers.PLAYER_INTERACTED_WITH_ENTITY.trigger(PlayerConnection.this.player, itemstack1, entity);
                                  if (enuminteractionresult.shouldSwing()) {
-@@ -1625,23 +2395,29 @@
+@@ -1631,23 +2397,29 @@
  
                      @Override
                      public void onInteraction(EnumHand enumhand) {
@@ -1312,7 +1297,7 @@
                              }
                          } else {
                              PlayerConnection.this.disconnect(IChatBaseComponent.translatable("multiplayer.disconnect.invalid_entity_attacked"));
-@@ -1687,15 +2463,21 @@
+@@ -1693,15 +2465,21 @@
      @Override
      public void handleContainerClose(PacketPlayInCloseWindow packetplayinclosewindow) {
          PlayerConnectionUtils.ensureRunningOnSameThread(packetplayinclosewindow, this, this.player.getLevel());
@@ -1336,7 +1321,7 @@
                  this.player.containerMenu.sendAllDataToRemote();
              } else if (!this.player.containerMenu.stillValid(this.player)) {
                  PlayerConnection.LOGGER.debug("Player {} interacted with invalid menu {}", this.player, this.player.containerMenu);
-@@ -1708,7 +2490,284 @@
+@@ -1714,7 +2492,284 @@
                      boolean flag = packetplayinwindowclick.getStateId() != this.player.containerMenu.getStateId();
  
                      this.player.containerMenu.suppressRemoteUpdates();
@@ -1622,7 +1607,7 @@
                      ObjectIterator objectiterator = Int2ObjectMaps.fastIterable(packetplayinwindowclick.getChangedSlots()).iterator();
  
                      while (objectiterator.hasNext()) {
-@@ -1748,6 +2807,7 @@
+@@ -1754,6 +2809,7 @@
      @Override
      public void handleContainerButtonClick(PacketPlayInEnchantItem packetplayinenchantitem) {
          PlayerConnectionUtils.ensureRunningOnSameThread(packetplayinenchantitem, this, this.player.getLevel());
@@ -1630,7 +1615,7 @@
          this.player.resetLastActionTime();
          if (this.player.containerMenu.containerId == packetplayinenchantitem.getContainerId() && !this.player.isSpectator()) {
              if (!this.player.containerMenu.stillValid(this.player)) {
-@@ -1790,6 +2850,43 @@
+@@ -1796,6 +2852,43 @@
  
              boolean flag1 = packetplayinsetcreativeslot.getSlotNum() >= 1 && packetplayinsetcreativeslot.getSlotNum() <= 45;
              boolean flag2 = itemstack.isEmpty() || itemstack.getDamageValue() >= 0 && itemstack.getCount() <= 64 && !itemstack.isEmpty();
@@ -1673,8 +1658,8 @@
 +            // CraftBukkit end
  
              if (flag1 && flag2) {
-                 this.player.inventoryMenu.getSlot(packetplayinsetcreativeslot.getSlotNum()).set(itemstack);
-@@ -1812,6 +2909,7 @@
+                 this.player.inventoryMenu.getSlot(packetplayinsetcreativeslot.getSlotNum()).setByPlayer(itemstack);
+@@ -1818,6 +2911,7 @@
      }
  
      private void updateSignText(PacketPlayInUpdateSign packetplayinupdatesign, List<FilteredText> list) {
@@ -1682,7 +1667,7 @@
          this.player.resetLastActionTime();
          WorldServer worldserver = this.player.getLevel();
          BlockPosition blockposition = packetplayinupdatesign.getPos();
-@@ -1828,18 +2926,37 @@
+@@ -1834,18 +2928,37 @@
  
              if (!tileentitysign.isEditable() || !this.player.getUUID().equals(tileentitysign.getPlayerWhoMayEdit())) {
                  PlayerConnection.LOGGER.warn("Player {} just tried to change non-editable sign", this.player.getName().getString());
@@ -1722,7 +1707,7 @@
  
              tileentitysign.setChanged();
              worldserver.sendBlockUpdated(blockposition, iblockdata, iblockdata, 3);
-@@ -1849,6 +2966,7 @@
+@@ -1855,6 +2968,7 @@
  
      @Override
      public void handleKeepAlive(PacketPlayInKeepAlive packetplayinkeepalive) {
@@ -1730,7 +1715,7 @@
          if (this.keepAlivePending && packetplayinkeepalive.getId() == this.keepAliveChallenge) {
              int i = (int) (SystemUtils.getMillis() - this.keepAliveTime);
  
-@@ -1863,7 +2981,17 @@
+@@ -1869,7 +2983,17 @@
      @Override
      public void handlePlayerAbilities(PacketPlayInAbilities packetplayinabilities) {
          PlayerConnectionUtils.ensureRunningOnSameThread(packetplayinabilities, this, this.player.getLevel());
@@ -1749,7 +1734,7 @@
      }
  
      @Override
-@@ -1872,8 +3000,50 @@
+@@ -1878,8 +3002,50 @@
          this.player.updateOptions(packetplayinsettings);
      }
  

paper-server/nms-patches/net/minecraft/server/network/ServerConnection.patch

@@ -1,12 +1,14 @@
 --- a/net/minecraft/server/network/ServerConnection.java
 +++ b/net/minecraft/server/network/ServerConnection.java
-@@ -98,14 +98,24 @@
-                     int j = ServerConnection.this.server.getRateLimitPacketsPerSecond();
-                     Object object = j > 0 ? new NetworkManagerServer(j) : new NetworkManager(EnumProtocolDirection.SERVERBOUND);
+@@ -95,16 +95,26 @@
  
--                    ServerConnection.this.connections.add(object);
-+                    ServerConnection.this.connections.add((NetworkManager) object); // CraftBukkit - decompile error
-                     channel.pipeline().addLast("packet_handler", (ChannelHandler) object);
+                     NetworkManager.configureSerialization(channelpipeline, EnumProtocolDirection.SERVERBOUND);
+                     int j = ServerConnection.this.server.getRateLimitPacketsPerSecond();
+-                    Object object = j > 0 ? new NetworkManagerServer(j) : new NetworkManager(EnumProtocolDirection.SERVERBOUND);
++                    NetworkManager object = j > 0 ? new NetworkManagerServer(j) : new NetworkManager(EnumProtocolDirection.SERVERBOUND); // CraftBukkit - decompile error
+ 
+                     ServerConnection.this.connections.add(object);
+                     channelpipeline.addLast("packet_handler", (ChannelHandler) object);
                      ((NetworkManager) object).setListener(new HandshakeListener(ServerConnection.this.server, (NetworkManager) object));
                  }
 -            }).group((EventLoopGroup) lazyinitvar.get()).localAddress(inetaddress, i)).bind().syncUninterruptibly());

paper-server/nms-patches/net/minecraft/server/players/PlayerList.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -107,6 +107,25 @@
+@@ -108,6 +108,25 @@
  import net.minecraft.world.scores.ScoreboardTeamBase;
  import org.slf4j.Logger;
  
@@ -26,7 +26,7 @@
  public abstract class PlayerList {
  
      public static final File USERBANLIST_FILE = new File("banned-players.json");
-@@ -118,14 +137,16 @@
+@@ -119,14 +138,16 @@
      private static final int SEND_PLAYER_INFO_INTERVAL = 600;
      private static final SimpleDateFormat BAN_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd 'at' HH:mm:ss z");
      private final MinecraftServer server;
@@ -46,7 +46,7 @@
      public final WorldNBTStorage playerIo;
      private boolean doWhiteList;
      private final LayeredRegistryAccess<RegistryLayer> registries;
-@@ -137,13 +158,23 @@
+@@ -138,13 +159,23 @@
      private static final boolean ALLOW_LOGOUTIVATOR = false;
      private int sendAllPlayerInfoIn;
  
@@ -72,7 +72,7 @@
          this.server = minecraftserver;
          this.registries = layeredregistryaccess;
          this.synchronizedRegistries = (new IRegistryCustom.c(RegistrySynchronization.networkedRegistries(layeredregistryaccess))).freeze();
-@@ -160,9 +191,15 @@
+@@ -161,9 +192,15 @@
          usercache.add(gameprofile);
          NBTTagCompound nbttagcompound = this.load(entityplayer);
          ResourceKey resourcekey;
@@ -89,7 +89,7 @@
              Logger logger = PlayerList.LOGGER;
  
              Objects.requireNonNull(logger);
-@@ -189,7 +226,8 @@
+@@ -190,7 +227,8 @@
              s1 = networkmanager.getRemoteAddress().toString();
          }
  
@@ -99,7 +99,7 @@
          WorldData worlddata = worldserver1.getLevelData();
  
          entityplayer.loadGameTypes(nbttagcompound);
-@@ -199,6 +237,7 @@
+@@ -200,6 +238,7 @@
          boolean flag1 = gamerules.getBoolean(GameRules.RULE_REDUCEDDEBUGINFO);
  
          playerconnection.send(new PacketPlayOutLogin(entityplayer.getId(), worlddata.isHardcore(), entityplayer.gameMode.getGameModeForPlayer(), entityplayer.gameMode.getPreviousGameModeForPlayer(), this.server.levelKeys(), this.synchronizedRegistries, worldserver1.dimensionTypeId(), worldserver1.dimension(), BiomeManager.obfuscateSeed(worldserver1.getSeed()), this.getMaxPlayers(), this.viewDistance, this.simulationDistance, flag1, !flag, worldserver1.isDebug(), worldserver1.isFlat(), entityplayer.getLastDeathLocation()));
@@ -107,7 +107,7 @@
          playerconnection.send(new ClientboundUpdateEnabledFeaturesPacket(FeatureFlags.REGISTRY.toNames(worldserver1.enabledFeatures())));
          playerconnection.send(new PacketPlayOutCustomPayload(PacketPlayOutCustomPayload.BRAND, (new PacketDataSerializer(Unpooled.buffer())).writeUtf(this.getServer().getServerModName())));
          playerconnection.send(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
-@@ -218,16 +257,68 @@
+@@ -219,8 +258,10 @@
          } else {
              ichatmutablecomponent = IChatBaseComponent.translatable("multiplayer.player.joined.renamed", entityplayer.getDisplayName(), s);
          }
@@ -117,13 +117,13 @@
  
 -        this.broadcastSystemMessage(ichatmutablecomponent.withStyle(EnumChatFormat.YELLOW), false);
          playerconnection.teleport(entityplayer.getX(), entityplayer.getY(), entityplayer.getZ(), entityplayer.getYRot(), entityplayer.getXRot());
-         entityplayer.sendServerStatus(this.server.getStatus());
+         ServerPing serverping = this.server.getStatus();
+ 
+@@ -231,10 +272,61 @@
          entityplayer.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(this.players));
          this.players.add(entityplayer);
          this.playersByUUID.put(entityplayer.getUUID(), entityplayer);
 -        this.broadcastAll(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(entityplayer)));
--        worldserver1.addNewPlayer(entityplayer);
--        this.server.getCustomBossEvents().onPlayerConnect(entityplayer);
 +        // this.broadcastAll(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(entityplayer))); // CraftBukkit - replaced with loop below
 +
 +        // CraftBukkit start
@@ -135,7 +135,7 @@
 +        PlayerJoinEvent playerJoinEvent = new PlayerJoinEvent(bukkitPlayer, joinMessage);
 +        cserver.getPluginManager().callEvent(playerJoinEvent);
 +
-+        if (!entityplayer.connection.connection.isConnected()) {
++        if (!entityplayer.connection.isAcceptingMessages()) {
 +            return;
 +        }
 +
@@ -168,6 +168,10 @@
 +        // CraftBukkit end
 +
 +        entityplayer.getEntityData().refresh(entityplayer); // CraftBukkit - BungeeCord#2321, send complete data to self on spawn
++
+         this.sendLevelInfo(entityplayer, worldserver1);
+-        worldserver1.addNewPlayer(entityplayer);
+-        this.server.getCustomBossEvents().onPlayerConnect(entityplayer);
 +
 +        // CraftBukkit start - Only add if the player wasn't moved in the event
 +        if (entityplayer.level == worldserver1 && !worldserver1.players().contains(entityplayer)) {
@@ -177,10 +181,10 @@
 +
 +        worldserver1 = entityplayer.getLevel(); // CraftBukkit - Update in case join event changed it
 +        // CraftBukkit end
-         this.sendLevelInfo(entityplayer, worldserver1);
          this.server.getServerResourcePack().ifPresent((minecraftserver_serverresourcepackinfo) -> {
              entityplayer.sendTexturePack(minecraftserver_serverresourcepackinfo.url(), minecraftserver_serverresourcepackinfo.hash(), minecraftserver_serverresourcepackinfo.isRequired(), minecraftserver_serverresourcepackinfo.prompt());
-@@ -242,8 +333,11 @@
+         });
+@@ -248,8 +340,11 @@
  
          if (nbttagcompound != null && nbttagcompound.contains("RootVehicle", 10)) {
              NBTTagCompound nbttagcompound1 = nbttagcompound.getCompound("RootVehicle");
@@ -194,7 +198,7 @@
              });
  
              if (entity != null) {
-@@ -286,6 +380,8 @@
+@@ -292,6 +387,8 @@
          }
  
          entityplayer.initInventoryMenu();
@@ -203,7 +207,7 @@
      }
  
      public void updateEntireScoreboard(ScoreboardServer scoreboardserver, EntityPlayer entityplayer) {
-@@ -318,30 +414,31 @@
+@@ -324,30 +421,31 @@
      }
  
      public void addWorldborderListener(WorldServer worldserver) {
@@ -240,7 +244,7 @@
              }
  
              @Override
-@@ -369,14 +466,15 @@
+@@ -375,14 +473,15 @@
      }
  
      protected void save(EntityPlayer entityplayer) {
@@ -258,7 +262,7 @@
  
          if (advancementdataplayer != null) {
              advancementdataplayer.save();
-@@ -384,10 +482,24 @@
+@@ -390,10 +489,24 @@
  
      }
  
@@ -284,7 +288,7 @@
          this.save(entityplayer);
          if (entityplayer.isPassenger()) {
              Entity entity = entityplayer.getRootVehicle();
-@@ -411,18 +523,66 @@
+@@ -417,18 +530,66 @@
  
          if (entityplayer1 == entityplayer) {
              this.playersByUUID.remove(uuid);
@@ -357,7 +361,7 @@
              GameProfileBanEntry gameprofilebanentry = (GameProfileBanEntry) this.bans.get(gameprofile);
  
              ichatmutablecomponent = IChatBaseComponent.translatable("multiplayer.disconnect.banned.reason", gameprofilebanentry.getReason());
-@@ -430,10 +590,12 @@
+@@ -436,10 +597,12 @@
                  ichatmutablecomponent.append((IChatBaseComponent) IChatBaseComponent.translatable("multiplayer.disconnect.banned.expiration", PlayerList.BAN_DATE_FORMAT.format(gameprofilebanentry.getExpires())));
              }
  
@@ -373,7 +377,7 @@
              IpBanEntry ipbanentry = this.ipBans.get(socketaddress);
  
              ichatmutablecomponent = IChatBaseComponent.translatable("multiplayer.disconnect.banned_ip.reason", ipbanentry.getReason());
-@@ -441,13 +603,25 @@
+@@ -447,13 +610,25 @@
                  ichatmutablecomponent.append((IChatBaseComponent) IChatBaseComponent.translatable("multiplayer.disconnect.banned_ip.expiration", PlayerList.BAN_DATE_FORMAT.format(ipbanentry.getExpires())));
              }
  
@@ -402,7 +406,7 @@
          UUID uuid = UUIDUtil.getOrCreatePlayerUUID(gameprofile);
          List<EntityPlayer> list = Lists.newArrayList();
  
-@@ -474,14 +648,24 @@
+@@ -480,14 +655,24 @@
          }
  
          return new EntityPlayer(this.server, this.server.overworld(), gameprofile);
@@ -427,7 +431,7 @@
          WorldServer worldserver = this.server.getLevel(entityplayer.getRespawnDimension());
          Optional optional;
  
-@@ -493,6 +677,11 @@
+@@ -499,6 +684,11 @@
  
          WorldServer worldserver1 = worldserver != null && optional.isPresent() ? worldserver : this.server.overworld();
          EntityPlayer entityplayer1 = new EntityPlayer(this.server, worldserver1, entityplayer.getGameProfile());
@@ -439,7 +443,7 @@
  
          entityplayer1.connection = entityplayer.connection;
          entityplayer1.restoreFrom(entityplayer, flag);
-@@ -508,50 +697,112 @@
+@@ -514,50 +704,112 @@
  
          boolean flag2 = false;
  
@@ -464,8 +468,7 @@
 +                } else {
 +                    optional = Optional.empty();
 +                }
- 
--                f1 = (float) MathHelper.wrapDegrees(MathHelper.atan2(vec3d1.z, vec3d1.x) * 57.2957763671875D - 90.0D);
++
 +                if (optional.isPresent()) {
 +                    IBlockData iblockdata = worldserver1.getBlockState(blockposition);
 +                    boolean flag3 = iblockdata.is(Blocks.RESPAWN_ANCHOR);
@@ -489,7 +492,8 @@
 +                    entityplayer1.setRespawnPosition(null, null, 0f, false, false); // CraftBukkit - SPIGOT-5988: Clear respawn location when obstructed
 +                }
 +            }
-+
+ 
+-                f1 = (float) MathHelper.wrapDegrees(MathHelper.atan2(vec3d1.z, vec3d1.x) * 57.2957763671875D - 90.0D);
 +            if (location == null) {
 +                worldserver1 = this.server.getLevel(World.OVERWORLD);
 +                blockposition = entityplayer1.getSpawnPoint(worldserver1);
@@ -560,13 +564,13 @@
 +
 +        // Fire advancement trigger
 +        entityplayer.triggerDimensionChangeTriggers(((CraftWorld) fromWorld).getHandle());
-+
+ 
 +        // Don't fire on respawn
 +        if (fromWorld != location.getWorld()) {
 +            PlayerChangedWorldEvent event = new PlayerChangedWorldEvent(entityplayer.getBukkitEntity(), fromWorld);
 +            server.server.getPluginManager().callEvent(event);
 +        }
- 
++
 +        // Save player file again if they were disconnected
 +        if (entityplayer.connection.isDisconnected()) {
 +            this.save(entityplayer);
@@ -575,7 +579,7 @@
          return entityplayer1;
      }
  
-@@ -564,7 +815,18 @@
+@@ -570,7 +822,18 @@
  
      public void tick() {
          if (++this.sendAllPlayerInfoIn > 600) {
@@ -595,7 +599,7 @@
              this.sendAllPlayerInfoIn = 0;
          }
  
-@@ -581,6 +843,25 @@
+@@ -587,6 +850,25 @@
  
      }
  
@@ -621,7 +625,7 @@
      public void broadcastAll(Packet<?> packet, ResourceKey<World> resourcekey) {
          Iterator iterator = this.players.iterator();
  
-@@ -659,7 +940,7 @@
+@@ -665,7 +947,7 @@
      }
  
      public void deop(GameProfile gameprofile) {
@@ -630,7 +634,7 @@
          EntityPlayer entityplayer = this.getPlayer(gameprofile.getId());
  
          if (entityplayer != null) {
-@@ -683,6 +964,7 @@
+@@ -689,6 +971,7 @@
              entityplayer.connection.send(new PacketPlayOutEntityStatus(entityplayer, b0));
          }
  
@@ -638,7 +642,7 @@
          this.server.getCommands().sendCommands(entityplayer);
      }
  
-@@ -715,6 +997,12 @@
+@@ -721,6 +1004,12 @@
          for (int i = 0; i < this.players.size(); ++i) {
              EntityPlayer entityplayer = (EntityPlayer) this.players.get(i);
  
@@ -651,7 +655,7 @@
              if (entityplayer != entityhuman && entityplayer.level.dimension() == resourcekey) {
                  double d4 = d0 - entityplayer.getX();
                  double d5 = d1 - entityplayer.getY();
-@@ -754,23 +1042,35 @@
+@@ -760,23 +1049,35 @@
      public void reloadWhiteList() {}
  
      public void sendLevelInfo(EntityPlayer entityplayer, WorldServer worldserver) {
@@ -692,7 +696,7 @@
      }
  
      public int getPlayerCount() {
-@@ -826,12 +1126,22 @@
+@@ -832,12 +1133,22 @@
      }
  
      public void removeAll() {
@@ -717,7 +721,7 @@
      public void broadcastSystemMessage(IChatBaseComponent ichatbasecomponent, boolean flag) {
          this.broadcastSystemMessage(ichatbasecomponent, (entityplayer) -> {
              return ichatbasecomponent;
-@@ -889,16 +1199,23 @@
+@@ -895,16 +1206,23 @@
          return playerchatmessage.hasSignature() && !playerchatmessage.hasExpiredServer(Instant.now());
      }
  
@@ -745,7 +749,7 @@
                  Path path = file2.toPath();
  
                  if (FileUtils.isPathNormalized(path) && FileUtils.isPathPortable(path) && path.startsWith(file.getPath()) && file2.isFile()) {
-@@ -907,7 +1224,7 @@
+@@ -913,7 +1231,7 @@
              }
  
              serverstatisticmanager = new ServerStatisticManager(this.server, file1);
@@ -754,7 +758,7 @@
          }
  
          return serverstatisticmanager;
-@@ -915,14 +1232,14 @@
+@@ -921,13 +1239,13 @@
  
      public AdvancementDataPlayer getPlayerAdvancements(EntityPlayer entityplayer) {
          UUID uuid = entityplayer.getUUID();
@@ -762,16 +766,15 @@
 +        AdvancementDataPlayer advancementdataplayer = (AdvancementDataPlayer) entityplayer.getAdvancements(); // CraftBukkit
  
          if (advancementdataplayer == null) {
-             File file = this.server.getWorldPath(SavedFile.PLAYER_ADVANCEMENTS_DIR).toFile();
-             File file1 = new File(file, uuid + ".json");
+             Path path = this.server.getWorldPath(SavedFile.PLAYER_ADVANCEMENTS_DIR).resolve(uuid + ".json");
  
-             advancementdataplayer = new AdvancementDataPlayer(this.server.getFixerUpper(), this, this.server.getAdvancements(), file1, entityplayer);
+             advancementdataplayer = new AdvancementDataPlayer(this.server.getFixerUpper(), this, this.server.getAdvancements(), path, entityplayer);
 -            this.advancements.put(uuid, advancementdataplayer);
 +            // this.advancements.put(uuid, advancementdataplayer); // CraftBukkit
          }
  
          advancementdataplayer.setPlayer(entityplayer);
-@@ -973,13 +1290,20 @@
+@@ -978,13 +1296,20 @@
      }
  
      public void reloadResources() {