Update to Minecraft 1.18-pre5

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

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

@@ -1,7 +1,7 @@
 --- a/net/minecraft/server/AdvancementDataPlayer.java
 +++ b/net/minecraft/server/AdvancementDataPlayer.java
 @@ -181,7 +181,11 @@
-                         Advancement advancement = advancementdataworld.a((MinecraftKey) entry.getKey());
+                         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);
@@ -11,13 +11,13 @@
 +                            }
 +                            // CraftBukkit end
                          } else {
-                             this.a(advancement, (AdvancementProgress) entry.getValue());
+                             this.startProgress(advancement, (AdvancementProgress) entry.getValue());
                          }
 @@ -276,6 +280,7 @@
              this.progressChanged.add(advancement);
              flag = true;
              if (!flag1 && advancementprogress.isDone()) {
 +                this.player.level.getCraftServer().getPluginManager().callEvent(new org.bukkit.event.player.PlayerAdvancementDoneEvent(this.player.getBukkitEntity(), advancement.bukkit)); // CraftBukkit
-                 advancement.d().a(this.player);
-                 if (advancement.c() != null && advancement.c().i() && this.player.level.getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
-                     this.playerList.sendMessage(new ChatMessage("chat.type.advancement." + advancement.c().e().a(), new Object[]{this.player.getScoreboardDisplayName(), advancement.j()}), ChatMessageType.SYSTEM, SystemUtils.NIL_UUID);
+                 advancement.getRewards().grant(this.player);
+                 if (advancement.getDisplay() != null && advancement.getDisplay().shouldAnnounceChat() && this.player.level.getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
+                     this.playerList.broadcastMessage(new ChatMessage("chat.type.advancement." + advancement.getDisplay().getFrame().getName(), new Object[]{this.player.getDisplayName(), advancement.getChatComponent()}), ChatMessageType.SYSTEM, SystemUtils.NIL_UUID);

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

@@ -3,9 +3,9 @@
 @@ -44,7 +44,7 @@
      }
  
-     public CommandDispatcher<CommandListenerWrapper> getCommandDispatcher() {
--        return this.server.getCommandDispatcher().a();
-+        return this.server.vanillaCommandDispatcher.a(); // CraftBukkit
+     public CommandDispatcher<CommandListenerWrapper> getDispatcher() {
+-        return this.server.getCommands().getDispatcher();
++        return this.server.vanillaCommandDispatcher.getDispatcher(); // CraftBukkit
      }
  
      public void tick() {

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/DispenserRegistry.java
 +++ b/net/minecraft/server/DispenserRegistry.java
-@@ -28,6 +28,12 @@
+@@ -34,6 +34,12 @@
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
@@ -13,9 +13,9 @@
  public class DispenserRegistry {
  
      public static final PrintStream STDOUT = System.out;
-@@ -38,6 +44,23 @@
+@@ -44,6 +50,23 @@
  
-     public static void init() {
+     public static void bootStrap() {
          if (!DispenserRegistry.isBootstrapped) {
 +            // CraftBukkit start
 +            String name = DispenserRegistry.class.getSimpleName();
@@ -37,30 +37,30 @@
              DispenserRegistry.isBootstrapped = true;
              if (IRegistry.REGISTRY.keySet().isEmpty()) {
                  throw new IllegalStateException("Unable to load registries");
-@@ -55,6 +78,69 @@
-                     TagStatic.b();
-                     d();
+@@ -61,6 +84,69 @@
+                     TagStatic.bootStrap();
+                     wrapStreams();
                  }
 +                // CraftBukkit start - easier than fixing the decompile
-+                DataConverterFlattenData.map(1008, "{Name:'minecraft:oak_sign',Properties:{rotation:'0'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'0'}}");
-+                DataConverterFlattenData.map(1009, "{Name:'minecraft:oak_sign',Properties:{rotation:'1'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'1'}}");
-+                DataConverterFlattenData.map(1010, "{Name:'minecraft:oak_sign',Properties:{rotation:'2'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'2'}}");
-+                DataConverterFlattenData.map(1011, "{Name:'minecraft:oak_sign',Properties:{rotation:'3'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'3'}}");
-+                DataConverterFlattenData.map(1012, "{Name:'minecraft:oak_sign',Properties:{rotation:'4'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'4'}}");
-+                DataConverterFlattenData.map(1013, "{Name:'minecraft:oak_sign',Properties:{rotation:'5'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'5'}}");
-+                DataConverterFlattenData.map(1014, "{Name:'minecraft:oak_sign',Properties:{rotation:'6'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'6'}}");
-+                DataConverterFlattenData.map(1015, "{Name:'minecraft:oak_sign',Properties:{rotation:'7'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'7'}}");
-+                DataConverterFlattenData.map(1016, "{Name:'minecraft:oak_sign',Properties:{rotation:'8'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'8'}}");
-+                DataConverterFlattenData.map(1017, "{Name:'minecraft:oak_sign',Properties:{rotation:'9'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'9'}}");
-+                DataConverterFlattenData.map(1018, "{Name:'minecraft:oak_sign',Properties:{rotation:'10'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'10'}}");
-+                DataConverterFlattenData.map(1019, "{Name:'minecraft:oak_sign',Properties:{rotation:'11'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'11'}}");
-+                DataConverterFlattenData.map(1020, "{Name:'minecraft:oak_sign',Properties:{rotation:'12'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'12'}}");
-+                DataConverterFlattenData.map(1021, "{Name:'minecraft:oak_sign',Properties:{rotation:'13'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'13'}}");
-+                DataConverterFlattenData.map(1022, "{Name:'minecraft:oak_sign',Properties:{rotation:'14'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'14'}}");
-+                DataConverterFlattenData.map(1023, "{Name:'minecraft:oak_sign',Properties:{rotation:'15'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'15'}}");
++                DataConverterFlattenData.register(1008, "{Name:'minecraft:oak_sign',Properties:{rotation:'0'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'0'}}");
++                DataConverterFlattenData.register(1009, "{Name:'minecraft:oak_sign',Properties:{rotation:'1'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'1'}}");
++                DataConverterFlattenData.register(1010, "{Name:'minecraft:oak_sign',Properties:{rotation:'2'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'2'}}");
++                DataConverterFlattenData.register(1011, "{Name:'minecraft:oak_sign',Properties:{rotation:'3'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'3'}}");
++                DataConverterFlattenData.register(1012, "{Name:'minecraft:oak_sign',Properties:{rotation:'4'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'4'}}");
++                DataConverterFlattenData.register(1013, "{Name:'minecraft:oak_sign',Properties:{rotation:'5'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'5'}}");
++                DataConverterFlattenData.register(1014, "{Name:'minecraft:oak_sign',Properties:{rotation:'6'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'6'}}");
++                DataConverterFlattenData.register(1015, "{Name:'minecraft:oak_sign',Properties:{rotation:'7'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'7'}}");
++                DataConverterFlattenData.register(1016, "{Name:'minecraft:oak_sign',Properties:{rotation:'8'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'8'}}");
++                DataConverterFlattenData.register(1017, "{Name:'minecraft:oak_sign',Properties:{rotation:'9'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'9'}}");
++                DataConverterFlattenData.register(1018, "{Name:'minecraft:oak_sign',Properties:{rotation:'10'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'10'}}");
++                DataConverterFlattenData.register(1019, "{Name:'minecraft:oak_sign',Properties:{rotation:'11'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'11'}}");
++                DataConverterFlattenData.register(1020, "{Name:'minecraft:oak_sign',Properties:{rotation:'12'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'12'}}");
++                DataConverterFlattenData.register(1021, "{Name:'minecraft:oak_sign',Properties:{rotation:'13'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'13'}}");
++                DataConverterFlattenData.register(1022, "{Name:'minecraft:oak_sign',Properties:{rotation:'14'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'14'}}");
++                DataConverterFlattenData.register(1023, "{Name:'minecraft:oak_sign',Properties:{rotation:'15'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'15'}}");
 +                DataConverterMaterialId.ITEM_NAMES.put(323, "minecraft:oak_sign");
 +
-+                DataConverterFlattenData.map(1440, "{Name:\'minecraft:portal\',Properties:{axis:\'x\'}}", new String[]{"{Name:\'minecraft:portal\',Properties:{axis:\'x\'}}"});
++                DataConverterFlattenData.register(1440, "{Name:\'minecraft:portal\',Properties:{axis:\'x\'}}", new String[]{"{Name:\'minecraft:portal\',Properties:{axis:\'x\'}}"});
 +
 +                DataConverterMaterialId.ITEM_NAMES.put(409, "minecraft:prismarine_shard");
 +                DataConverterMaterialId.ITEM_NAMES.put(410, "minecraft:prismarine_crystals");

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/Main.java
 +++ b/net/minecraft/server/Main.java
-@@ -58,6 +58,12 @@
+@@ -56,6 +56,12 @@
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
@@ -13,34 +13,39 @@
  public class Main {
  
      private static final Logger LOGGER = LogManager.getLogger();
-@@ -65,8 +71,9 @@
+@@ -63,8 +69,9 @@
      public Main() {}
  
      @DontObfuscate
 -    public static void main(String[] astring) {
 +    public static void main(final OptionSet optionset) { // CraftBukkit - replaces main(String[] astring)
-         SharedConstants.a();
+         SharedConstants.tryDetectVersion();
 +        /* CraftBukkit start - Replace everything
          OptionParser optionparser = new OptionParser();
          OptionSpec<Void> optionspec = optionparser.accepts("nogui");
          OptionSpec<Void> optionspec1 = optionparser.accepts("initSettings", "Initializes 'server.properties' and 'eula.txt', then quits");
-@@ -90,20 +97,22 @@
+@@ -89,9 +96,12 @@
                  optionparser.printHelpOn(System.err);
                  return;
              }
 +            */ // CraftBukkit end
- 
++
 +        try {
-             CrashReport.h();
-             DispenserRegistry.init();
-             DispenserRegistry.c();
-             SystemUtils.l();
-             IRegistryCustom.Dimension iregistrycustom_dimension = IRegistryCustom.a();
+ 
+             CrashReport.preload();
+-            if (optionset.has(optionspec13)) {
++            if (optionset.has("jfrProfile")) { // CraftBukkit
+                 JvmProfiler.INSTANCE.start(Environment.SERVER);
+             }
+ 
+@@ -100,13 +110,13 @@
+             SystemUtils.startTimerHackThread();
+             IRegistryCustom.Dimension iregistrycustom_dimension = IRegistryCustom.builtin();
              Path path = Paths.get("server.properties");
 -            DedicatedServerSettings dedicatedserversettings = new DedicatedServerSettings(path);
 +            DedicatedServerSettings dedicatedserversettings = new DedicatedServerSettings(optionset); // CraftBukkit - CLI argument support
  
-             dedicatedserversettings.save();
+             dedicatedserversettings.forceSave();
              Path path1 = Paths.get("eula.txt");
              EULA eula = new EULA(path1);
  
@@ -49,7 +54,7 @@
                  Main.LOGGER.info("Initialized '{}' and '{}'", path.toAbsolutePath(), path1.toAbsolutePath());
                  return;
              }
-@@ -113,14 +122,15 @@
+@@ -116,14 +126,15 @@
                  return;
              }
  
@@ -62,16 +67,16 @@
 -            String s = (String) Optional.ofNullable((String) optionset.valueOf(optionspec10)).orElse(dedicatedserversettings.getProperties().levelName);
 +            // CraftBukkit start
 +            String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
-             Convertable convertable = Convertable.a(file.toPath());
--            Convertable.ConversionSession convertable_conversionsession = convertable.c(s);
-+            Convertable.ConversionSession convertable_conversionsession = convertable.c(s, WorldDimension.OVERWORLD);
+             Convertable convertable = Convertable.createDefault(file.toPath());
+-            Convertable.ConversionSession convertable_conversionsession = convertable.createAccess(s);
++            Convertable.ConversionSession convertable_conversionsession = convertable.createAccess(s, WorldDimension.OVERWORLD);
+             WorldInfo worldinfo = convertable_conversionsession.getSummary();
  
-             MinecraftServer.convertWorld(convertable_conversionsession);
-             WorldInfo worldinfo = convertable_conversionsession.d();
-@@ -131,13 +141,30 @@
+             if (worldinfo != null) {
+@@ -139,13 +150,30 @@
              }
  
-             DataPackConfiguration datapackconfiguration = convertable_conversionsession.e();
+             DataPackConfiguration datapackconfiguration = convertable_conversionsession.getDataPacks();
 -            boolean flag = optionset.has(optionspec6);
 +            boolean flag = optionset.has("safeMode");
  
@@ -79,9 +84,9 @@
                  Main.LOGGER.warn("Safe mode active, only vanilla datapack will be loaded");
              }
  
-             ResourcePackRepository resourcepackrepository = new ResourcePackRepository(EnumResourcePackType.SERVER_DATA, new ResourcePackSource[]{new ResourcePackSourceVanilla(), new ResourcePackSourceFolder(convertable_conversionsession.getWorldFolder(SavedFile.DATAPACK_DIR).toFile(), PackSource.WORLD)});
+             ResourcePackRepository resourcepackrepository = new ResourcePackRepository(EnumResourcePackType.SERVER_DATA, new ResourcePackSource[]{new ResourcePackSourceVanilla(), new ResourcePackSourceFolder(convertable_conversionsession.getLevelPath(SavedFile.DATAPACK_DIR).toFile(), PackSource.WORLD)});
 +            // CraftBukkit start
-+            File bukkitDataPackFolder = new File(convertable_conversionsession.getWorldFolder(SavedFile.DATAPACK_DIR).toFile(), "bukkit");
++            File bukkitDataPackFolder = new File(convertable_conversionsession.getLevelPath(SavedFile.DATAPACK_DIR).toFile(), "bukkit");
 +            if (!bukkitDataPackFolder.exists()) {
 +                bukkitDataPackFolder.mkdirs();
 +            }
@@ -90,44 +95,44 @@
 +                com.google.common.io.Files.write("{\n"
 +                        + "    \"pack\": {\n"
 +                        + "        \"description\": \"Data pack for resources provided by Bukkit plugins\",\n"
-+                        + "        \"pack_format\": " + SharedConstants.getGameVersion().getPackVersion() + "\n"
++                        + "        \"pack_format\": " + SharedConstants.getCurrentVersion().getPackVersion() + "\n"
 +                        + "    }\n"
 +                        + "}\n", mcMeta, com.google.common.base.Charsets.UTF_8);
 +            } catch (java.io.IOException ex) {
 +                throw new RuntimeException("Could not initialize Bukkit datapack", ex);
 +            }
 +            // CraftBukkit end
-             DataPackConfiguration datapackconfiguration1 = MinecraftServer.a(resourcepackrepository, datapackconfiguration == null ? DataPackConfiguration.DEFAULT : datapackconfiguration, flag);
-             CompletableFuture completablefuture = DataPackResources.a(resourcepackrepository.f(), iregistrycustom_dimension, CommandDispatcher.ServerType.DEDICATED, dedicatedserversettings.getProperties().functionPermissionLevel, SystemUtils.f(), Runnable::run);
+             DataPackConfiguration datapackconfiguration1 = MinecraftServer.configurePackRepository(resourcepackrepository, datapackconfiguration == null ? DataPackConfiguration.DEFAULT : datapackconfiguration, flag);
+             CompletableFuture completablefuture = DataPackResources.loadResources(resourcepackrepository.openAllSelected(), iregistrycustom_dimension, CommandDispatcher.ServerType.DEDICATED, dedicatedserversettings.getProperties().functionPermissionLevel, SystemUtils.backgroundExecutor(), Runnable::run);
  
-@@ -152,6 +179,7 @@
+@@ -160,6 +188,7 @@
              }
  
-             datapackresources.j();
+             datapackresources.updateGlobals();
 +            /*
-             RegistryReadOps<NBTBase> registryreadops = RegistryReadOps.a((DynamicOps) DynamicOpsNBT.INSTANCE, datapackresources.i(), (IRegistryCustom) iregistrycustom_dimension);
+             RegistryReadOps<NBTBase> registryreadops = RegistryReadOps.createAndLoad(DynamicOpsNBT.INSTANCE, datapackresources.getResourceManager(), iregistrycustom_dimension);
  
-             dedicatedserversettings.getProperties().a((IRegistryCustom) iregistrycustom_dimension);
-@@ -181,21 +209,32 @@
+             dedicatedserversettings.getProperties().getWorldGenSettings(iregistrycustom_dimension);
+@@ -189,21 +218,32 @@
              }
  
-             convertable_conversionsession.a((IRegistryCustom) iregistrycustom_dimension, (SaveData) object);
+             convertable_conversionsession.saveDataTag(iregistrycustom_dimension, (SaveData) object);
 +            */
-             final DedicatedServer dedicatedserver = (DedicatedServer) MinecraftServer.a((thread) -> {
--                DedicatedServer dedicatedserver1 = new DedicatedServer(thread, iregistrycustom_dimension, convertable_conversionsession, resourcepackrepository, datapackresources, object, dedicatedserversettings, DataConverterRegistry.a(), minecraftsessionservice, gameprofilerepository, usercache, WorldLoadListenerLogger::new);
-+                DedicatedServer dedicatedserver1 = new DedicatedServer(optionset, datapackconfiguration1, thread, iregistrycustom_dimension, convertable_conversionsession, resourcepackrepository, datapackresources, null, dedicatedserversettings, DataConverterRegistry.a(), minecraftsessionservice, gameprofilerepository, usercache, WorldLoadListenerLogger::new);
+             final DedicatedServer dedicatedserver = (DedicatedServer) MinecraftServer.spin((thread) -> {
+-                DedicatedServer dedicatedserver1 = new DedicatedServer(thread, iregistrycustom_dimension, convertable_conversionsession, resourcepackrepository, datapackresources, object, dedicatedserversettings, DataConverterRegistry.getDataFixer(), minecraftsessionservice, gameprofilerepository, usercache, WorldLoadListenerLogger::new);
++                DedicatedServer dedicatedserver1 = new DedicatedServer(optionset, datapackconfiguration1, thread, iregistrycustom_dimension, convertable_conversionsession, resourcepackrepository, datapackresources, null, dedicatedserversettings, DataConverterRegistry.getDataFixer(), minecraftsessionservice, gameprofilerepository, usercache, WorldLoadListenerLogger::new);
  
 +                /*
-                 dedicatedserver1.d((String) optionset.valueOf(optionspec8));
+                 dedicatedserver1.setSingleplayerName((String) optionset.valueOf(optionspec8));
                  dedicatedserver1.setPort((Integer) optionset.valueOf(optionspec11));
-                 dedicatedserver1.c(optionset.has(optionspec2));
-                 dedicatedserver1.b((String) optionset.valueOf(optionspec12));
+                 dedicatedserver1.setDemo(optionset.has(optionspec2));
+                 dedicatedserver1.setId((String) optionset.valueOf(optionspec12));
 -                boolean flag1 = !optionset.has(optionspec) && !optionset.valuesOf(nonoptionargumentspec).contains("nogui");
 +                */
 +                boolean flag1 = !optionset.has("nogui") && !optionset.nonOptionArguments().contains("nogui");
  
                  if (flag1 && !GraphicsEnvironment.isHeadless()) {
-                     dedicatedserver1.bh();
+                     dedicatedserver1.showGui();
                  }
  
 +                if (optionset.has("port")) {
@@ -142,8 +147,8 @@
 +            /* CraftBukkit start
              Thread thread = new Thread("Server Shutdown Thread") {
                  public void run() {
-                     dedicatedserver.safeShutdown(true);
-@@ -204,14 +243,15 @@
+                     dedicatedserver.halt(true);
+@@ -212,6 +252,7 @@
  
              thread.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(Main.LOGGER));
              Runtime.getRuntime().addShutdownHook(thread);
@@ -151,13 +156,12 @@
          } catch (Exception exception1) {
              Main.LOGGER.fatal("Failed to start the minecraft server", exception1);
          }
- 
+@@ -219,7 +260,7 @@
      }
  
--    public static void convertWorld(Convertable.ConversionSession convertable_conversionsession, DataFixer datafixer, boolean flag, BooleanSupplier booleansupplier, ImmutableSet<ResourceKey<World>> immutableset) {
+     public static void forceUpgrade(Convertable.ConversionSession convertable_conversionsession, DataFixer datafixer, boolean flag, BooleanSupplier booleansupplier, GeneratorSettings generatorsettings) {
 -        Main.LOGGER.info("Forcing world upgrade!");
-+    public static void convertWorld(Convertable.ConversionSession convertable_conversionsession, DataFixer datafixer, boolean flag, BooleanSupplier booleansupplier, ImmutableSet<ResourceKey<DimensionManager>> immutableset) { // CraftBukkit
-+        Main.LOGGER.info("Forcing world upgrade! {}", convertable_conversionsession.getLevelName()); // CraftBukkit
-         WorldUpgrader worldupgrader = new WorldUpgrader(convertable_conversionsession, datafixer, immutableset, flag);
++        Main.LOGGER.info("Forcing world upgrade! {}", convertable_conversionsession.getLevelId()); // CraftBukkit
+         WorldUpgrader worldupgrader = new WorldUpgrader(convertable_conversionsession, datafixer, generatorsettings, flag);
          IChatBaseComponent ichatbasecomponent = null;
  

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

@@ -1,13 +1,12 @@
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -163,6 +163,27 @@
+@@ -160,6 +160,27 @@
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
 +// CraftBukkit start
 +import com.mojang.serialization.DynamicOps;
 +import com.mojang.serialization.Lifecycle;
-+import com.google.common.collect.ImmutableSet;
 +import jline.console.ConsoleReader;
 +import joptsimple.OptionSet;
 +import net.minecraft.nbt.DynamicOpsNBT;
@@ -16,6 +15,7 @@
 +import net.minecraft.server.dedicated.DedicatedServer;
 +import net.minecraft.server.dedicated.DedicatedServerProperties;
 +import net.minecraft.util.datafix.DataConverterRegistry;
++import net.minecraft.world.level.biome.WorldChunkManager;
 +import net.minecraft.world.level.levelgen.ChunkGeneratorAbstract;
 +import net.minecraft.world.level.storage.WorldDataServer;
 +import org.bukkit.Bukkit;
@@ -25,12 +25,12 @@
 +import org.bukkit.event.server.ServerLoadEvent;
 +// CraftBukkit end
 +
- public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTask> implements IMojangStatistics, ICommandListener, AutoCloseable {
+ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTask> implements ICommandListener, AutoCloseable {
  
      public static final Logger LOGGER = LogManager.getLogger();
-@@ -254,6 +275,20 @@
-     private final DefinedStructureManager structureManager;
+@@ -252,6 +273,20 @@
      protected SaveData worldData;
+     private volatile boolean isSaving;
  
 +    // CraftBukkit start
 +    public DataPackConfiguration datapackconfiguration;
@@ -46,13 +46,13 @@
 +    private boolean forceTicks;
 +    // CraftBukkit end
 +
-     public static <S extends MinecraftServer> S a(Function<Thread, S> function) {
+     public static <S extends MinecraftServer> S spin(Function<Thread, S> function) {
          AtomicReference<S> atomicreference = new AtomicReference();
          Thread thread = new Thread(() -> {
-@@ -263,14 +298,14 @@
-         thread.setUncaughtExceptionHandler((thread1, throwable) -> {
-             MinecraftServer.LOGGER.error(throwable);
-         });
+@@ -265,14 +300,14 @@
+             thread.setPriority(8);
+         }
+ 
 -        S s0 = (MinecraftServer) function.apply(thread);
 +        S s0 = function.apply(thread); // CraftBukkit - decompile error
  
@@ -65,8 +65,8 @@
 +    public MinecraftServer(OptionSet options, DataPackConfiguration datapackconfiguration, Thread thread, IRegistryCustom.Dimension iregistrycustom_dimension, Convertable.ConversionSession convertable_conversionsession, SaveData savedata, ResourcePackRepository resourcepackrepository, Proxy proxy, DataFixer datafixer, DataPackResources datapackresources, @Nullable MinecraftSessionService minecraftsessionservice, @Nullable GameProfileRepository gameprofilerepository, @Nullable UserCache usercache, WorldLoadListenerFactory worldloadlistenerfactory) {
          super("Server");
          this.metricsRecorder = InactiveMetricsRecorder.INSTANCE;
-         this.profiler = this.metricsRecorder.e();
-@@ -282,7 +317,7 @@
+         this.profiler = this.metricsRecorder.getProfiler();
+@@ -284,7 +319,7 @@
          this.status = new ServerPing();
          this.random = new Random();
          this.port = -1;
@@ -75,10 +75,10 @@
          this.running = true;
          this.tickTimes = new long[100];
          this.resourcePack = "";
-@@ -312,13 +347,40 @@
-         this.structureManager = new DefinedStructureManager(datapackresources.i(), convertable_conversionsession, datafixer);
+@@ -314,13 +349,40 @@
+         this.structureManager = new DefinedStructureManager(datapackresources.getResourceManager(), convertable_conversionsession, datafixer);
          this.serverThread = thread;
-         this.executor = SystemUtils.f();
+         this.executor = SystemUtils.backgroundExecutor();
 +        // CraftBukkit start
 +        this.options = options;
 +        this.datapackconfiguration = datapackconfiguration;
@@ -108,66 +108,95 @@
      }
 +    // CraftBukkit end
  
-     private void initializeScoreboards(WorldPersistentData worldpersistentdata) {
+     private void readScoreboard(WorldPersistentData worldpersistentdata) {
          ScoreboardServer scoreboardserver = this.getScoreboard();
  
          Objects.requireNonNull(scoreboardserver);
--        Function function = scoreboardserver::a;
-+        Function<net.minecraft.nbt.NBTTagCompound, net.minecraft.world.scores.PersistentScoreboard> function = scoreboardserver::a; // CraftBukkit - decompile error
+-        Function function = scoreboardserver::createData;
++        Function<net.minecraft.nbt.NBTTagCompound, net.minecraft.world.scores.PersistentScoreboard> function = scoreboardserver::createData; // CraftBukkit - decompile error
          ScoreboardServer scoreboardserver1 = this.getScoreboard();
  
          Objects.requireNonNull(scoreboardserver1);
 @@ -329,7 +391,7 @@
  
-     public static void convertWorld(Convertable.ConversionSession convertable_conversionsession) {
-         if (convertable_conversionsession.isConvertable()) {
--            MinecraftServer.LOGGER.info("Converting map!");
-+            MinecraftServer.LOGGER.info("Converting map! {}", convertable_conversionsession.getLevelName()); // CraftBukkit
-             convertable_conversionsession.convert(new IProgressUpdate() {
-                 private long timeStamp = SystemUtils.getMonotonicMillis();
+     protected abstract boolean initServer() throws IOException;
  
-@@ -358,48 +420,211 @@
+-    protected void loadLevel() {
++    protected void loadLevel(String s) { // CraftBukkit
+         if (!JvmProfiler.INSTANCE.isRunning()) {
+             ;
+         }
+@@ -337,13 +399,8 @@
+         boolean flag = false;
+         ProfiledDuration profiledduration = JvmProfiler.INSTANCE.onWorldLoadedStarted();
+ 
+-        this.detectBundledResources();
+-        this.worldData.setModdedInfo(this.getServerModName(), this.getModdedStatus().shouldReportAsModified());
+-        WorldLoadListener worldloadlistener = this.progressListenerFactory.create(11);
++        loadWorld0(s); // CraftBukkit
+ 
+-        this.createLevels(worldloadlistener);
+-        this.forceDifficulty();
+-        this.prepareLevels(worldloadlistener);
+         if (profiledduration != null) {
+             profiledduration.finish();
+         }
+@@ -358,35 +415,204 @@
  
      }
  
--    protected void loadWorld() {
--        this.loadResourcesZip();
--        this.worldData.a(this.getServerModName(), this.getModded().isPresent());
--        WorldLoadListener worldloadlistener = this.progressListenerFactory.create(11);
-+    protected void loadWorld(String s) {
-+        // CraftBukkit start
+-    protected void forceDifficulty() {}
++    // CraftBukkit start
++    private void loadWorld0(String s) {
 +        Convertable.ConversionSession worldSession = this.storageSource;
 +        IRegistryCustom.Dimension iregistrycustom_dimension = this.registryHolder;
-+        RegistryReadOps<NBTBase> registryreadops = RegistryReadOps.a((DynamicOps) DynamicOpsNBT.INSTANCE, this.resources.i(), (IRegistryCustom) iregistrycustom_dimension);
-+        WorldDataServer overworldData = (WorldDataServer) worldSession.a((DynamicOps) registryreadops, datapackconfiguration);
++        RegistryReadOps<NBTBase> registryreadops = RegistryReadOps.createAndLoad(DynamicOpsNBT.INSTANCE, this.resources.getResourceManager(), iregistrycustom_dimension);
++        WorldDataServer overworldData = (WorldDataServer) worldSession.getDataTag(registryreadops, datapackconfiguration);
 +        if (overworldData == null) {
 +            WorldSettings worldsettings;
 +            GeneratorSettings generatorsettings;
 +
-+            if (this.isDemoMode()) {
++            if (this.isDemo()) {
 +                worldsettings = MinecraftServer.DEMO_SETTINGS;
-+                generatorsettings = GeneratorSettings.a((IRegistryCustom) iregistrycustom_dimension);
++                generatorsettings = GeneratorSettings.demoSettings(iregistrycustom_dimension);
 +            } else {
-+                DedicatedServerProperties dedicatedserverproperties = ((DedicatedServer) this).getDedicatedServerProperties();
-+
++                DedicatedServerProperties dedicatedserverproperties = ((DedicatedServer) this).getProperties();
+ 
+-    protected void createLevels(WorldLoadListener worldloadlistener) {
+-        IWorldDataServer iworlddataserver = this.worldData.overworldData();
+-        GeneratorSettings generatorsettings = this.worldData.worldGenSettings();
+-        boolean flag = generatorsettings.isDebug();
+-        long i = generatorsettings.seed();
+-        long j = BiomeManager.obfuscateSeed(i);
+-        List<MobSpawner> list = ImmutableList.of(new MobSpawnerPhantom(), new MobSpawnerPatrol(), new MobSpawnerCat(), new VillageSiege(), new MobSpawnerTrader(iworlddataserver));
+-        RegistryMaterials<WorldDimension> registrymaterials = generatorsettings.dimensions();
+-        WorldDimension worlddimension = (WorldDimension) registrymaterials.get(WorldDimension.OVERWORLD);
+-        DimensionManager dimensionmanager;
+-        Object object;
+-
+-        if (worlddimension == null) {
+-            dimensionmanager = (DimensionManager) this.registryHolder.registryOrThrow(IRegistry.DIMENSION_TYPE_REGISTRY).getOrThrow(DimensionManager.OVERWORLD_LOCATION);
+-            object = GeneratorSettings.makeDefaultOverworld(this.registryHolder, (new Random()).nextLong());
+-        } else {
+-            dimensionmanager = worlddimension.type();
+-            object = worlddimension.generator();
 +                worldsettings = new WorldSettings(dedicatedserverproperties.levelName, dedicatedserverproperties.gamemode, dedicatedserverproperties.hardcore, dedicatedserverproperties.difficulty, false, new GameRules(), datapackconfiguration);
-+                generatorsettings = options.has("bonusChest") ? dedicatedserverproperties.a((IRegistryCustom) iregistrycustom_dimension).j() : dedicatedserverproperties.a((IRegistryCustom) iregistrycustom_dimension);
++                generatorsettings = options.has("bonusChest") ? dedicatedserverproperties.getWorldGenSettings(iregistrycustom_dimension).withBonusChest() : dedicatedserverproperties.getWorldGenSettings(iregistrycustom_dimension);
 +            }
 +
 +            overworldData = new WorldDataServer(worldsettings, generatorsettings, Lifecycle.stable());
 +        }
 +
-+        GeneratorSettings overworldSettings = overworldData.getGeneratorSettings();
-+        RegistryMaterials<WorldDimension> registrymaterials = overworldSettings.d();
-+        for (Entry<ResourceKey<WorldDimension>, WorldDimension> entry : registrymaterials.d()) {
++        GeneratorSettings overworldSettings = overworldData.worldGenSettings();
++        RegistryMaterials<WorldDimension> registrymaterials = overworldSettings.dimensions();
++        for (Entry<ResourceKey<WorldDimension>, WorldDimension> entry : registrymaterials.entrySet()) {
 +            ResourceKey<WorldDimension> dimensionKey = entry.getKey();
 +
 +            WorldServer world;
 +            int dimension = 0;
- 
--        this.a(worldloadlistener);
++
 +            if (dimensionKey == WorldDimension.NETHER) {
-+                if (getAllowNether()) {
++                if (isNetherEnabled()) {
 +                    dimension = -1;
 +                } else {
 +                    continue;
@@ -182,11 +211,11 @@
 +                dimension = -999;
 +            }
 +
-+            String worldType = (dimension == -999) ? dimensionKey.a().getNamespace() + "_" + dimensionKey.a().getKey() : org.bukkit.World.Environment.getEnvironment(dimension).toString().toLowerCase();
++            String worldType = (dimension == -999) ? dimensionKey.location().getNamespace() + "_" + dimensionKey.location().getPath() : org.bukkit.World.Environment.getEnvironment(dimension).toString().toLowerCase();
 +            String name = (dimensionKey == WorldDimension.OVERWORLD) ? s : s + "_" + worldType;
 +            if (dimension != 0) {
-+                File newWorld = Convertable.getFolder(new File(name), dimensionKey);
-+                File oldWorld = Convertable.getFolder(new File(s), dimensionKey);
++                File newWorld = Convertable.getStorageFolder(new File(name).toPath(), dimensionKey).toFile();
++                File oldWorld = Convertable.getStorageFolder(new File(s).toPath(), dimensionKey).toFile();
 +                File oldLevelDat = new File(new File(s), "level.dat"); // The data folders exist on first run as they are created in the PersistentCollection constructor above, but the level.dat won't
 +
 +                if (!newWorld.isDirectory() && oldWorld.isDirectory() && oldLevelDat.isFile()) {
@@ -220,58 +249,55 @@
 +                }
 +
 +                try {
-+                    worldSession = Convertable.a(server.getWorldContainer().toPath()).c(name, dimensionKey);
++                    worldSession = Convertable.createDefault(server.getWorldContainer().toPath()).createAccess(name, dimensionKey);
 +                } catch (IOException ex) {
 +                    throw new RuntimeException(ex);
 +                }
-+                MinecraftServer.convertWorld(worldSession); // Run conversion now
 +            }
 +
 +            org.bukkit.generator.ChunkGenerator gen = this.server.getGenerator(name);
 +            org.bukkit.generator.BiomeProvider biomeProvider = this.server.getBiomeProvider(name);
 +
-+            WorldDataServer worlddata = (WorldDataServer) worldSession.a((DynamicOps) registryreadops, datapackconfiguration);
++            WorldDataServer worlddata = (WorldDataServer) worldSession.getDataTag((DynamicOps) registryreadops, datapackconfiguration);
 +            if (worlddata == null) {
 +                WorldSettings worldsettings;
 +                GeneratorSettings generatorsettings;
 +
-+                if (this.isDemoMode()) {
++                if (this.isDemo()) {
 +                    worldsettings = MinecraftServer.DEMO_SETTINGS;
-+                    generatorsettings = GeneratorSettings.a((IRegistryCustom) iregistrycustom_dimension);
++                    generatorsettings = GeneratorSettings.demoSettings(iregistrycustom_dimension);
 +                } else {
-+                    DedicatedServerProperties dedicatedserverproperties = ((DedicatedServer) this).getDedicatedServerProperties();
++                    DedicatedServerProperties dedicatedserverproperties = ((DedicatedServer) this).getProperties();
 +
 +                    worldsettings = new WorldSettings(dedicatedserverproperties.levelName, dedicatedserverproperties.gamemode, dedicatedserverproperties.hardcore, dedicatedserverproperties.difficulty, false, new GameRules(), datapackconfiguration);
-+                    generatorsettings = options.has("bonusChest") ? dedicatedserverproperties.a((IRegistryCustom) iregistrycustom_dimension).j() : dedicatedserverproperties.a((IRegistryCustom) iregistrycustom_dimension);
++                    generatorsettings = options.has("bonusChest") ? dedicatedserverproperties.getWorldGenSettings(iregistrycustom_dimension).withBonusChest() : dedicatedserverproperties.getWorldGenSettings(iregistrycustom_dimension);
 +                }
 +
 +                worlddata = new WorldDataServer(worldsettings, generatorsettings, Lifecycle.stable());
 +            }
 +            worlddata.checkName(name); // CraftBukkit - Migration did not rewrite the level.dat; This forces 1.8 to take the last loaded world as respawn (in this case the end)
 +            if (options.has("forceUpgrade")) {
-+                net.minecraft.server.Main.convertWorld(worldSession, DataConverterRegistry.a(), options.has("eraseCache"), () -> {
++                net.minecraft.server.Main.forceUpgrade(worldSession, DataConverterRegistry.getDataFixer(), options.has("eraseCache"), () -> {
 +                    return true;
-+                }, worlddata.getGeneratorSettings().d().d().stream().map((entry1) -> {
-+                    return ResourceKey.a(IRegistry.DIMENSION_TYPE_REGISTRY, ((ResourceKey) entry1.getKey()).a());
-+                }).collect(ImmutableSet.toImmutableSet()));
++                }, worlddata.worldGenSettings());
 +            }
 +
 +            IWorldDataServer iworlddataserver = worlddata;
-+            GeneratorSettings generatorsettings = worlddata.getGeneratorSettings();
-+            boolean flag = generatorsettings.isDebugWorld();
-+            long i = generatorsettings.getSeed();
-+            long j = BiomeManager.a(i);
++            GeneratorSettings generatorsettings = worlddata.worldGenSettings();
++            boolean flag = generatorsettings.isDebug();
++            long i = generatorsettings.seed();
++            long j = BiomeManager.obfuscateSeed(i);
 +            List<MobSpawner> list = ImmutableList.of(new MobSpawnerPhantom(), new MobSpawnerPatrol(), new MobSpawnerCat(), new VillageSiege(), new MobSpawnerTrader(iworlddataserver));
-+            WorldDimension worlddimension = (WorldDimension) registrymaterials.a(dimensionKey);
++            WorldDimension worlddimension = (WorldDimension) registrymaterials.get(WorldDimension.OVERWORLD);
 +            DimensionManager dimensionmanager;
 +            ChunkGenerator chunkgenerator;
 +
 +            if (worlddimension == null) {
-+                dimensionmanager = (DimensionManager) this.registryHolder.d(IRegistry.DIMENSION_TYPE_REGISTRY).d(DimensionManager.OVERWORLD_LOCATION);
-+                chunkgenerator = GeneratorSettings.a(this.registryHolder.d(IRegistry.BIOME_REGISTRY), this.registryHolder.d(IRegistry.NOISE_GENERATOR_SETTINGS_REGISTRY), (new Random()).nextLong());
++                dimensionmanager = (DimensionManager) this.registryHolder.registryOrThrow(IRegistry.DIMENSION_TYPE_REGISTRY).getOrThrow(DimensionManager.OVERWORLD_LOCATION);
++                chunkgenerator = GeneratorSettings.makeDefaultOverworld(this.registryHolder, (new Random()).nextLong());
 +            } else {
-+                dimensionmanager = worlddimension.b();
-+                chunkgenerator = worlddimension.c();
++                dimensionmanager = worlddimension.type();
++                chunkgenerator = worlddimension.generator();
 +            }
 +
 +            org.bukkit.generator.WorldInfo worldInfo = new org.bukkit.craftbukkit.generator.CraftWorldInfo(iworlddataserver, worldSession, org.bukkit.World.Environment.getEnvironment(dimension), dimensionmanager);
@@ -280,23 +306,23 @@
 +            }
 +
 +            if (biomeProvider != null) {
-+                WorldChunkManager worldChunkManager = new CustomWorldChunkManager(worldInfo, biomeProvider, registryHolder.b(IRegistry.BIOME_REGISTRY));
++                WorldChunkManager worldChunkManager = new CustomWorldChunkManager(worldInfo, biomeProvider, registryHolder.ownedRegistryOrThrow(IRegistry.BIOME_REGISTRY));
 +                if (chunkgenerator instanceof ChunkGeneratorAbstract) {
-+                    chunkgenerator = new ChunkGeneratorAbstract(worldChunkManager, chunkgenerator.strongholdSeed, ((ChunkGeneratorAbstract) chunkgenerator).settings);
++                    chunkgenerator = new ChunkGeneratorAbstract(((ChunkGeneratorAbstract) chunkgenerator).noises, worldChunkManager, chunkgenerator.strongholdSeed, ((ChunkGeneratorAbstract) chunkgenerator).settings);
 +                }
 +            }
 +
-+            ResourceKey<World> worldKey = ResourceKey.a(IRegistry.DIMENSION_REGISTRY, dimensionKey.a());
++            ResourceKey<World> worldKey = ResourceKey.create(IRegistry.DIMENSION_REGISTRY, dimensionKey.location());
 +
 +            if (dimensionKey == WorldDimension.OVERWORLD) {
 +                this.worldData = worlddata;
-+                this.worldData.setGameType(((DedicatedServer) this).getDedicatedServerProperties().gamemode); // From DedicatedServer.init
++                this.worldData.setGameType(((DedicatedServer) this).getProperties().gamemode); // From DedicatedServer.init
 +
 +                WorldLoadListener worldloadlistener = this.progressListenerFactory.create(11);
 +
 +                world = new WorldServer(this, this.executor, worldSession, iworlddataserver, worldKey, dimensionmanager, worldloadlistener, chunkgenerator, flag, j, list, true, org.bukkit.World.Environment.getEnvironment(dimension), gen, biomeProvider);
-+                WorldPersistentData worldpersistentdata = world.getWorldPersistentData();
-+                this.initializeScoreboards(worldpersistentdata);
++                WorldPersistentData worldpersistentdata = world.getDataStorage();
++                this.readScoreboard(worldpersistentdata);
 +                this.server.scoreboardManager = new org.bukkit.craftbukkit.scoreboard.CraftScoreboardManager(this, world.getScoreboard());
 +                this.commandStorage = new PersistentCommandStorage(worldpersistentdata);
 +            } else {
@@ -304,108 +330,84 @@
 +                world = new WorldServer(this, this.executor, worldSession, iworlddataserver, worldKey, dimensionmanager, worldloadlistener, chunkgenerator, flag, j, ImmutableList.of(), true, org.bukkit.World.Environment.getEnvironment(dimension), gen, biomeProvider);
 +            }
 +
-+            worlddata.a(this.getServerModName(), this.getModded().isPresent());
-+            this.initWorld(world, worlddata, worldData, worlddata.getGeneratorSettings());
++            worlddata.setModdedInfo(this.getServerModName(), this.getModdedStatus().shouldReportAsModified());
++            this.initWorld(world, worlddata, worldData, worlddata.worldGenSettings());
 +
-+            this.levels.put(world.getDimensionKey(), world);
-+            this.getPlayerList().setPlayerFileData(world);
++            this.levels.put(world.dimension(), world);
++            this.getPlayerList().addWorldborderListener(world);
 +
 +            if (worlddata.getCustomBossEvents() != null) {
-+                this.getBossBattleCustomData().load(worlddata.getCustomBossEvents());
++                this.getCustomBossEvents().load(worlddata.getCustomBossEvents());
 +            }
 +        }
-         this.updateWorldSettings();
--        this.loadSpawn(worldloadlistener);
-+        for (WorldServer worldserver : this.getWorlds()) {
-+            this.loadSpawn(worldserver.getChunkProvider().chunkMap.progressListener, worldserver);
++        this.forceDifficulty();
++        for (WorldServer worldserver : this.getAllLevels()) {
++            this.prepareLevels(worldserver.getChunkSource().chunkMap.progressListener, worldserver);
 +            worldserver.entityManager.tick(); // SPIGOT-6526: Load pending entities so they are available to the API
 +            this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
-+        }
-+
+         }
+ 
+-        WorldServer worldserver = new WorldServer(this, this.executor, this.storageSource, iworlddataserver, World.OVERWORLD, dimensionmanager, worldloadlistener, (ChunkGenerator) object, flag, j, list, true);
 +        this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
 +        this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
 +        this.connection.acceptConnections();
-+        // CraftBukkit end
-     }
++    }
++    // CraftBukkit end
  
-     protected void updateWorldSettings() {}
+-        this.levels.put(World.OVERWORLD, worldserver);
+-        WorldPersistentData worldpersistentdata = worldserver.getDataStorage();
++    protected void forceDifficulty() {}
  
--    protected void a(WorldLoadListener worldloadlistener) {
--        IWorldDataServer iworlddataserver = this.worldData.H();
--        GeneratorSettings generatorsettings = this.worldData.getGeneratorSettings();
+-        this.readScoreboard(worldpersistentdata);
+-        this.commandStorage = new PersistentCommandStorage(worldpersistentdata);
 +    // CraftBukkit start
 +    public void initWorld(WorldServer worldserver, IWorldDataServer iworlddataserver, SaveData saveData, GeneratorSettings generatorsettings) {
-         boolean flag = generatorsettings.isDebugWorld();
--        long i = generatorsettings.getSeed();
--        long j = BiomeManager.a(i);
--        List<MobSpawner> list = ImmutableList.of(new MobSpawnerPhantom(), new MobSpawnerPatrol(), new MobSpawnerCat(), new VillageSiege(), new MobSpawnerTrader(iworlddataserver));
--        RegistryMaterials<WorldDimension> registrymaterials = generatorsettings.d();
--        WorldDimension worlddimension = (WorldDimension) registrymaterials.a(WorldDimension.OVERWORLD);
--        DimensionManager dimensionmanager;
--        Object object;
--
--        if (worlddimension == null) {
--            dimensionmanager = (DimensionManager) this.registryHolder.d(IRegistry.DIMENSION_TYPE_REGISTRY).d(DimensionManager.OVERWORLD_LOCATION);
--            object = GeneratorSettings.a(this.registryHolder.d(IRegistry.BIOME_REGISTRY), this.registryHolder.d(IRegistry.NOISE_GENERATOR_SETTINGS_REGISTRY), (new Random()).nextLong());
--        } else {
--            dimensionmanager = worlddimension.b();
--            object = worlddimension.c();
++        boolean flag = generatorsettings.isDebug();
 +        // CraftBukkit start
 +        if (worldserver.generator != null) {
 +            worldserver.getWorld().getPopulators().addAll(worldserver.generator.getDefaultPopulators(worldserver.getWorld()));
-         }
--
--        WorldServer worldserver = new WorldServer(this, this.executor, this.storageSource, iworlddataserver, World.OVERWORLD, dimensionmanager, worldloadlistener, (ChunkGenerator) object, flag, j, list, true);
--
--        this.levels.put(World.OVERWORLD, worldserver);
--        WorldPersistentData worldpersistentdata = worldserver.getWorldPersistentData();
--
--        this.initializeScoreboards(worldpersistentdata);
--        this.commandStorage = new PersistentCommandStorage(worldpersistentdata);
++        }
          WorldBorder worldborder = worldserver.getWorldBorder();
  
-         worldborder.a(iworlddataserver.r());
-+        this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldInitEvent(worldserver.getWorld())); // CraftBukkit - SPIGOT-5569
-         if (!iworlddataserver.p()) {
-             try {
-                 a(worldserver, iworlddataserver, generatorsettings.c(), flag);
-@@ -421,31 +646,8 @@
- 
-             iworlddataserver.c(true);
+         if (!iworlddataserver.isInitialized()) {
+@@ -411,31 +637,10 @@
+             iworlddataserver.setInitialized(true);
          }
--
--        this.getPlayerList().setPlayerFileData(worldserver);
+ 
+-        this.getPlayerList().addWorldborderListener(worldserver);
 -        if (this.worldData.getCustomBossEvents() != null) {
--            this.getBossBattleCustomData().load(this.worldData.getCustomBossEvents());
+-            this.getCustomBossEvents().load(this.worldData.getCustomBossEvents());
 -        }
 -
--        Iterator iterator = registrymaterials.d().iterator();
+-        Iterator iterator = registrymaterials.entrySet().iterator();
 -
 -        while (iterator.hasNext()) {
 -            Entry<ResourceKey<WorldDimension>, WorldDimension> entry = (Entry) iterator.next();
 -            ResourceKey<WorldDimension> resourcekey = (ResourceKey) entry.getKey();
 -
 -            if (resourcekey != WorldDimension.OVERWORLD) {
--                ResourceKey<World> resourcekey1 = ResourceKey.a(IRegistry.DIMENSION_REGISTRY, resourcekey.a());
--                DimensionManager dimensionmanager1 = ((WorldDimension) entry.getValue()).b();
--                ChunkGenerator chunkgenerator = ((WorldDimension) entry.getValue()).c();
+-                ResourceKey<World> resourcekey1 = ResourceKey.create(IRegistry.DIMENSION_REGISTRY, resourcekey.location());
+-                DimensionManager dimensionmanager1 = ((WorldDimension) entry.getValue()).type();
+-                ChunkGenerator chunkgenerator = ((WorldDimension) entry.getValue()).generator();
 -                SecondaryWorldData secondaryworlddata = new SecondaryWorldData(this.worldData, iworlddataserver);
 -                WorldServer worldserver1 = new WorldServer(this, this.executor, this.storageSource, secondaryworlddata, resourcekey1, dimensionmanager1, worldloadlistener, chunkgenerator, flag, j, ImmutableList.of(), false);
 -
--                worldborder.a((IWorldBorderListener) (new IWorldBorderListener.a(worldserver1.getWorldBorder())));
+-                worldborder.addListener(new IWorldBorderListener.a(worldserver1.getWorldBorder()));
 -                this.levels.put(resourcekey1, worldserver1);
 -            }
 -        }
 -
+         worldborder.applySettings(iworlddataserver.getWorldBorder());
++        this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldInitEvent(worldserver.getWorld())); // CraftBukkit - SPIGOT-5569
      }
 +    // CraftBukkit end
  
-     private static void a(WorldServer worldserver, IWorldDataServer iworlddataserver, boolean flag, boolean flag1) {
+     private static void setInitialSpawn(WorldServer worldserver, IWorldDataServer iworlddataserver, boolean flag, boolean flag1) {
          if (flag1) {
-@@ -458,6 +660,21 @@
-                 return biomebase.b().b();
-             }, random);
-             ChunkCoordIntPair chunkcoordintpair = blockposition == null ? new ChunkCoordIntPair(0, 0) : new ChunkCoordIntPair(blockposition);
+@@ -443,6 +648,21 @@
+         } else {
+             ChunkGenerator chunkgenerator = worldserver.getChunkSource().getGenerator();
+             ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(chunkgenerator.climateSampler().findSpawnPosition());
 +            // CraftBukkit start
 +            if (worldserver.generator != null) {
 +                Random rand = new Random(worldserver.getSeed());
@@ -413,7 +415,7 @@
 +
 +                if (spawn != null) {
 +                    if (spawn.getWorld() != worldserver.getWorld()) {
-+                        throw new IllegalStateException("Cannot set spawn point for " + iworlddataserver.getName() + " to be in another world (" + spawn.getWorld().getName() + ")");
++                        throw new IllegalStateException("Cannot set spawn point for " + iworlddataserver.getLevelName() + " to be in another world (" + spawn.getWorld().getName() + ")");
 +                    } else {
 +                        iworlddataserver.setSpawn(new BlockPosition(spawn.getBlockX(), spawn.getBlockY(), spawn.getBlockZ()), spawn.getYaw());
 +                        return;
@@ -421,97 +423,97 @@
 +                }
 +            }
 +            // CraftBukkit end
+             int i = chunkgenerator.getSpawnHeight(worldserver);
  
-             if (blockposition == null) {
-                 MinecraftServer.LOGGER.warn("Unable to find spawn biome");
-@@ -532,8 +749,15 @@
+             if (i < worldserver.getMinBuildHeight()) {
+@@ -500,8 +720,15 @@
          iworlddataserver.setGameType(EnumGamemode.SPECTATOR);
      }
  
--    public void loadSpawn(WorldLoadListener worldloadlistener) {
--        WorldServer worldserver = this.E();
+-    public void prepareLevels(WorldLoadListener worldloadlistener) {
+-        WorldServer worldserver = this.overworld();
 +    // CraftBukkit start
-+    public void loadSpawn(WorldLoadListener worldloadlistener, WorldServer worldserver) {
++    public void prepareLevels(WorldLoadListener worldloadlistener, WorldServer worldserver) {
 +        if (!worldserver.getWorld().getKeepSpawnInMemory()) {
 +            return;
 +        }
 +
-+        // WorldServer worldserver = this.E();
++        // WorldServer worldserver = this.overworld();
 +        this.forceTicks = true;
 +        // CraftBukkit end
  
-         MinecraftServer.LOGGER.info("Preparing start region for dimension {}", worldserver.getDimensionKey().a());
-         BlockPosition blockposition = worldserver.getSpawn();
-@@ -546,16 +770,20 @@
-         chunkproviderserver.addTicket(TicketType.START, new ChunkCoordIntPair(blockposition), 11, Unit.INSTANCE);
+         MinecraftServer.LOGGER.info("Preparing start region for dimension {}", worldserver.dimension().location());
+         BlockPosition blockposition = worldserver.getSharedSpawnPos();
+@@ -514,16 +741,20 @@
+         chunkproviderserver.addRegionTicket(TicketType.START, new ChunkCoordIntPair(blockposition), 11, Unit.INSTANCE);
  
-         while (chunkproviderserver.b() != 441) {
--            this.nextTickTime = SystemUtils.getMonotonicMillis() + 10L;
--            this.sleepForTick();
+         while (chunkproviderserver.getTickingGenerated() != 441) {
+-            this.nextTickTime = SystemUtils.getMillis() + 10L;
+-            this.waitUntilNextTick();
 +            // CraftBukkit start
-+            // this.nextTickTime = SystemUtils.getMonotonicMillis() + 10L;
++            // this.nextTickTime = SystemUtils.getMillis() + 10L;
 +            this.executeModerately();
 +            // CraftBukkit end
          }
  
--        this.nextTickTime = SystemUtils.getMonotonicMillis() + 10L;
--        this.sleepForTick();
+-        this.nextTickTime = SystemUtils.getMillis() + 10L;
+-        this.waitUntilNextTick();
 -        Iterator iterator = this.levels.values().iterator();
 -
 -        while (iterator.hasNext()) {
 -            WorldServer worldserver1 = (WorldServer) iterator.next();
 +        // CraftBukkit start
-+        // this.nextTickTime = SystemUtils.getMonotonicMillis() + 10L;
++        // this.nextTickTime = SystemUtils.getMillis() + 10L;
 +        this.executeModerately();
-+        // Iterator iterator = this.worldServer.values().iterator();
++        // Iterator iterator = this.levels.values().iterator();
 +
 +        if (true) {
 +            WorldServer worldserver1 = worldserver;
 +            // CraftBukkit end
-             ForcedChunk forcedchunk = (ForcedChunk) worldserver1.getWorldPersistentData().a(ForcedChunk::b, "chunks");
+             ForcedChunk forcedchunk = (ForcedChunk) worldserver1.getDataStorage().get(ForcedChunk::load, "chunks");
  
              if (forcedchunk != null) {
-@@ -570,11 +798,18 @@
+@@ -538,11 +769,18 @@
              }
          }
  
--        this.nextTickTime = SystemUtils.getMonotonicMillis() + 10L;
--        this.sleepForTick();
+-        this.nextTickTime = SystemUtils.getMillis() + 10L;
+-        this.waitUntilNextTick();
 +        // CraftBukkit start
-+        // this.nextTick = SystemUtils.getMonotonicMillis() + 10L;
++        // this.nextTickTime = SystemUtils.getMillis() + 10L;
 +        this.executeModerately();
 +        // CraftBukkit end
-         worldloadlistener.b();
-         chunkproviderserver.getLightEngine().a(5);
--        this.updateSpawnFlags();
+         worldloadlistener.stop();
+         chunkproviderserver.getLightEngine().setTaskPerBatch(5);
+-        this.updateMobSpawningFlags();
 +        // CraftBukkit start
-+        // this.updateSpawnFlags();
-+        worldserver.setSpawnFlags(this.getSpawnMonsters(), this.getSpawnAnimals());
++        // this.updateMobSpawningFlags();
++        worldserver.setSpawnSettings(this.isSpawningMonsters(), this.isSpawningAnimals());
 +
 +        this.forceTicks = false;
 +        // CraftBukkit end
      }
  
-     protected void loadResourcesZip() {
-@@ -619,12 +854,16 @@
+     protected void detectBundledResources() {
+@@ -587,12 +825,16 @@
              worldserver.save((IProgressUpdate) null, flag1, worldserver.noSave && !flag2);
          }
  
 +        // CraftBukkit start - moved to WorldServer.save
 +        /*
-         WorldServer worldserver1 = this.E();
-         IWorldDataServer iworlddataserver = this.worldData.H();
+         WorldServer worldserver1 = this.overworld();
+         IWorldDataServer iworlddataserver = this.worldData.overworldData();
  
-         iworlddataserver.a(worldserver1.getWorldBorder().t());
-         this.worldData.setCustomBossEvents(this.getBossBattleCustomData().save());
-         this.storageSource.a(this.registryHolder, this.worldData, this.getPlayerList().save());
+         iworlddataserver.setWorldBorder(worldserver1.getWorldBorder().createSettings());
+         this.worldData.setCustomBossEvents(this.getCustomBossEvents().save());
+         this.storageSource.saveDataTag(this.registryHolder, this.worldData, this.getPlayerList().getSingleplayerData());
 +        */
 +        // CraftBukkit end
          if (flag1) {
-             Iterator iterator1 = this.getWorlds().iterator();
+             Iterator iterator1 = this.getAllLevels().iterator();
  
-@@ -645,8 +884,29 @@
-         this.stop();
+@@ -627,8 +869,29 @@
+         this.stopServer();
      }
  
 +    // CraftBukkit start
@@ -524,7 +526,7 @@
 +    }
 +    // CraftBukkit end
 +
-     public void stop() {
+     public void stopServer() {
 +        // CraftBukkit start - prevent double stopping on multiple threads
 +        synchronized(stopLock) {
 +            if (hasStopped) return;
@@ -537,20 +539,20 @@
 +            this.server.disablePlugins();
 +        }
 +        // CraftBukkit end
-         if (this.getServerConnection() != null) {
-             this.getServerConnection().b();
+         if (this.getConnection() != null) {
+             this.getConnection().stop();
          }
-@@ -655,6 +915,7 @@
+@@ -638,6 +901,7 @@
              MinecraftServer.LOGGER.info("Saving players");
-             this.playerList.savePlayers();
-             this.playerList.shutdown();
+             this.playerList.saveAll();
+             this.playerList.removeAll();
 +            try { Thread.sleep(100); } catch (InterruptedException ex) {} // CraftBukkit - SPIGOT-625 - give server at least a chance to send packets
          }
  
          MinecraftServer.LOGGER.info("Saving worlds");
-@@ -732,9 +993,10 @@
+@@ -712,9 +976,10 @@
                  while (this.running) {
-                     long i = SystemUtils.getMonotonicMillis() - this.nextTickTime;
+                     long i = SystemUtils.getMillis() - this.nextTickTime;
  
 -                    if (i > 2000L && this.nextTickTime - this.lastOverloadWarning >= 15000L) {
 +                    if (i > 5000L && this.nextTickTime - this.lastOverloadWarning >= 30000L) { // CraftBukkit
@@ -560,62 +562,71 @@
                          MinecraftServer.LOGGER.warn("Can't keep up! Is the server overloaded? Running {}ms or {} ticks behind", i, j);
                          this.nextTickTime += j * 50L;
                          this.lastOverloadWarning = this.nextTickTime;
-@@ -745,6 +1007,7 @@
-                         this.debugCommandProfiler = new MinecraftServer.a(SystemUtils.getMonotonicNanos(), this.tickCount);
+@@ -725,6 +990,7 @@
+                         this.debugCommandProfiler = new MinecraftServer.a(SystemUtils.getNanos(), this.tickCount);
                      }
  
 +                    MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit
                      this.nextTickTime += 50L;
-                     this.bh();
-                     this.profiler.enter("tick");
-@@ -790,6 +1053,12 @@
-             } catch (Throwable throwable1) {
-                 MinecraftServer.LOGGER.error("Exception stopping the server", throwable1);
-             } finally {
+                     this.startMetricsRecordingTick();
+                     this.profiler.push("tick");
+@@ -775,6 +1041,12 @@
+                     this.profileCache.clearExecutor();
+                 }
+ 
 +                // CraftBukkit start - Restore terminal to original settings
 +                try {
 +                    reader.getTerminal().restore();
 +                } catch (Exception ignored) {
 +                }
 +                // CraftBukkit end
-                 this.exit();
+                 this.onServerExit();
              }
  
-@@ -798,8 +1067,15 @@
+@@ -783,8 +1055,15 @@
      }
  
-     private boolean canSleepForTick() {
--        return this.isEntered() || SystemUtils.getMonotonicMillis() < (this.mayHaveDelayedTasks ? this.delayedTasksMaxNextTickTime : this.nextTickTime);
+     private boolean haveTime() {
+-        return this.runningTask() || SystemUtils.getMillis() < (this.mayHaveDelayedTasks ? this.delayedTasksMaxNextTickTime : this.nextTickTime);
 +        // CraftBukkit start
-+        return this.forceTicks || this.isEntered() || SystemUtils.getMonotonicMillis() < (this.mayHaveDelayedTasks ? this.delayedTasksMaxNextTickTime : this.nextTickTime);
++        return this.forceTicks || this.runningTask() || SystemUtils.getMillis() < (this.mayHaveDelayedTasks ? this.delayedTasksMaxNextTickTime : this.nextTickTime);
 +    }
 +
 +    private void executeModerately() {
-+        this.executeAll();
++        this.runAllTasks();
 +        java.util.concurrent.locks.LockSupport.parkNanos("executing tasks", 1000L);
      }
 +    // CraftBukkit end
  
-     protected void sleepForTick() {
-         this.executeAll();
-@@ -908,7 +1184,7 @@
-             this.status.b().a(agameprofile);
+     protected void waitUntilNextTick() {
+         this.runAllTasks();
+@@ -830,7 +1109,7 @@
+         }
+     }
+ 
+-    protected void doRunTask(TickTask ticktask) {
++    public void doRunTask(TickTask ticktask) { // CraftBukkit - decompile error
+         this.getProfiler().incrementCounter("runTask");
+         super.doRunTask(ticktask);
+     }
+@@ -901,7 +1180,7 @@
+             }
          }
  
 -        if (this.tickCount % 6000 == 0) {
 +        if (autosavePeriod > 0 && this.tickCount % autosavePeriod == 0) { // CraftBukkit
              MinecraftServer.LOGGER.debug("Autosave started");
-             this.profiler.enter("save");
-             this.playerList.savePlayers();
-@@ -938,22 +1214,39 @@
+             this.profiler.push("save");
+             this.saveEverything(true, false, false);
+@@ -920,22 +1199,39 @@
      }
  
-     public void b(BooleanSupplier booleansupplier) {
+     public void tickChildren(BooleanSupplier booleansupplier) {
 +        this.server.getScheduler().mainThreadHeartbeat(this.tickCount); // CraftBukkit
-         this.profiler.enter("commandFunctions");
-         this.getFunctionData().tick();
-         this.profiler.exitEnter("levels");
-         Iterator iterator = this.getWorlds().iterator();
+         this.profiler.push("commandFunctions");
+         this.getFunctions().tick();
+         this.profiler.popPush("levels");
+         Iterator iterator = this.getAllLevels().iterator();
  
 +        // CraftBukkit start
 +        // Run tasks that are waiting on processing
@@ -627,27 +638,27 @@
 +        if (this.tickCount % 20 == 0) {
 +            for (int i = 0; i < this.getPlayerList().players.size(); ++i) {
 +                EntityPlayer entityplayer = (EntityPlayer) this.getPlayerList().players.get(i);
-+                entityplayer.connection.sendPacket(new PacketPlayOutUpdateTime(entityplayer.level.getTime(), entityplayer.getPlayerTime(), entityplayer.level.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT))); // Add support for per player time
++                entityplayer.connection.send(new PacketPlayOutUpdateTime(entityplayer.level.getGameTime(), entityplayer.getPlayerTime(), entityplayer.level.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT))); // Add support for per player time
 +            }
 +        }
 +
          while (iterator.hasNext()) {
              WorldServer worldserver = (WorldServer) iterator.next();
  
-             this.profiler.a(() -> {
-                 return worldserver + " " + worldserver.getDimensionKey().a();
+             this.profiler.push(() -> {
+                 return worldserver + " " + worldserver.dimension().location();
              });
 +            /* Drop global time updates
              if (this.tickCount % 20 == 0) {
-                 this.profiler.enter("timeSync");
-                 this.playerList.a((Packet) (new PacketPlayOutUpdateTime(worldserver.getTime(), worldserver.getDayTime(), worldserver.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT))), worldserver.getDimensionKey());
-                 this.profiler.exit();
+                 this.profiler.push("timeSync");
+                 this.playerList.broadcastAll(new PacketPlayOutUpdateTime(worldserver.getGameTime(), worldserver.getDayTime(), worldserver.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)), worldserver.dimension());
+                 this.profiler.pop();
              }
 +            // CraftBukkit end */
  
-             this.profiler.enter("tick");
+             this.profiler.push("tick");
  
-@@ -1042,7 +1335,7 @@
+@@ -1024,7 +1320,7 @@
  
      @DontObfuscate
      public String getServerModName() {
@@ -655,35 +666,44 @@
 +        return server.getName(); // CraftBukkit - cb > vanilla!
      }
  
-     public SystemReport b(SystemReport systemreport) {
-@@ -1414,16 +1707,17 @@
+     public SystemReport fillSystemReport(SystemReport systemreport) {
+@@ -1351,16 +1647,17 @@
  
-     public CompletableFuture<Void> a(Collection<String> collection) {
+     public CompletableFuture<Void> reloadResources(Collection<String> collection) {
          CompletableFuture<Void> completablefuture = CompletableFuture.supplyAsync(() -> {
 -            Stream stream = collection.stream();
 +            Stream<String> stream = collection.stream(); // CraftBukkit - decompile error
              ResourcePackRepository resourcepackrepository = this.packRepository;
  
              Objects.requireNonNull(this.packRepository);
--            return (ImmutableList) stream.map(resourcepackrepository::a).filter(Objects::nonNull).map(ResourcePackLoader::d).collect(ImmutableList.toImmutableList());
-+            return stream.map(resourcepackrepository::a).filter(Objects::nonNull).map(ResourcePackLoader::d).collect(ImmutableList.toImmutableList()); // CraftBukkit - decompile error
+-            return (ImmutableList) stream.map(resourcepackrepository::getPack).filter(Objects::nonNull).map(ResourcePackLoader::open).collect(ImmutableList.toImmutableList());
++            return stream.map(resourcepackrepository::getPack).filter(Objects::nonNull).map(ResourcePackLoader::open).collect(ImmutableList.toImmutableList()); // CraftBukkit - decompile error
          }, this).thenCompose((immutablelist) -> {
-             return DataPackResources.a(immutablelist, this.registryHolder, this.k() ? CommandDispatcher.ServerType.DEDICATED : CommandDispatcher.ServerType.INTEGRATED, this.i(), this.executor, this);
+             return DataPackResources.loadResources(immutablelist, this.registryHolder, this.isDedicatedServer() ? CommandDispatcher.ServerType.DEDICATED : CommandDispatcher.ServerType.INTEGRATED, this.getFunctionCompilationLevel(), this.executor, this);
          }).thenAcceptAsync((datapackresources) -> {
              this.resources.close();
              this.resources = datapackresources;
 +            this.server.syncCommands(); // SPIGOT-5884: Lost on reload
-             this.packRepository.a(collection);
-             this.worldData.a(a(this.packRepository));
-             datapackresources.j();
-@@ -1768,6 +2062,22 @@
+             this.packRepository.setSelected(collection);
+             this.worldData.setDataPackConfig(getSelectedPacks(this.packRepository));
+             datapackresources.updateGlobals();
+@@ -1714,7 +2011,7 @@
+             try {
+                 label51:
+                 {
+-                    ArrayList arraylist;
++                    ArrayList<NativeModuleLister.a> arraylist; // CraftBukkit - decompile error
+ 
+                     try {
+                         arraylist = Lists.newArrayList(NativeModuleLister.listModules());
+@@ -1764,6 +2061,22 @@
  
      }
  
 +    // CraftBukkit start
 +    @Override
-+    public boolean isMainThread() {
-+        return super.isMainThread() || this.isStopped(); // CraftBukkit - MC-142590
++    public boolean isSameThread() {
++        return super.isSameThread() || this.isStopped(); // CraftBukkit - MC-142590
 +    }
 +
 +    public boolean isDebugging() {
@@ -696,6 +716,6 @@
 +    }
 +    // CraftBukkit end
 +
-     private void bh() {
+     private void startMetricsRecordingTick() {
          if (this.willStartRecordingMetrics) {
-             this.metricsRecorder = ActiveMetricsRecorder.a(new ServerMetricsSamplersProvider(SystemUtils.timeSource, this.k()), SystemUtils.timeSource, SystemUtils.g(), new MetricsPersister("server"), this.onMetricsRecordingStopped, (path) -> {
+             this.metricsRecorder = ActiveMetricsRecorder.createStarted(new ServerMetricsSamplersProvider(SystemUtils.timeSource, this.isDedicatedServer()), SystemUtils.timeSource, SystemUtils.ioPool(), new MetricsPersister("server"), this.onMetricsRecordingStopped, (path) -> {

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

@@ -1,100 +1,100 @@
 --- a/net/minecraft/server/ScoreboardServer.java
 +++ b/net/minecraft/server/ScoreboardServer.java
 @@ -34,7 +34,7 @@
-     public void handleScoreChanged(ScoreboardScore scoreboardscore) {
-         super.handleScoreChanged(scoreboardscore);
+     public void onScoreChanged(ScoreboardScore scoreboardscore) {
+         super.onScoreChanged(scoreboardscore);
          if (this.trackedObjectives.contains(scoreboardscore.getObjective())) {
--            this.server.getPlayerList().sendAll(new PacketPlayOutScoreboardScore(ScoreboardServer.Action.CHANGE, scoreboardscore.getObjective().getName(), scoreboardscore.getPlayerName(), scoreboardscore.getScore()));
-+            this.sendAll(new PacketPlayOutScoreboardScore(ScoreboardServer.Action.CHANGE, scoreboardscore.getObjective().getName(), scoreboardscore.getPlayerName(), scoreboardscore.getScore()));
+-            this.server.getPlayerList().broadcastAll(new PacketPlayOutScoreboardScore(ScoreboardServer.Action.CHANGE, scoreboardscore.getObjective().getName(), scoreboardscore.getOwner(), scoreboardscore.getScore()));
++            this.broadcastAll(new PacketPlayOutScoreboardScore(ScoreboardServer.Action.CHANGE, scoreboardscore.getObjective().getName(), scoreboardscore.getOwner(), scoreboardscore.getScore()));
          }
  
-         this.a();
+         this.setDirty();
 @@ -43,7 +43,7 @@
      @Override
-     public void handlePlayerRemoved(String s) {
-         super.handlePlayerRemoved(s);
--        this.server.getPlayerList().sendAll(new PacketPlayOutScoreboardScore(ScoreboardServer.Action.REMOVE, (String) null, s, 0));
-+        this.sendAll(new PacketPlayOutScoreboardScore(ScoreboardServer.Action.REMOVE, (String) null, s, 0));
-         this.a();
+     public void onPlayerRemoved(String s) {
+         super.onPlayerRemoved(s);
+-        this.server.getPlayerList().broadcastAll(new PacketPlayOutScoreboardScore(ScoreboardServer.Action.REMOVE, (String) null, s, 0));
++        this.broadcastAll(new PacketPlayOutScoreboardScore(ScoreboardServer.Action.REMOVE, (String) null, s, 0));
+         this.setDirty();
      }
  
 @@ -51,7 +51,7 @@
-     public void a(String s, ScoreboardObjective scoreboardobjective) {
-         super.a(s, scoreboardobjective);
+     public void onPlayerScoreRemoved(String s, ScoreboardObjective scoreboardobjective) {
+         super.onPlayerScoreRemoved(s, scoreboardobjective);
          if (this.trackedObjectives.contains(scoreboardobjective)) {
--            this.server.getPlayerList().sendAll(new PacketPlayOutScoreboardScore(ScoreboardServer.Action.REMOVE, scoreboardobjective.getName(), s, 0));
-+            this.sendAll(new PacketPlayOutScoreboardScore(ScoreboardServer.Action.REMOVE, scoreboardobjective.getName(), s, 0));
+-            this.server.getPlayerList().broadcastAll(new PacketPlayOutScoreboardScore(ScoreboardServer.Action.REMOVE, scoreboardobjective.getName(), s, 0));
++            this.broadcastAll(new PacketPlayOutScoreboardScore(ScoreboardServer.Action.REMOVE, scoreboardobjective.getName(), s, 0));
          }
  
-         this.a();
+         this.setDirty();
 @@ -64,7 +64,7 @@
-         super.setDisplaySlot(i, scoreboardobjective);
+         super.setDisplayObjective(i, scoreboardobjective);
          if (scoreboardobjective1 != scoreboardobjective && scoreboardobjective1 != null) {
-             if (this.h(scoreboardobjective1) > 0) {
--                this.server.getPlayerList().sendAll(new PacketPlayOutScoreboardDisplayObjective(i, scoreboardobjective));
-+                this.sendAll(new PacketPlayOutScoreboardDisplayObjective(i, scoreboardobjective));
+             if (this.getObjectiveDisplaySlotCount(scoreboardobjective1) > 0) {
+-                this.server.getPlayerList().broadcastAll(new PacketPlayOutScoreboardDisplayObjective(i, scoreboardobjective));
++                this.broadcastAll(new PacketPlayOutScoreboardDisplayObjective(i, scoreboardobjective));
              } else {
-                 this.g(scoreboardobjective1);
+                 this.stopTrackingObjective(scoreboardobjective1);
              }
 @@ -72,7 +72,7 @@
  
          if (scoreboardobjective != null) {
              if (this.trackedObjectives.contains(scoreboardobjective)) {
--                this.server.getPlayerList().sendAll(new PacketPlayOutScoreboardDisplayObjective(i, scoreboardobjective));
-+                this.sendAll(new PacketPlayOutScoreboardDisplayObjective(i, scoreboardobjective));
+-                this.server.getPlayerList().broadcastAll(new PacketPlayOutScoreboardDisplayObjective(i, scoreboardobjective));
++                this.broadcastAll(new PacketPlayOutScoreboardDisplayObjective(i, scoreboardobjective));
              } else {
-                 this.e(scoreboardobjective);
+                 this.startTrackingObjective(scoreboardobjective);
              }
 @@ -84,7 +84,7 @@
      @Override
      public boolean addPlayerToTeam(String s, ScoreboardTeam scoreboardteam) {
          if (super.addPlayerToTeam(s, scoreboardteam)) {
--            this.server.getPlayerList().sendAll(PacketPlayOutScoreboardTeam.a(scoreboardteam, s, PacketPlayOutScoreboardTeam.a.ADD));
-+            this.sendAll(PacketPlayOutScoreboardTeam.a(scoreboardteam, s, PacketPlayOutScoreboardTeam.a.ADD));
-             this.a();
+-            this.server.getPlayerList().broadcastAll(PacketPlayOutScoreboardTeam.createPlayerPacket(scoreboardteam, s, PacketPlayOutScoreboardTeam.a.ADD));
++            this.broadcastAll(PacketPlayOutScoreboardTeam.createPlayerPacket(scoreboardteam, s, PacketPlayOutScoreboardTeam.a.ADD));
+             this.setDirty();
              return true;
          } else {
 @@ -95,7 +95,7 @@
      @Override
      public void removePlayerFromTeam(String s, ScoreboardTeam scoreboardteam) {
          super.removePlayerFromTeam(s, scoreboardteam);
--        this.server.getPlayerList().sendAll(PacketPlayOutScoreboardTeam.a(scoreboardteam, s, PacketPlayOutScoreboardTeam.a.REMOVE));
-+        this.sendAll(PacketPlayOutScoreboardTeam.a(scoreboardteam, s, PacketPlayOutScoreboardTeam.a.REMOVE));
-         this.a();
+-        this.server.getPlayerList().broadcastAll(PacketPlayOutScoreboardTeam.createPlayerPacket(scoreboardteam, s, PacketPlayOutScoreboardTeam.a.REMOVE));
++        this.broadcastAll(PacketPlayOutScoreboardTeam.createPlayerPacket(scoreboardteam, s, PacketPlayOutScoreboardTeam.a.REMOVE));
+         this.setDirty();
      }
  
 @@ -109,7 +109,7 @@
-     public void handleObjectiveChanged(ScoreboardObjective scoreboardobjective) {
-         super.handleObjectiveChanged(scoreboardobjective);
+     public void onObjectiveChanged(ScoreboardObjective scoreboardobjective) {
+         super.onObjectiveChanged(scoreboardobjective);
          if (this.trackedObjectives.contains(scoreboardobjective)) {
--            this.server.getPlayerList().sendAll(new PacketPlayOutScoreboardObjective(scoreboardobjective, 2));
-+            this.sendAll(new PacketPlayOutScoreboardObjective(scoreboardobjective, 2));
+-            this.server.getPlayerList().broadcastAll(new PacketPlayOutScoreboardObjective(scoreboardobjective, 2));
++            this.broadcastAll(new PacketPlayOutScoreboardObjective(scoreboardobjective, 2));
          }
  
-         this.a();
+         this.setDirty();
 @@ -128,21 +128,21 @@
      @Override
-     public void handleTeamAdded(ScoreboardTeam scoreboardteam) {
-         super.handleTeamAdded(scoreboardteam);
--        this.server.getPlayerList().sendAll(PacketPlayOutScoreboardTeam.a(scoreboardteam, true));
-+        this.sendAll(PacketPlayOutScoreboardTeam.a(scoreboardteam, true));
-         this.a();
+     public void onTeamAdded(ScoreboardTeam scoreboardteam) {
+         super.onTeamAdded(scoreboardteam);
+-        this.server.getPlayerList().broadcastAll(PacketPlayOutScoreboardTeam.createAddOrModifyPacket(scoreboardteam, true));
++        this.broadcastAll(PacketPlayOutScoreboardTeam.createAddOrModifyPacket(scoreboardteam, true));
+         this.setDirty();
      }
  
      @Override
-     public void handleTeamChanged(ScoreboardTeam scoreboardteam) {
-         super.handleTeamChanged(scoreboardteam);
--        this.server.getPlayerList().sendAll(PacketPlayOutScoreboardTeam.a(scoreboardteam, false));
-+        this.sendAll(PacketPlayOutScoreboardTeam.a(scoreboardteam, false));
-         this.a();
+     public void onTeamChanged(ScoreboardTeam scoreboardteam) {
+         super.onTeamChanged(scoreboardteam);
+-        this.server.getPlayerList().broadcastAll(PacketPlayOutScoreboardTeam.createAddOrModifyPacket(scoreboardteam, false));
++        this.broadcastAll(PacketPlayOutScoreboardTeam.createAddOrModifyPacket(scoreboardteam, false));
+         this.setDirty();
      }
  
      @Override
-     public void handleTeamRemoved(ScoreboardTeam scoreboardteam) {
-         super.handleTeamRemoved(scoreboardteam);
--        this.server.getPlayerList().sendAll(PacketPlayOutScoreboardTeam.a(scoreboardteam));
-+        this.sendAll(PacketPlayOutScoreboardTeam.a(scoreboardteam));
-         this.a();
+     public void onTeamRemoved(ScoreboardTeam scoreboardteam) {
+         super.onTeamRemoved(scoreboardteam);
+-        this.server.getPlayerList().broadcastAll(PacketPlayOutScoreboardTeam.createRemovePacket(scoreboardteam));
++        this.broadcastAll(PacketPlayOutScoreboardTeam.createRemovePacket(scoreboardteam));
+         this.setDirty();
      }
  
 @@ -189,6 +189,7 @@
@@ -114,14 +114,14 @@
  
              while (iterator1.hasNext()) {
 @@ -257,6 +259,16 @@
-         return this.b().b(nbttagcompound);
+         return this.createData().load(nbttagcompound);
      }
  
 +    // CraftBukkit start - Send to players
-+    private void sendAll(Packet packet) {
++    private void broadcastAll(Packet packet) {
 +        for (EntityPlayer entityplayer : (List<EntityPlayer>) this.server.getPlayerList().players) {
 +            if (entityplayer.getBukkitEntity().getScoreboard().getHandle() == this) {
-+                entityplayer.connection.sendPacket(packet);
++                entityplayer.connection.send(packet);
 +            }
 +        }
 +    }

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
-@@ -73,7 +73,7 @@
+@@ -72,7 +72,7 @@
              if (entity instanceof EntityLiving) {
                  MobEffect mobeffect = new MobEffect(mobeffectlist, k, i, false, flag);
  
@@ -9,7 +9,7 @@
                      ++j;
                  }
              }
-@@ -99,7 +99,7 @@
+@@ -98,7 +98,7 @@
          while (iterator.hasNext()) {
              Entity entity = (Entity) iterator.next();
  
@@ -18,7 +18,7 @@
                  ++i;
              }
          }
-@@ -124,7 +124,7 @@
+@@ -123,7 +123,7 @@
          while (iterator.hasNext()) {
              Entity entity = (Entity) iterator.next();
  

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

@@ -2,19 +2,19 @@
 +++ b/net/minecraft/server/commands/CommandGamerule.java
 @@ -31,7 +31,7 @@
  
-     static <T extends GameRules.GameRuleValue<T>> int a(CommandContext<CommandListenerWrapper> commandcontext, GameRules.GameRuleKey<T> gamerules_gamerulekey) {
+     static <T extends GameRules.GameRuleValue<T>> int setRule(CommandContext<CommandListenerWrapper> commandcontext, GameRules.GameRuleKey<T> gamerules_gamerulekey) {
          CommandListenerWrapper commandlistenerwrapper = (CommandListenerWrapper) commandcontext.getSource();
--        T t0 = commandlistenerwrapper.getServer().getGameRules().get(gamerules_gamerulekey);
-+        T t0 = commandlistenerwrapper.getWorld().getGameRules().get(gamerules_gamerulekey); // CraftBukkit
+-        T t0 = commandlistenerwrapper.getServer().getGameRules().getRule(gamerules_gamerulekey);
++        T t0 = commandlistenerwrapper.getLevel().getGameRules().getRule(gamerules_gamerulekey); // CraftBukkit
  
-         t0.b(commandcontext, "value");
-         commandlistenerwrapper.sendMessage(new ChatMessage("commands.gamerule.set", new Object[]{gamerules_gamerulekey.a(), t0.toString()}), true);
+         t0.setFromArgument(commandcontext, "value");
+         commandlistenerwrapper.sendSuccess(new ChatMessage("commands.gamerule.set", new Object[]{gamerules_gamerulekey.getId(), t0.toString()}), true);
 @@ -39,7 +39,7 @@
      }
  
-     static <T extends GameRules.GameRuleValue<T>> int a(CommandListenerWrapper commandlistenerwrapper, GameRules.GameRuleKey<T> gamerules_gamerulekey) {
--        T t0 = commandlistenerwrapper.getServer().getGameRules().get(gamerules_gamerulekey);
-+        T t0 = commandlistenerwrapper.getWorld().getGameRules().get(gamerules_gamerulekey); // CraftBukkit
+     static <T extends GameRules.GameRuleValue<T>> int queryRule(CommandListenerWrapper commandlistenerwrapper, GameRules.GameRuleKey<T> gamerules_gamerulekey) {
+-        T t0 = commandlistenerwrapper.getServer().getGameRules().getRule(gamerules_gamerulekey);
++        T t0 = commandlistenerwrapper.getLevel().getGameRules().getRule(gamerules_gamerulekey); // CraftBukkit
  
-         commandlistenerwrapper.sendMessage(new ChatMessage("commands.gamerule.query", new Object[]{gamerules_gamerulekey.a(), t0.toString()}), false);
-         return t0.getIntValue();
+         commandlistenerwrapper.sendSuccess(new ChatMessage("commands.gamerule.query", new Object[]{gamerules_gamerulekey.getId(), t0.toString()}), false);
+         return t0.getCommandResult();

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

@@ -1,7 +1,7 @@
 --- a/net/minecraft/server/commands/CommandList.java
 +++ b/net/minecraft/server/commands/CommandList.java
 @@ -37,6 +37,12 @@
-     private static int a(CommandListenerWrapper commandlistenerwrapper, Function<EntityPlayer, IChatBaseComponent> function) {
+     private static int format(CommandListenerWrapper commandlistenerwrapper, Function<EntityPlayer, IChatBaseComponent> function) {
          PlayerList playerlist = commandlistenerwrapper.getServer().getPlayerList();
          List<EntityPlayer> list = playerlist.getPlayers();
 +        // CraftBukkit start
@@ -10,6 +10,6 @@
 +            list = list.stream().filter((ep) -> sender.canSee(ep.getBukkitEntity())).collect(java.util.stream.Collectors.toList());
 +        }
 +        // CraftBukkit end
-         IChatBaseComponent ichatbasecomponent = ChatComponentUtils.b(list, function);
+         IChatBaseComponent ichatbasecomponent = ChatComponentUtils.formatList(list, function);
  
-         commandlistenerwrapper.sendMessage(new ChatMessage("commands.list.players", new Object[]{list.size(), playerlist.getMaxPlayers(), ichatbasecomponent}), false);
+         commandlistenerwrapper.sendSuccess(new ChatMessage("commands.list.players", new Object[]{list.size(), playerlist.getMaxPlayers(), ichatbasecomponent}), false);

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

@@ -6,14 +6,14 @@
  
 +    // CraftBukkit start
 +    public static void reload(MinecraftServer minecraftserver) {
-+        ResourcePackRepository resourcepackrepository = minecraftserver.getResourcePackRepository();
-+        SaveData savedata = minecraftserver.getSaveData();
-+        Collection<String> collection = resourcepackrepository.d();
-+        Collection<String> collection1 = a(resourcepackrepository, savedata, collection);
-+        minecraftserver.a(collection1);
++        ResourcePackRepository resourcepackrepository = minecraftserver.getPackRepository();
++        SaveData savedata = minecraftserver.getWorldData();
++        Collection<String> collection = resourcepackrepository.getSelectedIds();
++        Collection<String> collection1 = discoverNewPacks(resourcepackrepository, savedata, collection);
++        minecraftserver.reloadResources(collection1);
 +    }
 +    // CraftBukkit end
 +
-     public static void a(CommandDispatcher<CommandListenerWrapper> commanddispatcher) {
-         commanddispatcher.register((LiteralArgumentBuilder) ((LiteralArgumentBuilder) net.minecraft.commands.CommandDispatcher.a("reload").requires((commandlistenerwrapper) -> {
+     public static void register(CommandDispatcher<CommandListenerWrapper> commanddispatcher) {
+         commanddispatcher.register((LiteralArgumentBuilder) ((LiteralArgumentBuilder) net.minecraft.commands.CommandDispatcher.literal("reload").requires((commandlistenerwrapper) -> {
              return commandlistenerwrapper.hasPermission(2);

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

@@ -1,20 +1,11 @@
 --- a/net/minecraft/server/commands/CommandSchedule.java
 +++ b/net/minecraft/server/commands/CommandSchedule.java
-@@ -57,7 +57,7 @@
+@@ -56,7 +56,7 @@
          } else {
-             long j = commandlistenerwrapper.getWorld().getTime() + (long) i;
+             long j = commandlistenerwrapper.getLevel().getGameTime() + (long) i;
              MinecraftKey minecraftkey = (MinecraftKey) pair.getFirst();
--            CustomFunctionCallbackTimerQueue<MinecraftServer> customfunctioncallbacktimerqueue = commandlistenerwrapper.getServer().getSaveData().H().u();
-+            CustomFunctionCallbackTimerQueue<MinecraftServer> customfunctioncallbacktimerqueue = commandlistenerwrapper.getWorld().serverLevelData.H().u(); // CraftBukkit - SPIGOT-6667: Use world specific function timer
+-            CustomFunctionCallbackTimerQueue<MinecraftServer> customfunctioncallbacktimerqueue = commandlistenerwrapper.getServer().getWorldData().overworldData().getScheduledEvents();
++            CustomFunctionCallbackTimerQueue<MinecraftServer> customfunctioncallbacktimerqueue = commandlistenerwrapper.getLevel().serverLevelData.overworldData().getScheduledEvents(); // CraftBukkit - SPIGOT-6667: Use world specific function timer
  
              ((Either) pair.getSecond()).ifLeft((customfunction) -> {
                  String s = minecraftkey.toString();
-@@ -78,7 +78,7 @@
-                 customfunctioncallbacktimerqueue.a(s, j, new CustomFunctionCallbackTag(minecraftkey));
-                 commandlistenerwrapper.sendMessage(new ChatMessage("commands.schedule.created.tag", new Object[]{minecraftkey, i, j}), true);
-             });
--            return Math.floorMod(j, Integer.MAX_VALUE);
-+            return (int) Math.floorMod(j, (long) Integer.MAX_VALUE); // CraftBukkit - Downgrade to Java 8 method
-         }
-     }
- 

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

@@ -1,41 +1,41 @@
 --- a/net/minecraft/server/commands/CommandSpreadPlayers.java
 +++ b/net/minecraft/server/commands/CommandSpreadPlayers.java
-@@ -80,7 +80,7 @@
+@@ -79,7 +79,7 @@
              if (entity instanceof EntityHuman) {
-                 set.add(entity.getScoreboardTeam());
+                 set.add(entity.getTeam());
              } else {
 -                set.add((Object) null);
 +                set.add((ScoreboardTeamBase) null); // CraftBukkit - decompile error
              }
          }
  
-@@ -289,7 +289,7 @@
+@@ -288,7 +288,7 @@
  
-             for (boolean flag2 = iblockaccess.getType(blockposition_mutableblockposition).isAir(); blockposition_mutableblockposition.getY() > iblockaccess.getMinBuildHeight(); flag2 = flag1) {
-                 blockposition_mutableblockposition.c(EnumDirection.DOWN);
--                flag1 = iblockaccess.getType(blockposition_mutableblockposition).isAir();
-+                flag1 = getType(iblockaccess, blockposition_mutableblockposition).isAir(); // CraftBukkit
+             for (boolean flag2 = iblockaccess.getBlockState(blockposition_mutableblockposition).isAir(); blockposition_mutableblockposition.getY() > iblockaccess.getMinBuildHeight(); flag2 = flag1) {
+                 blockposition_mutableblockposition.move(EnumDirection.DOWN);
+-                flag1 = iblockaccess.getBlockState(blockposition_mutableblockposition).isAir();
++                flag1 = getBlockState(iblockaccess, blockposition_mutableblockposition).isAir(); // CraftBukkit
                  if (!flag1 && flag2 && flag) {
                      return blockposition_mutableblockposition.getY() + 1;
                  }
-@@ -302,7 +302,7 @@
+@@ -301,7 +301,7 @@
  
-         public boolean b(IBlockAccess iblockaccess, int i) {
-             BlockPosition blockposition = new BlockPosition(this.x, (double) (this.a(iblockaccess, i) - 1), this.z);
--            IBlockData iblockdata = iblockaccess.getType(blockposition);
-+            IBlockData iblockdata = getType(iblockaccess, blockposition); // CraftBukkit
+         public boolean isSafe(IBlockAccess iblockaccess, int i) {
+             BlockPosition blockposition = new BlockPosition(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();
  
              return blockposition.getY() < i && !material.isLiquid() && material != Material.FIRE;
-@@ -312,5 +312,12 @@
-             this.x = MathHelper.a(random, d0, d2);
-             this.z = MathHelper.a(random, d1, d3);
+@@ -311,5 +311,12 @@
+             this.x = MathHelper.nextDouble(random, d0, d2);
+             this.z = MathHelper.nextDouble(random, d1, d3);
          }
 +
-+        // CraftBukkit start - add a version of getType which force loads chunks
-+        private static IBlockData getType(IBlockAccess iblockaccess, BlockPosition position) {
-+            ((WorldServer) iblockaccess).getChunkProvider().getChunkAt(position.getX() >> 4, position.getZ() >> 4, true);
-+            return iblockaccess.getType(position);
++        // CraftBukkit start - add a version of getBlockState which force loads chunks
++        private static IBlockData getBlockState(IBlockAccess iblockaccess, BlockPosition position) {
++            ((WorldServer) iblockaccess).getChunkSource().getChunk(position.getX() >> 4, position.getZ() >> 4, true);
++            return iblockaccess.getBlockState(position);
 +        }
 +        // CraftBukkit end
      }

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

@@ -1,11 +1,11 @@
 --- a/net/minecraft/server/commands/CommandSummon.java
 +++ b/net/minecraft/server/commands/CommandSummon.java
-@@ -66,7 +66,7 @@
-                     ((EntityInsentient) entity).prepare(commandlistenerwrapper.getWorld(), commandlistenerwrapper.getWorld().getDamageScaler(entity.getChunkCoordinates()), EnumMobSpawn.COMMAND, (GroupDataEntity) null, (NBTTagCompound) null);
+@@ -65,7 +65,7 @@
+                     ((EntityInsentient) entity).finalizeSpawn(commandlistenerwrapper.getLevel(), commandlistenerwrapper.getLevel().getCurrentDifficultyAt(entity.blockPosition()), EnumMobSpawn.COMMAND, (GroupDataEntity) null, (NBTTagCompound) null);
                  }
  
--                if (!worldserver.addAllEntitiesSafely(entity)) {
-+                if (!worldserver.addAllEntitiesSafely(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.COMMAND)) { // CraftBukkit - pass a spawn reason of "COMMAND"
+-                if (!worldserver.tryAddFreshEntityWithPassengers(entity)) {
++                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.sendMessage(new ChatMessage("commands.summon.success", new Object[]{entity.getScoreboardDisplayName()}), true);
+                     commandlistenerwrapper.sendSuccess(new ChatMessage("commands.summon.success", new Object[]{entity.getDisplayName()}), true);

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
-@@ -36,6 +36,12 @@
+@@ -35,6 +35,12 @@
  import net.minecraft.world.phys.Vec2F;
  import net.minecraft.world.phys.Vec3D;
  
@@ -13,20 +13,20 @@
  public class CommandTeleport {
  
      private static final SimpleCommandExceptionType INVALID_POSITION = new SimpleCommandExceptionType(new ChatMessage("commands.teleport.invalidPosition"));
-@@ -160,14 +166,29 @@
+@@ -159,14 +165,29 @@
                  }
  
                  if (worldserver == entity.level) {
--                    ((EntityPlayer) entity).connection.a(d0, d1, d2, f2, f3, set);
-+                    ((EntityPlayer) entity).connection.a(d0, d1, d2, f2, f3, set, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.COMMAND); // CraftBukkit
+-                    ((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).a(worldserver, d0, d1, d2, f2, f3);
-+                    ((EntityPlayer) entity).a(worldserver, d0, d1, d2, f2, f3, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.COMMAND); // CraftBukkit
+-                    ((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.setHeadRotation(f2);
+                 entity.setYHeadRot(f2);
              } else {
-                 float f4 = MathHelper.a(f3, -90.0F, 90.0F);
+                 float f4 = MathHelper.clamp(f3, -90.0F, 90.0F);
 +                // CraftBukkit start - Teleport event
 +                Location to = new Location(worldserver.getWorld(), d0, d1, d2, f2, f4);
 +                EntityTeleportEvent event = new EntityTeleportEvent(entity.getBukkitEntity(), entity.getBukkitEntity().getLocation(), to);
@@ -44,4 +44,4 @@
 +                // CraftBukkit end
  
                  if (worldserver == entity.level) {
-                     entity.setPositionRotation(d0, d1, d2, f2, f4);
+                     entity.moveTo(d0, d1, d2, f2, f4);

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/commands/CommandTime.java
 +++ b/net/minecraft/server/commands/CommandTime.java
-@@ -10,6 +10,11 @@
+@@ -9,6 +9,11 @@
  import net.minecraft.network.chat.ChatMessage;
  import net.minecraft.server.level.WorldServer;
  
@@ -12,7 +12,7 @@
  public class CommandTime {
  
      public CommandTime() {}
-@@ -53,7 +58,13 @@
+@@ -52,7 +57,13 @@
          while (iterator.hasNext()) {
              WorldServer worldserver = (WorldServer) iterator.next();
  
@@ -26,8 +26,8 @@
 +            // CraftBukkit end
          }
  
-         commandlistenerwrapper.sendMessage(new ChatMessage("commands.time.set", new Object[]{i}), true);
-@@ -66,7 +77,13 @@
+         commandlistenerwrapper.sendSuccess(new ChatMessage("commands.time.set", new Object[]{i}), true);
+@@ -65,7 +76,13 @@
          while (iterator.hasNext()) {
              WorldServer worldserver = (WorldServer) iterator.next();
  
@@ -41,4 +41,4 @@
 +            // CraftBukkit end
          }
  
-         int j = a(commandlistenerwrapper.getWorld());
+         int j = getDayTime(commandlistenerwrapper.getLevel());

paper-server/nms-patches/net/minecraft/server/dedicated/DedicatedServer.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -65,6 +65,15 @@
+@@ -61,6 +61,15 @@
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
@@ -16,7 +16,7 @@
  public class DedicatedServer extends MinecraftServer implements IMinecraftServer {
  
      static final Logger LOGGER = LogManager.getLogger();
-@@ -83,8 +92,10 @@
+@@ -81,8 +90,10 @@
      @Nullable
      private final IChatBaseComponent resourcePackPrompt;
  
@@ -28,9 +28,9 @@
 +        // CraftBukkit end
          this.settings = dedicatedserversettings;
          this.rconConsoleSource = new RemoteControlCommandListener(this);
-         this.textFilterClient = TextFilter.a(dedicatedserversettings.getProperties().textFilteringConfig);
-@@ -95,13 +106,44 @@
-     public boolean init() throws IOException {
+         this.textFilterClient = TextFilter.createFromConfig(dedicatedserversettings.getProperties().textFilteringConfig);
+@@ -93,13 +104,44 @@
+     public boolean initServer() throws IOException {
          Thread thread = new Thread("Server console handler") {
              public void run() {
 -                BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
@@ -52,7 +52,7 @@
  
                  try {
 -                    while (!DedicatedServer.this.isStopped() && DedicatedServer.this.isRunning() && (s = bufferedreader.readLine()) != null) {
--                        DedicatedServer.this.issueCommand(s, DedicatedServer.this.getServerCommandListener());
+-                        DedicatedServer.this.handleConsoleInput(s, DedicatedServer.this.createCommandSourceStack());
 +                    // CraftBukkit start - JLine disabling compatibility
 +                    while (!DedicatedServer.this.isStopped() && DedicatedServer.this.isRunning()) {
 +                        if (org.bukkit.craftbukkit.Main.useJline) {
@@ -71,13 +71,13 @@
 +                            continue;
 +                        }
 +                        if (s.trim().length() > 0) { // Trim to filter lines which are just spaces
-+                            DedicatedServer.this.issueCommand(s, DedicatedServer.this.getServerCommandListener());
++                            DedicatedServer.this.handleConsoleInput(s, DedicatedServer.this.createCommandSourceStack());
 +                        }
 +                        // CraftBukkit end
                      }
                  } catch (IOException ioexception) {
                      DedicatedServer.LOGGER.error("Exception handling console input", ioexception);
-@@ -110,6 +152,27 @@
+@@ -108,6 +150,27 @@
              }
          };
  
@@ -105,83 +105,81 @@
          thread.setDaemon(true);
          thread.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(DedicatedServer.LOGGER));
          thread.start();
-@@ -135,7 +198,7 @@
+@@ -133,7 +196,7 @@
          this.setMotd(dedicatedserverproperties.motd);
-         super.setIdleTimeout((Integer) dedicatedserverproperties.playerIdleTimeout.get());
+         super.setPlayerIdleTimeout((Integer) dedicatedserverproperties.playerIdleTimeout.get());
          this.setEnforceWhitelist(dedicatedserverproperties.enforceWhitelist);
 -        this.worldData.setGameType(dedicatedserverproperties.gamemode);
 +        // this.worldData.setGameType(dedicatedserverproperties.gamemode); // CraftBukkit - moved to world loading
          DedicatedServer.LOGGER.info("Default game type: {}", dedicatedserverproperties.gamemode);
          InetAddress inetaddress = null;
  
-@@ -159,6 +222,12 @@
+@@ -157,6 +220,12 @@
              return false;
          }
  
 +        // CraftBukkit start
-+        this.a((PlayerList) (new DedicatedPlayerList(this, this.registryHolder, this.playerDataStorage)));
++        this.setPlayerList(new DedicatedPlayerList(this, this.registryHolder, this.playerDataStorage));
 +        server.loadPlugins();
 +        server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.STARTUP);
 +        // CraftBukkit end
 +
-         if (!this.getOnlineMode()) {
+         if (!this.usesAuthentication()) {
              DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
              DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
-@@ -173,7 +242,7 @@
-         if (!NameReferencingFileConverter.e(this)) {
+@@ -171,13 +240,13 @@
+         if (!NameReferencingFileConverter.serverReadyAfterUserconversion(this)) {
              return false;
          } else {
--            this.a((PlayerList) (new DedicatedPlayerList(this, this.registryHolder, this.playerDataStorage)));
-+            // this.a((PlayerList) (new DedicatedPlayerList(this, this.customRegistry, this.worldNBTStorage))); // CraftBukkit - moved up
-             long i = SystemUtils.getMonotonicNanos();
+-            this.setPlayerList(new DedicatedPlayerList(this, this.registryHolder, this.playerDataStorage));
++            // this.setPlayerList(new DedicatedPlayerList(this, this.registryHolder, this.playerDataStorage)); // CraftBukkit - moved up
+             long i = SystemUtils.getNanos();
  
-             TileEntitySkull.a(this.getUserCache());
-@@ -181,7 +250,7 @@
-             TileEntitySkull.a((Executor) this);
-             UserCache.a(this.getOnlineMode());
-             DedicatedServer.LOGGER.info("Preparing level \"{}\"", this.getWorld());
--            this.loadWorld();
-+            this.loadWorld(storageSource.getLevelName()); // CraftBukkit
-             long j = SystemUtils.getMonotonicNanos() - i;
+             TileEntitySkull.setup(this.getProfileCache(), this.getSessionService(), this);
+             UserCache.setUsesAuthentication(this.usesAuthentication());
+             DedicatedServer.LOGGER.info("Preparing level \"{}\"", this.getLevelIdName());
+-            this.loadLevel();
++            this.loadLevel(storageSource.getLevelId()); // CraftBukkit
+             long j = SystemUtils.getNanos() - i;
              String s = String.format(Locale.ROOT, "%.3fs", (double) j / 1.0E9D);
  
-@@ -198,6 +267,7 @@
+@@ -194,6 +263,7 @@
              if (dedicatedserverproperties.enableRcon) {
                  DedicatedServer.LOGGER.info("Starting remote control listener");
-                 this.rconThread = RemoteControlListener.a((IMinecraftServer) this);
+                 this.rconThread = RemoteControlListener.create(this);
 +                this.remoteConsole = new org.bukkit.craftbukkit.command.CraftRemoteConsoleCommandSender(this.rconConsoleSource); // CraftBukkit
              }
  
-             if (this.getMaxTickTime() > 0L) {
-@@ -347,6 +417,7 @@
-             this.queryThreadGs4.b();
+             if (this.getMaxTickLength() > 0L) {
+@@ -337,6 +407,7 @@
+             this.queryThreadGs4.stop();
          }
  
 +        System.exit(0); // CraftBukkit
      }
  
      @Override
-@@ -380,7 +451,15 @@
+@@ -358,7 +429,15 @@
          while (!this.consoleInput.isEmpty()) {
              ServerCommand servercommand = (ServerCommand) this.consoleInput.remove(0);
  
--            this.getCommandDispatcher().a(servercommand.source, servercommand.msg);
+-            this.getCommands().performCommand(servercommand.source, servercommand.msg);
 +            // CraftBukkit start - ServerCommand for preprocessing
 +            ServerCommandEvent event = new ServerCommandEvent(console, servercommand.msg);
 +            server.getPluginManager().callEvent(event);
 +            if (event.isCancelled()) continue;
 +            servercommand = new ServerCommand(event.getCommand(), servercommand.source);
 +
-+            // this.getCommandDispatcher().a(servercommand.source, servercommand.command); // Called in dispatchServerCommand
++            // this.getCommands().performCommand(servercommand.source, servercommand.msg); // Called in dispatchServerCommand
 +            server.dispatchServerCommand(console, servercommand);
 +            // CraftBukkit end
          }
  
      }
-@@ -585,14 +664,45 @@
+@@ -568,14 +647,45 @@
  
      @Override
-     public String getPlugins() {
+     public String getPluginNames() {
 -        return "";
 +        // CraftBukkit start - Whole method
 +        StringBuilder result = new StringBuilder();
@@ -210,30 +208,30 @@
      }
  
      @Override
-     public String executeRemoteCommand(String s) {
-         this.rconConsoleSource.clearMessages();
-         this.executeSync(() -> {
--            this.getCommandDispatcher().a(this.rconConsoleSource.getWrapper(), s);
+     public String runCommand(String s) {
+         this.rconConsoleSource.prepareForCommand();
+         this.executeBlocking(() -> {
+-            this.getCommands().performCommand(this.rconConsoleSource.createCommandSourceStack(), s);
 +            // CraftBukkit start - fire RemoteServerCommandEvent
 +            RemoteServerCommandEvent event = new RemoteServerCommandEvent(remoteConsole, s);
 +            server.getPluginManager().callEvent(event);
 +            if (event.isCancelled()) {
 +                return;
 +            }
-+            ServerCommand serverCommand = new ServerCommand(event.getCommand(), rconConsoleSource.getWrapper());
++            ServerCommand serverCommand = new ServerCommand(event.getCommand(), rconConsoleSource.createCommandSourceStack());
 +            server.dispatchServerCommand(remoteConsole, serverCommand);
 +            // CraftBukkit end
          });
-         return this.rconConsoleSource.getMessages();
+         return this.rconConsoleSource.getCommandResponse();
      }
-@@ -665,4 +775,15 @@
-     public IChatBaseComponent ba() {
+@@ -649,4 +759,15 @@
+     public IChatBaseComponent getResourcePackPrompt() {
          return this.resourcePackPrompt;
      }
 +
 +    // CraftBukkit start
 +    public boolean isDebugging() {
-+        return this.getDedicatedServerProperties().debug;
++        return this.getProperties().debug;
 +    }
 +
 +    @Override

paper-server/nms-patches/net/minecraft/server/dedicated/DedicatedServerProperties.patch

@@ -11,11 +11,11 @@
 +
  public class DedicatedServerProperties extends PropertyManager<DedicatedServerProperties> {
  
-+    public final boolean debug = this.getBoolean("debug", false); // CraftBukkit
-     public final boolean onlineMode = this.getBoolean("online-mode", true);
-     public final boolean preventProxyConnections = this.getBoolean("prevent-proxy-connections", false);
-     public final String serverIp = this.getString("server-ip", "");
-@@ -64,8 +70,10 @@
++    public final boolean debug = this.get("debug", false); // CraftBukkit
+     public final boolean onlineMode = this.get("online-mode", true);
+     public final boolean preventProxyConnections = this.get("prevent-proxy-connections", false);
+     public final String serverIp = this.get("server-ip", "");
+@@ -67,8 +73,10 @@
      @Nullable
      private GeneratorSettings worldGenSettings;
  
@@ -25,18 +25,18 @@
 +    public DedicatedServerProperties(Properties properties, OptionSet optionset) {
 +        super(properties, optionset);
 +        // CraftBukkit end
-         this.difficulty = (EnumDifficulty) this.a("difficulty", a(EnumDifficulty::getById, EnumDifficulty::a), EnumDifficulty::c, EnumDifficulty.EASY);
-         this.gamemode = (EnumGamemode) this.a("gamemode", a(EnumGamemode::getById, EnumGamemode::a), EnumGamemode::b, EnumGamemode.SURVIVAL);
-         this.levelName = this.getString("level-name", "world");
+         this.difficulty = (EnumDifficulty) this.get("difficulty", dispatchNumberOrString(EnumDifficulty::byId, EnumDifficulty::byName), EnumDifficulty::getKey, EnumDifficulty.EASY);
+         this.gamemode = (EnumGamemode) this.get("gamemode", dispatchNumberOrString(EnumGamemode::byId, EnumGamemode::byName), EnumGamemode::getName, EnumGamemode.SURVIVAL);
+         this.levelName = this.get("level-name", "world");
 @@ -112,13 +120,15 @@
-         this.whiteList = this.b("white-list", false);
+         this.whiteList = this.getMutable("white-list", false);
      }
  
--    public static DedicatedServerProperties load(Path path) {
--        return new DedicatedServerProperties(loadPropertiesFile(path));
+-    public static DedicatedServerProperties fromFile(Path path) {
+-        return new DedicatedServerProperties(loadFromFile(path));
 +    // CraftBukkit start
-+    public static DedicatedServerProperties load(Path path, OptionSet optionset) {
-+        return new DedicatedServerProperties(loadPropertiesFile(path), optionset);
++    public static DedicatedServerProperties fromFile(Path path, OptionSet optionset) {
++        return new DedicatedServerProperties(loadFromFile(path), optionset);
      }
  
      @Override
@@ -46,5 +46,5 @@
 +        DedicatedServerProperties dedicatedserverproperties = new DedicatedServerProperties(properties, optionset);
 +        // CraftBukkit end
  
-         dedicatedserverproperties.a(iregistrycustom);
+         dedicatedserverproperties.getWorldGenSettings(iregistrycustom);
          return dedicatedserverproperties;

paper-server/nms-patches/net/minecraft/server/dedicated/DedicatedServerSettings.patch

@@ -16,11 +16,11 @@
  
 -    public DedicatedServerSettings(Path path) {
 -        this.source = path;
--        this.properties = DedicatedServerProperties.load(path);
+-        this.properties = DedicatedServerProperties.fromFile(path);
 +    // CraftBukkit start
 +    public DedicatedServerSettings(OptionSet optionset) {
 +        this.source = ((File) optionset.valueOf("config")).toPath();
-+        this.properties = DedicatedServerProperties.load(source, optionset);
++        this.properties = DedicatedServerProperties.fromFile(source, optionset);
 +        // CraftBukkit end
      }
  

paper-server/nms-patches/net/minecraft/server/dedicated/PropertyManager.patch

@@ -29,12 +29,12 @@
 +    }
 +    // CraftBukkit end
 +
-     public static Properties loadPropertiesFile(Path path) {
+     public static Properties loadFromFile(Path path) {
          Properties properties = new Properties();
  
 @@ -58,6 +73,11 @@
  
-     public void savePropertiesFile(Path path) {
+     public void store(Path path) {
          try {
 +            // CraftBukkit start - Don't attempt writing to file if it's read only
 +            if (path.toFile().exists() && !path.toFile().canWrite()) {
@@ -45,7 +45,7 @@
  
              try {
 @@ -86,7 +106,7 @@
-     private static <V extends Number> Function<String, V> a(Function<String, V> function) {
+     private static <V extends Number> Function<String, V> wrapNumberDeserializer(Function<String, V> function) {
          return (s) -> {
              try {
 -                return (Number) function.apply(s);
@@ -56,7 +56,7 @@
 @@ -105,7 +125,7 @@
  
      @Nullable
-     private String c(String s) {
+     private String getStringRaw(String s) {
 -        return (String) this.properties.get(s);
 +        return (String) getOverride(s, this.properties.getProperty(s)); // CraftBukkit
      }
@@ -70,25 +70,7 @@
 +        return new PropertyManager.EditableProperty(s, v1, function1); // CraftBukkit - decompile error
      }
  
-     protected <V> V a(String s, Function<String, V> function, UnaryOperator<V> unaryoperator, Function<V, String> function1, V v0) {
-@@ -162,7 +182,7 @@
-     }
- 
-     protected int getInt(String s, int i) {
--        return (Integer) this.a(s, a(Integer::parseInt), (Object) i);
-+        return (Integer) this.a(s, a(Integer::parseInt), i); // CraftBukkit - decompile error
-     }
- 
-     protected PropertyManager<T>.EditableProperty<Integer> b(String s, int i) {
-@@ -174,7 +194,7 @@
-     }
- 
-     protected long getLong(String s, long i) {
--        return (Long) this.a(s, a(Long::parseLong), (Object) i);
-+        return (Long) this.a(s, a(Long::parseLong), i); // CraftBukkit - decompile error
-     }
- 
-     protected boolean getBoolean(String s, boolean flag) {
+     protected <V> V get(String s, Function<String, V> function, UnaryOperator<V> unaryoperator, Function<V, String> function1, V v0) {
 @@ -197,7 +217,7 @@
          return properties;
      }
@@ -108,7 +90,7 @@
              this.value = object;
              this.serializer = function;
 @@ -219,7 +239,7 @@
-             Properties properties = PropertyManager.this.a();
+             Properties properties = PropertyManager.this.cloneProperties();
  
              properties.put(this.key, this.serializer.apply(v0));
 -            return PropertyManager.this.reload(iregistrycustom, properties);

paper-server/nms-patches/net/minecraft/server/gui/ServerGUI.patch

@@ -1,20 +1,20 @@
 --- a/net/minecraft/server/gui/ServerGUI.java
 +++ b/net/minecraft/server/gui/ServerGUI.java
 @@ -96,7 +96,7 @@
-     private JComponent c() {
+     private JComponent buildInfoPanel() {
          JPanel jpanel = new JPanel(new BorderLayout());
          GuiStatsComponent guistatscomponent = new GuiStatsComponent(this.server);
 -        Collection collection = this.finalizers;
 +        Collection<Runnable> collection = this.finalizers; // CraftBukkit - decompile error
  
          Objects.requireNonNull(guistatscomponent);
-         collection.add(guistatscomponent::a);
+         collection.add(guistatscomponent::close);
 @@ -166,6 +166,7 @@
          this.finalizers.forEach(Runnable::run);
      }
  
 +    private static final java.util.regex.Pattern ANSI = java.util.regex.Pattern.compile("\\x1B\\[([0-9]{1,2}(;[0-9]{1,2})*)?[m|K]"); // CraftBukkit
-     public void a(JTextArea jtextarea, JScrollPane jscrollpane, String s) {
+     public void print(JTextArea jtextarea, JScrollPane jscrollpane, String s) {
          if (!SwingUtilities.isEventDispatchThread()) {
              SwingUtilities.invokeLater(() -> {
 @@ -181,7 +182,7 @@

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

@@ -1,15 +1,6 @@
 --- a/net/minecraft/server/level/ChunkMapDistance.java
 +++ b/net/minecraft/server/level/ChunkMapDistance.java
-@@ -73,7 +73,7 @@
-         while (objectiterator.hasNext()) {
-             Entry<ArraySetSorted<Ticket<?>>> entry = (Entry) objectiterator.next();
- 
--            if (((ArraySetSorted) entry.getValue()).removeIf((ticket) -> {
-+            if ((entry.getValue()).removeIf((ticket) -> { // CraftBukkit - decompile error
-                 return ticket.b(this.ticketTickCounter);
-             })) {
-                 this.ticketTracker.update(entry.getLongKey(), getLowestTicketLevel((ArraySetSorted) entry.getValue()), false);
-@@ -109,10 +109,25 @@
+@@ -125,10 +125,25 @@
          }
  
          if (!this.chunksToUpdateFutures.isEmpty()) {
@@ -23,7 +14,7 @@
 +                iter.remove();
 +                expectedSize--;
 +
-                 playerchunk.a(playerchunkmap, this.mainThreadExecutor);
+                 playerchunk.updateFutures(playerchunkmap, this.mainThreadExecutor);
 -            });
 -            this.chunksToUpdateFutures.clear();
 +
@@ -38,20 +29,17 @@
              return true;
          } else {
              if (!this.ticketsToRelease.isEmpty()) {
-@@ -148,23 +163,25 @@
+@@ -164,7 +179,7 @@
          }
      }
  
 -    void addTicket(long i, Ticket<?> ticket) {
 +    boolean addTicket(long i, Ticket<?> ticket) { // CraftBukkit - void -> boolean
-         ArraySetSorted<Ticket<?>> arraysetsorted = this.e(i);
-         int j = getLowestTicketLevel(arraysetsorted);
--        Ticket<?> ticket1 = (Ticket) arraysetsorted.a((Object) ticket);
-+        Ticket<?> ticket1 = (Ticket) arraysetsorted.a(ticket); // CraftBukkit - decompile error
- 
-         ticket1.a(this.ticketTickCounter);
-         if (ticket.b() < j) {
-             this.ticketTracker.update(i, ticket.b(), true);
+         ArraySetSorted<Ticket<?>> arraysetsorted = this.getTickets(i);
+         int j = getTicketLevelAt(arraysetsorted);
+         Ticket<?> ticket1 = (Ticket) arraysetsorted.addOrGet(ticket);
+@@ -174,13 +189,15 @@
+             this.ticketTracker.update(i, ticket.getTicketLevel(), true);
          }
  
 +        return ticket == ticket1; // CraftBukkit
@@ -59,7 +47,7 @@
  
 -    void removeTicket(long i, Ticket<?> ticket) {
 +    boolean removeTicket(long i, Ticket<?> ticket) { // CraftBukkit - void -> boolean
-         ArraySetSorted<Ticket<?>> arraysetsorted = this.e(i);
+         ArraySetSorted<Ticket<?>> arraysetsorted = this.getTickets(i);
  
 +        boolean removed = false; // CraftBukkit
          if (arraysetsorted.remove(ticket)) {
@@ -68,49 +56,49 @@
          }
  
          if (arraysetsorted.isEmpty()) {
-@@ -172,16 +189,29 @@
+@@ -188,16 +205,29 @@
          }
  
-         this.ticketTracker.update(i, getLowestTicketLevel(arraysetsorted), false);
+         this.ticketTracker.update(i, getTicketLevelAt(arraysetsorted), false);
 +        return removed; // CraftBukkit
      }
  
-     public <T> void a(TicketType<T> tickettype, ChunkCoordIntPair chunkcoordintpair, int i, T t0) {
--        this.addTicket(chunkcoordintpair.pair(), new Ticket<>(tickettype, i, t0));
+     public <T> void addTicket(TicketType<T> tickettype, ChunkCoordIntPair chunkcoordintpair, int i, T t0) {
+-        this.addTicket(chunkcoordintpair.toLong(), new Ticket<>(tickettype, i, t0));
 +        // CraftBukkit start
 +        this.addTicketAtLevel(tickettype, chunkcoordintpair, i, t0);
 +    }
 +
 +    public <T> boolean addTicketAtLevel(TicketType<T> ticketType, ChunkCoordIntPair chunkcoordintpair, int level, T identifier) {
-+        return this.addTicket(chunkcoordintpair.pair(), new Ticket<>(ticketType, level, identifier));
++        return this.addTicket(chunkcoordintpair.toLong(), new Ticket<>(ticketType, level, identifier));
 +        // CraftBukkit end
      }
  
-     public <T> void b(TicketType<T> tickettype, ChunkCoordIntPair chunkcoordintpair, int i, T t0) {
+     public <T> void removeTicket(TicketType<T> tickettype, ChunkCoordIntPair chunkcoordintpair, int i, T t0) {
 -        Ticket<T> ticket = new Ticket<>(tickettype, i, t0);
 +        // CraftBukkit start
 +        this.removeTicketAtLevel(tickettype, chunkcoordintpair, i, t0);
 +    }
  
--        this.removeTicket(chunkcoordintpair.pair(), ticket);
+-        this.removeTicket(chunkcoordintpair.toLong(), ticket);
 +    public <T> boolean removeTicketAtLevel(TicketType<T> ticketType, ChunkCoordIntPair chunkcoordintpair, int level, T identifier) {
 +        Ticket<T> ticket = new Ticket<>(ticketType, level, identifier);
 +
-+        return this.removeTicket(chunkcoordintpair.pair(), ticket);
++        return this.removeTicket(chunkcoordintpair.toLong(), ticket);
 +        // CraftBukkit end
      }
  
-     public <T> void addTicket(TicketType<T> tickettype, ChunkCoordIntPair chunkcoordintpair, int i, T t0) {
-@@ -224,6 +254,7 @@
-     public void b(SectionPosition sectionposition, EntityPlayer entityplayer) {
-         long i = sectionposition.r().pair();
+     public <T> void addRegionTicket(TicketType<T> tickettype, ChunkCoordIntPair chunkcoordintpair, int i, T t0) {
+@@ -252,6 +282,7 @@
+         ChunkCoordIntPair chunkcoordintpair = sectionposition.chunk();
+         long i = chunkcoordintpair.toLong();
          ObjectSet<EntityPlayer> objectset = (ObjectSet) this.playersPerChunk.get(i);
 +        if (objectset == null) return; // CraftBukkit - SPIGOT-6208
  
          objectset.remove(entityplayer);
          if (objectset.isEmpty()) {
-@@ -300,6 +331,26 @@
- 
+@@ -347,6 +378,26 @@
+         return this.tickingTicketsTracker;
      }
  
 +    // CraftBukkit start
@@ -122,7 +110,7 @@
 +            ArraySetSorted<Ticket<?>> tickets = entry.getValue();
 +            if (tickets.remove(target)) {
 +                // copied from removeTicket
-+                this.ticketTracker.update(entry.getLongKey(), getLowestTicketLevel(tickets), false);
++                this.ticketTracker.update(entry.getLongKey(), getTicketLevelAt(tickets), false);
 +
 +                // can't use entry after it's removed
 +                if (tickets.isEmpty()) {

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

@@ -6,7 +6,7 @@
  
 +    // CraftBukkit start - properly implement isChunkLoaded
 +    public boolean isChunkLoaded(int chunkX, int chunkZ) {
-+        PlayerChunk chunk = this.chunkMap.getUpdatingChunk(ChunkCoordIntPair.pair(chunkX, chunkZ));
++        PlayerChunk chunk = this.chunkMap.getUpdatingChunkIfPresent(ChunkCoordIntPair.asLong(chunkX, chunkZ));
 +        if (chunk == null) {
 +            return false;
 +        }
@@ -14,7 +14,7 @@
 +    }
 +
 +    public Chunk getChunkUnchecked(int chunkX, int chunkZ) {
-+        PlayerChunk chunk = this.chunkMap.getUpdatingChunk(ChunkCoordIntPair.pair(chunkX, chunkZ));
++        PlayerChunk chunk = this.chunkMap.getUpdatingChunkIfPresent(ChunkCoordIntPair.asLong(chunkX, chunkZ));
 +        if (chunk == null) {
 +            return null;
 +        }
@@ -38,8 +38,8 @@
              if (playerchunk == null) {
                  return null;
              } else {
--                Either<IChunkAccess, PlayerChunk.Failure> either = (Either) playerchunk.b(ChunkStatus.FULL).getNow((Object) null);
-+                Either<IChunkAccess, PlayerChunk.Failure> either = (Either) playerchunk.b(ChunkStatus.FULL).getNow(null); // CraftBukkit - decompile error
+-                Either<IChunkAccess, PlayerChunk.Failure> either = (Either) playerchunk.getFutureIfPresent(ChunkStatus.FULL).getNow((Object) null);
++                Either<IChunkAccess, PlayerChunk.Failure> either = (Either) playerchunk.getFutureIfPresent(ChunkStatus.FULL).getNow(null); // CraftBukkit - decompile error
  
                  if (either == null) {
                      return null;
@@ -48,43 +48,43 @@
 +                    IChunkAccess ichunkaccess1 = (IChunkAccess) either.left().orElse(null); // CraftBukkit - decompile error
  
                      if (ichunkaccess1 != null) {
-                         this.a(k, ichunkaccess1, ChunkStatus.FULL);
+                         this.storeInCache(k, ichunkaccess1, ChunkStatus.FULL);
 @@ -228,7 +246,15 @@
-         int l = 33 + ChunkStatus.a(chunkstatus);
-         PlayerChunk playerchunk = this.getChunk(k);
+         int l = 33 + ChunkStatus.getDistance(chunkstatus);
+         PlayerChunk playerchunk = this.getVisibleChunkIfPresent(k);
  
 -        if (flag) {
 +        // CraftBukkit start - don't add new ticket for currently unloading chunk
 +        boolean currentlyUnloading = false;
 +        if (playerchunk != null) {
-+            PlayerChunk.State oldChunkState = PlayerChunk.getChunkState(playerchunk.oldTicketLevel);
-+            PlayerChunk.State currentChunkState = PlayerChunk.getChunkState(playerchunk.getTicketLevel());
-+            currentlyUnloading = (oldChunkState.isAtLeast(PlayerChunk.State.BORDER) && !currentChunkState.isAtLeast(PlayerChunk.State.BORDER));
++            PlayerChunk.State oldChunkState = PlayerChunk.getFullChunkStatus(playerchunk.oldTicketLevel);
++            PlayerChunk.State currentChunkState = PlayerChunk.getFullChunkStatus(playerchunk.getTicketLevel());
++            currentlyUnloading = (oldChunkState.isOrAfter(PlayerChunk.State.BORDER) && !currentChunkState.isOrAfter(PlayerChunk.State.BORDER));
 +        }
 +        if (flag && !currentlyUnloading) {
 +            // CraftBukkit end
-             this.distanceManager.a(TicketType.UNKNOWN, chunkcoordintpair, l, chunkcoordintpair);
-             if (this.a(playerchunk, l)) {
-                 GameProfilerFiller gameprofilerfiller = this.level.getMethodProfiler();
+             this.distanceManager.addTicket(TicketType.UNKNOWN, chunkcoordintpair, l, chunkcoordintpair);
+             if (this.chunkAbsent(playerchunk, l)) {
+                 GameProfilerFiller gameprofilerfiller = this.level.getProfiler();
 @@ -247,7 +273,7 @@
      }
  
-     private boolean a(@Nullable PlayerChunk playerchunk, int i) {
+     private boolean chunkAbsent(@Nullable PlayerChunk playerchunk, int i) {
 -        return playerchunk == null || playerchunk.getTicketLevel() > i;
 +        return playerchunk == null || playerchunk.oldTicketLevel > i; // CraftBukkit using oldTicketLevel for isLoaded checks
      }
  
      @Override
-@@ -307,7 +333,7 @@
-     }
+@@ -314,7 +340,7 @@
+         } else if (!this.level.shouldTickBlocksAt(i)) {
+             return false;
+         } else {
+-            Either<Chunk, PlayerChunk.Failure> either = (Either) playerchunk.getTickingChunkFuture().getNow((Object) null);
++            Either<Chunk, PlayerChunk.Failure> either = (Either) playerchunk.getTickingChunkFuture().getNow(null); // CraftBukkit - decompile error
  
-     public boolean a(long i) {
--        return this.a(i, PlayerChunk::a);
-+        return this.a(i, (Function<PlayerChunk, CompletableFuture<Either<Chunk, PlayerChunk.Failure>>>) PlayerChunk::a); // CraftBukkit - decompile error
-     }
- 
-     private boolean a(long i, Function<PlayerChunk, CompletableFuture<Either<Chunk, PlayerChunk.Failure>>> function) {
-@@ -329,11 +355,31 @@
+             return either != null && either.left().isPresent();
+         }
+@@ -327,11 +353,31 @@
  
      @Override
      public void close() throws IOException {
@@ -104,56 +104,50 @@
  
 +    // CraftBukkit start - modelled on below
 +    public void purgeUnload() {
-+        this.level.getMethodProfiler().enter("purge");
-+        this.distanceManager.purgeTickets();
-+        this.tickDistanceManager();
-+        this.level.getMethodProfiler().exitEnter("unload");
-+        this.chunkMap.unloadChunks(() -> true);
-+        this.level.getMethodProfiler().exit();
++        this.level.getProfiler().push("purge");
++        this.distanceManager.purgeStaleTickets();
++        this.runDistanceManagerUpdates();
++        this.level.getProfiler().popPush("unload");
++        this.chunkMap.tick(() -> true);
++        this.level.getProfiler().pop();
 +        this.clearCache();
 +    }
 +    // CraftBukkit end
 +
      @Override
      public void tick(BooleanSupplier booleansupplier) {
-         this.level.getMethodProfiler().enter("purge");
-@@ -354,12 +400,12 @@
-         this.lastInhabitedUpdate = i;
-         WorldData worlddata = this.level.getWorldData();
-         boolean flag = this.level.isDebugWorld();
--        boolean flag1 = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING);
-+        boolean flag1 = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !level.getPlayers().isEmpty(); // CraftBukkit
+         this.level.getProfiler().push("purge");
+@@ -360,7 +406,7 @@
  
-         if (!flag) {
-             this.level.getMethodProfiler().enter("pollingChunks");
+             gameprofilerfiller.push("pollingChunks");
              int k = this.level.getGameRules().getInt(GameRules.RULE_RANDOMTICKING);
--            boolean flag2 = worlddata.getTime() % 400L == 0L;
-+            boolean flag2 = level.ticksPerAnimalSpawns != 0L && worlddata.getTime() % level.ticksPerAnimalSpawns == 0L; // CraftBukkit
+-            boolean flag1 = worlddata.getGameTime() % 400L == 0L;
++            boolean flag1 = level.ticksPerAnimalSpawns != 0L && worlddata.getGameTime() % level.ticksPerAnimalSpawns == 0L; // CraftBukkit
  
-             this.level.getMethodProfiler().enter("naturalSpawnCount");
-             int l = this.distanceManager.b();
-@@ -394,7 +440,7 @@
+             gameprofilerfiller.push("naturalSpawnCount");
+             int l = this.distanceManager.getNaturalSpawnChunkCount();
+@@ -381,7 +427,7 @@
+             }
  
-             this.level.getMethodProfiler().exitEnter("broadcast");
-             list.forEach((playerchunk) -> {
--                Optional optional = ((Either) playerchunk.a().getNow(PlayerChunk.UNLOADED_LEVEL_CHUNK)).left();
-+                Optional<Chunk> optional = ((Either) playerchunk.a().getNow(PlayerChunk.UNLOADED_LEVEL_CHUNK)).left(); // CraftBukkit - decompile error
+             gameprofilerfiller.popPush("spawnAndTick");
+-            boolean flag2 = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING);
++            boolean flag2 = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !level.players().isEmpty(); // CraftBukkit
  
-                 Objects.requireNonNull(playerchunk);
-                 optional.ifPresent(playerchunk::a);
-@@ -551,13 +597,19 @@
+             Collections.shuffle(list);
+             Iterator iterator1 = list.iterator();
+@@ -571,18 +617,26 @@
          }
  
          @Override
--        protected boolean executeNext() {
+-        protected boolean pollTask() {
 +        // CraftBukkit start - process pending Chunk loadCallback() and unloadCallback() after each run task
-+        public boolean executeNext() {
++        public boolean pollTask() {
 +        try {
-             if (ChunkProviderServer.this.tickDistanceManager()) {
+             if (ChunkProviderServer.this.runDistanceManagerUpdates()) {
                  return true;
              } else {
-                 ChunkProviderServer.this.lightEngine.queueUpdate();
-                 return super.executeNext();
+                 ChunkProviderServer.this.lightEngine.tryScheduleUpdate();
+                 return super.pollTask();
              }
 +        } finally {
 +            chunkMap.callbackExecutor.run();
@@ -161,4 +155,21 @@
 +        // CraftBukkit end
          }
      }
- }
+ 
+-    private static final class a extends Record {
++    // CraftBukkit start - decompile error
++    private static final record a(Chunk chunk, PlayerChunk holder) {
+ 
++        /*
+         final Chunk chunk;
+         final PlayerChunk holder;
+ 
+@@ -602,6 +656,8 @@
+         public final boolean equals(Object object) {
+             return this.equals<invokedynamic>(this, object);
+         }
++         */
++        // CraftBukkit end
+ 
+         public Chunk chunk() {
+             return this.chunk;

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 @@
+@@ -40,6 +40,12 @@
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
@@ -13,7 +13,7 @@
  public class EntityTrackerEntry {
  
      private static final Logger LOGGER = LogManager.getLogger();
-@@ -63,8 +69,12 @@
+@@ -61,8 +67,12 @@
      private List<Entity> lastPassengers;
      private boolean wasRiding;
      private boolean wasOnGround;
@@ -27,12 +27,12 @@
          this.ap = Vec3D.ZERO;
          this.lastPassengers = Collections.emptyList();
          this.level = worldserver;
-@@ -84,22 +94,22 @@
+@@ -82,22 +92,22 @@
  
          if (!list.equals(this.lastPassengers)) {
              this.lastPassengers = list;
 -            this.broadcast.accept(new PacketPlayOutMount(this.entity));
-+            this.broadcastIncludingSelf(new PacketPlayOutMount(this.entity)); // CraftBukkit
++            this.broadcastAndSend(new PacketPlayOutMount(this.entity)); // CraftBukkit
          }
  
 -        if (this.entity instanceof EntityItemFrame && this.tickCount % 10 == 0) {
@@ -42,26 +42,26 @@
  
 -            if (itemstack.getItem() instanceof ItemWorldMap) {
 +            if (this.tickCount % 10 == 0 && itemstack.getItem() instanceof ItemWorldMap) { // CraftBukkit - Moved this.tickCounter % 10 logic here so item frames do not enter the other blocks
-                 Integer integer = ItemWorldMap.d(itemstack);
-                 WorldMap worldmap = ItemWorldMap.a(integer, (World) this.level);
+                 Integer integer = ItemWorldMap.getMapId(itemstack);
+                 WorldMap worldmap = ItemWorldMap.getSavedData(integer, this.level);
  
                  if (worldmap != null) {
--                    Iterator iterator = this.level.getPlayers().iterator();
+-                    Iterator iterator = this.level.players().iterator();
 +                    Iterator<ServerPlayerConnection> iterator = this.trackedPlayers.iterator(); // CraftBukkit
  
                      while (iterator.hasNext()) {
 -                        EntityPlayer entityplayer = (EntityPlayer) iterator.next();
-+                        EntityPlayer entityplayer = iterator.next().d(); // CraftBukkit
++                        EntityPlayer entityplayer = iterator.next().getPlayer(); // CraftBukkit
  
-                         worldmap.a((EntityHuman) entityplayer, itemstack);
-                         Packet<?> packet = worldmap.a(integer, entityplayer);
-@@ -142,6 +152,17 @@
+                         worldmap.tickCarriedBy(entityplayer, itemstack);
+                         Packet<?> packet = worldmap.getUpdatePacket(integer, entityplayer);
+@@ -140,6 +150,17 @@
                  boolean flag2 = flag1 || this.tickCount % 60 == 0;
                  boolean flag3 = Math.abs(i - this.yRotp) >= 1 || Math.abs(j - this.xRotp) >= 1;
  
 +                // CraftBukkit start - Code moved from below
 +                if (flag2) {
-+                    this.d();
++                    this.updateSentPos();
 +                }
 +
 +                if (flag3) {
@@ -71,17 +71,17 @@
 +                // CraftBukkit end
 +
                  if (this.tickCount > 0 || this.entity instanceof EntityArrow) {
-                     long k = PacketPlayOutEntity.a(vec3d.x);
-                     long l = PacketPlayOutEntity.a(vec3d.y);
-@@ -180,6 +201,7 @@
+                     long k = PacketPlayOutEntity.entityToPacket(vec3d.x);
+                     long l = PacketPlayOutEntity.entityToPacket(vec3d.y);
+@@ -178,6 +199,7 @@
                  }
  
-                 this.c();
+                 this.sendDirtyEntityData();
 +                /* CraftBukkit start - Code moved up
                  if (flag2) {
-                     this.d();
+                     this.updateSentPos();
                  }
-@@ -188,6 +210,7 @@
+@@ -186,6 +208,7 @@
                      this.yRotp = i;
                      this.xRotp = j;
                  }
@@ -89,11 +89,11 @@
  
                  this.wasRiding = false;
              }
-@@ -203,7 +226,27 @@
+@@ -201,7 +224,27 @@
  
          ++this.tickCount;
          if (this.entity.hurtMarked) {
--            this.broadcastIncludingSelf(new PacketPlayOutEntityVelocity(this.entity));
+-            this.broadcastAndSend(new PacketPlayOutEntityVelocity(this.entity));
 +            // CraftBukkit start - Create PlayerVelocity event
 +            boolean cancelled = false;
 +
@@ -112,23 +112,23 @@
 +            }
 +
 +            if (!cancelled) {
-+                this.broadcastIncludingSelf(new PacketPlayOutEntityVelocity(this.entity));
++                this.broadcastAndSend(new PacketPlayOutEntityVelocity(this.entity));
 +            }
 +            // CraftBukkit end
              this.entity.hurtMarked = false;
          }
  
-@@ -218,13 +261,16 @@
+@@ -216,13 +259,16 @@
          PlayerConnection playerconnection = entityplayer.connection;
  
          Objects.requireNonNull(entityplayer.connection);
--        this.a(playerconnection::sendPacket);
-+        this.a(playerconnection::sendPacket, entityplayer); // CraftBukkit - add player
-         this.entity.c(entityplayer);
+-        this.sendPairingData(playerconnection::send);
++        this.sendPairingData(playerconnection::send, entityplayer); // CraftBukkit - add player
+         this.entity.startSeenByPlayer(entityplayer);
      }
  
--    public void a(Consumer<Packet<?>> consumer) {
-+    public void a(Consumer<Packet<?>> consumer, EntityPlayer entityplayer) { // CraftBukkit - add player
+-    public void sendPairingData(Consumer<Packet<?>> consumer) {
++    public void sendPairingData(Consumer<Packet<?>> 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
@@ -137,10 +137,10 @@
 +            // CraftBukkit end
          }
  
-         Packet<?> packet = this.entity.getPacket();
-@@ -240,6 +286,12 @@
+         Packet<?> packet = this.entity.getAddEntityPacket();
+@@ -238,6 +284,12 @@
          if (this.entity instanceof EntityLiving) {
-             Collection<AttributeModifiable> collection = ((EntityLiving) this.entity).getAttributeMap().b();
+             Collection<AttributeModifiable> collection = ((EntityLiving) this.entity).getAttributes().getSyncableAttributes();
  
 +            // CraftBukkit start - If sending own attributes send scaled health instead of current maximum health
 +            if (this.entity.getId() == entityplayer.getId()) {
@@ -151,23 +151,23 @@
              if (!collection.isEmpty()) {
                  consumer.accept(new PacketPlayOutUpdateAttributes(this.entity.getId(), collection));
              }
-@@ -271,8 +323,14 @@
+@@ -269,8 +321,14 @@
              if (!list.isEmpty()) {
                  consumer.accept(new PacketPlayOutEntityEquipment(this.entity.getId(), list));
              }
-+            ((EntityLiving) this.entity).updateEquipment(); // CraftBukkit - SPIGOT-3789: sync again immediately after sending
++            ((EntityLiving) this.entity).detectEquipmentUpdates(); // CraftBukkit - SPIGOT-3789: sync again immediately after sending
          }
  
 +        // CraftBukkit start - Fix for nonsensical head yaw
-+        this.yHeadRotp = MathHelper.d(this.entity.getHeadRotation() * 256.0F / 360.0F);
++        this.yHeadRotp = MathHelper.floor(this.entity.getYHeadRot() * 256.0F / 360.0F);
 +        consumer.accept(new PacketPlayOutEntityHeadRotation(this.entity, (byte) yHeadRotp));
 +        // CraftBukkit end
 +
          if (this.entity instanceof EntityLiving) {
              EntityLiving entityliving = (EntityLiving) this.entity;
-             Iterator iterator = entityliving.getEffects().iterator();
-@@ -313,6 +371,11 @@
-             Set<AttributeModifiable> set = ((EntityLiving) this.entity).getAttributeMap().getAttributes();
+             Iterator iterator = entityliving.getActiveEffects().iterator();
+@@ -311,6 +369,11 @@
+             Set<AttributeModifiable> set = ((EntityLiving) this.entity).getAttributes().getDirtyAttributes();
  
              if (!set.isEmpty()) {
 +                // CraftBukkit start - Send scaled max health
@@ -175,6 +175,6 @@
 +                    ((EntityPlayer) this.entity).getBukkitEntity().injectScaledMaxHealth(set, false);
 +                }
 +                // CraftBukkit end
-                 this.broadcastIncludingSelf(new PacketPlayOutUpdateAttributes(this.entity.getId(), set));
+                 this.broadcastAndSend(new PacketPlayOutUpdateAttributes(this.entity.getId(), set));
              }
  

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/PlayerChunk.java
 +++ b/net/minecraft/server/level/PlayerChunk.java
-@@ -38,6 +38,10 @@
+@@ -35,6 +35,10 @@
  import net.minecraft.world.level.chunk.ProtoChunkExtension;
  import net.minecraft.world.level.lighting.LightEngine;
  
@@ -11,7 +11,7 @@
  public class PlayerChunk {
  
      public static final Either<IChunkAccess, PlayerChunk.Failure> UNLOADED_CHUNK = Either.right(PlayerChunk.Failure.UNLOADED);
-@@ -75,11 +79,11 @@
+@@ -72,11 +76,11 @@
          this.fullChunkFuture = PlayerChunk.UNLOADED_LEVEL_CHUNK_FUTURE;
          this.tickingChunkFuture = PlayerChunk.UNLOADED_LEVEL_CHUNK_FUTURE;
          this.entityTickingChunkFuture = PlayerChunk.UNLOADED_LEVEL_CHUNK_FUTURE;
@@ -25,30 +25,30 @@
          this.pos = chunkcoordintpair;
          this.levelHeightAccessor = levelheightaccessor;
          this.lightEngine = lightengine;
-@@ -92,6 +96,19 @@
+@@ -89,6 +93,19 @@
          this.changedBlocksPerSection = new ShortSet[levelheightaccessor.getSectionsCount()];
      }
  
 +    // CraftBukkit start
 +    public Chunk getFullChunk() {
-+        if (!getChunkState(this.oldTicketLevel).isAtLeast(PlayerChunk.State.BORDER)) return null; // note: using oldTicketLevel for isLoaded checks
++        if (!getFullChunkStatus(this.oldTicketLevel).isOrAfter(PlayerChunk.State.BORDER)) return null; // note: using oldTicketLevel for isLoaded checks
 +        return this.getFullChunkUnchecked();
 +    }
 +
 +    public Chunk getFullChunkUnchecked() {
-+        CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> statusFuture = this.getStatusFutureUnchecked(ChunkStatus.FULL);
++        CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> statusFuture = this.getFutureIfPresentUnchecked(ChunkStatus.FULL);
 +        Either<IChunkAccess, PlayerChunk.Failure> either = (Either<IChunkAccess, PlayerChunk.Failure>) statusFuture.getNow(null);
 +        return (either == null) ? null : (Chunk) either.left().orElse(null);
 +    }
 +    // CraftBukkit end
 +
-     public CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> getStatusFutureUnchecked(ChunkStatus chunkstatus) {
-         CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> completablefuture = (CompletableFuture) this.futures.get(chunkstatus.c());
+     public CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> getFutureIfPresentUnchecked(ChunkStatus chunkstatus) {
+         CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> completablefuture = (CompletableFuture) this.futures.get(chunkstatus.getIndex());
  
-@@ -117,9 +134,9 @@
+@@ -114,9 +131,9 @@
      @Nullable
-     public Chunk getChunk() {
-         CompletableFuture<Either<Chunk, PlayerChunk.Failure>> completablefuture = this.a();
+     public Chunk getTickingChunk() {
+         CompletableFuture<Either<Chunk, PlayerChunk.Failure>> completablefuture = this.getTickingChunkFuture();
 -        Either<Chunk, PlayerChunk.Failure> either = (Either) completablefuture.getNow((Object) null);
 +        Either<Chunk, PlayerChunk.Failure> either = (Either) completablefuture.getNow(null); // CraftBukkit - decompile error
  
@@ -57,15 +57,15 @@
      }
  
      @Nullable
-@@ -164,6 +181,7 @@
+@@ -161,6 +178,7 @@
          if (chunk != null) {
              int i = this.levelHeightAccessor.getSectionIndex(blockposition.getY());
  
 +            if (i < 0 || i >= this.changedBlocksPerSection.length) return; // CraftBukkit - SPIGOT-6086, SPIGOT-6296
              if (this.changedBlocksPerSection[i] == null) {
                  this.hasChangedSections = true;
-                 this.changedBlocksPerSection[i] = new ShortArraySet();
-@@ -274,7 +292,7 @@
+                 this.changedBlocksPerSection[i] = new ShortOpenHashSet();
+@@ -271,7 +289,7 @@
          CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> completablefuture = (CompletableFuture) this.futures.get(i);
  
          if (completablefuture != null) {
@@ -74,7 +74,7 @@
              boolean flag = either != null && either.right().isPresent();
  
              if (!flag) {
-@@ -341,7 +359,7 @@
+@@ -338,7 +356,7 @@
          this.pendingFullStateConfirmation = completablefuture1;
          completablefuture.thenAccept((either) -> {
              either.ifLeft((chunk) -> {
@@ -83,21 +83,21 @@
              });
          });
      }
-@@ -358,6 +376,30 @@
+@@ -355,6 +373,30 @@
          boolean flag1 = this.ticketLevel <= PlayerChunkMap.MAX_CHUNK_DISTANCE;
-         PlayerChunk.State playerchunk_state = getChunkState(this.oldTicketLevel);
-         PlayerChunk.State playerchunk_state1 = getChunkState(this.ticketLevel);
+         PlayerChunk.State playerchunk_state = getFullChunkStatus(this.oldTicketLevel);
+         PlayerChunk.State playerchunk_state1 = getFullChunkStatus(this.ticketLevel);
 +        // CraftBukkit start
 +        // ChunkUnloadEvent: Called before the chunk is unloaded: isChunkLoaded is still true and chunk can still be modified by plugins.
-+        if (playerchunk_state.isAtLeast(PlayerChunk.State.BORDER) && !playerchunk_state1.isAtLeast(PlayerChunk.State.BORDER)) {
-+            this.getStatusFutureUnchecked(ChunkStatus.FULL).thenAccept((either) -> {
++        if (playerchunk_state.isOrAfter(PlayerChunk.State.BORDER) && !playerchunk_state1.isOrAfter(PlayerChunk.State.BORDER)) {
++            this.getFutureIfPresentUnchecked(ChunkStatus.FULL).thenAccept((either) -> {
 +                Chunk chunk = (Chunk)either.left().orElse(null);
 +                if (chunk != null) {
 +                    playerchunkmap.callbackExecutor.execute(() -> {
 +                        // Minecraft will apply the chunks tick lists to the world once the chunk got loaded, and then store the tick
 +                        // lists again inside the chunk once the chunk becomes inaccessible and set the chunk's needsSaving flag.
 +                        // These actions may however happen deferred, so we manually set the needsSaving flag already here.
-+                        chunk.setNeedsSaving(true);
++                        chunk.setUnsaved(true);
 +                        chunk.unloadCallback();
 +                    });
 +                }
@@ -111,26 +111,17 @@
 +            playerchunkmap.callbackExecutor.run();
 +        }
 +        // CraftBukkit end
-         CompletableFuture completablefuture;
  
          if (flag) {
-@@ -388,7 +430,7 @@
-         if (flag2 && !flag3) {
-             completablefuture = this.fullChunkFuture;
-             this.fullChunkFuture = PlayerChunk.UNLOADED_LEVEL_CHUNK_FUTURE;
--            this.a(completablefuture.thenApply((either1) -> {
-+            this.a(((CompletableFuture<Either<Chunk, PlayerChunk.Failure>>) completablefuture).thenApply((either1) -> { // CraftBukkit - decompile error
-                 Objects.requireNonNull(playerchunkmap);
-                 return either1.ifLeft(playerchunkmap::a);
-             }), "unfull");
-@@ -432,6 +474,26 @@
+             Either<IChunkAccess, PlayerChunk.Failure> either = Either.right(new PlayerChunk.Failure() {
+@@ -425,6 +467,26 @@
  
-         this.onLevelChange.a(this.pos, this::k, this.ticketLevel, this::d);
+         this.onLevelChange.onLevelChange(this.pos, this::getQueueLevel, this.ticketLevel, this::setQueueLevel);
          this.oldTicketLevel = this.ticketLevel;
 +        // CraftBukkit start
 +        // ChunkLoadEvent: Called after the chunk is loaded: isChunkLoaded returns true and chunk is ready to be modified by plugins.
-+        if (!playerchunk_state.isAtLeast(PlayerChunk.State.BORDER) && playerchunk_state1.isAtLeast(PlayerChunk.State.BORDER)) {
-+            this.getStatusFutureUnchecked(ChunkStatus.FULL).thenAccept((either) -> {
++        if (!playerchunk_state.isOrAfter(PlayerChunk.State.BORDER) && playerchunk_state1.isOrAfter(PlayerChunk.State.BORDER)) {
++            this.getFutureIfPresentUnchecked(ChunkStatus.FULL).thenAccept((either) -> {
 +                Chunk chunk = (Chunk)either.left().orElse(null);
 +                if (chunk != null) {
 +                    playerchunkmap.callbackExecutor.execute(() -> {
@@ -149,4 +140,4 @@
 +        // CraftBukkit end
      }
  
-     public static ChunkStatus getChunkStatus(int i) {
+     public static ChunkStatus getStatus(int i) {

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
-@@ -91,6 +91,8 @@
+@@ -95,6 +95,8 @@
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
@@ -9,7 +9,7 @@
  public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.e {
  
      private static final byte CHUNK_TYPE_REPLACEABLE = -1;
-@@ -129,6 +131,27 @@
+@@ -133,6 +135,27 @@
      private final Queue<Runnable> unloadQueue;
      int viewDistance;
  
@@ -35,9 +35,9 @@
 +    // CraftBukkit end
 +
      public PlayerChunkMap(WorldServer worldserver, Convertable.ConversionSession convertable_conversionsession, DataFixer datafixer, DefinedStructureManager definedstructuremanager, Executor executor, IAsyncTaskHandler<Runnable> iasynctaskhandler, ILightAccess ilightaccess, ChunkGenerator chunkgenerator, WorldLoadListener worldloadlistener, ChunkStatusUpdateListener chunkstatusupdatelistener, Supplier<WorldPersistentData> supplier, int i, boolean flag) {
-         super(new File(convertable_conversionsession.a(worldserver.getDimensionKey()), "region"), datafixer, flag);
+         super(convertable_conversionsession.getDimensionPath(worldserver.dimension()).resolve("region"), datafixer, flag);
          this.visibleChunkMap = this.updatingChunkMap.clone();
-@@ -281,9 +304,12 @@
+@@ -326,9 +349,12 @@
  
          return completablefuture1.thenApply((list1) -> {
              List<IChunkAccess> list2 = Lists.newArrayList();
@@ -52,47 +52,39 @@
                  final Either<IChunkAccess, PlayerChunk.Failure> either = (Either) iterator.next();
                  Optional<IChunkAccess> optional = either.left();
  
-@@ -390,7 +416,7 @@
-             this.j();
+@@ -435,7 +461,7 @@
+             this.flushWorker();
          } else {
-             this.visibleChunkMap.values().stream().filter(PlayerChunk::hasBeenLoaded).forEach((playerchunk) -> {
--                IChunkAccess ichunkaccess = (IChunkAccess) playerchunk.getChunkSave().getNow((Object) null);
-+                IChunkAccess ichunkaccess = (IChunkAccess) playerchunk.getChunkSave().getNow(null); // CraftBukkit - decompile error
+             this.visibleChunkMap.values().stream().filter(PlayerChunk::wasAccessibleSinceLastSave).forEach((playerchunk) -> {
+-                IChunkAccess ichunkaccess = (IChunkAccess) playerchunk.getChunkToSave().getNow((Object) null);
++                IChunkAccess ichunkaccess = (IChunkAccess) playerchunk.getChunkToSave().getNow(null); // CraftBukkit - decompile error
  
                  if (ichunkaccess instanceof ProtoChunkExtension || ichunkaccess instanceof Chunk) {
-                     this.saveChunk(ichunkaccess);
-@@ -401,7 +427,6 @@
-         }
+                     this.save(ichunkaccess);
+@@ -488,7 +514,7 @@
  
-     }
--
-     protected void unloadChunks(BooleanSupplier booleansupplier) {
-         GameProfilerFiller gameprofilerfiller = this.level.getMethodProfiler();
- 
-@@ -440,7 +465,7 @@
- 
-     private void a(long i, PlayerChunk playerchunk) {
-         CompletableFuture<IChunkAccess> completablefuture = playerchunk.getChunkSave();
+     private void scheduleUnload(long i, PlayerChunk playerchunk) {
+         CompletableFuture<IChunkAccess> completablefuture = playerchunk.getChunkToSave();
 -        Consumer consumer = (ichunkaccess) -> {
 +        Consumer<IChunkAccess> consumer = (ichunkaccess) -> { // CraftBukkit - decompile error
-             CompletableFuture<IChunkAccess> completablefuture1 = playerchunk.getChunkSave();
+             CompletableFuture<IChunkAccess> completablefuture1 = playerchunk.getChunkToSave();
  
              if (completablefuture1 != completablefuture) {
-@@ -616,7 +641,21 @@
+@@ -664,7 +690,21 @@
  
-     private static void a(WorldServer worldserver, List<NBTTagCompound> list) {
+     private static void postLoadProtoChunk(WorldServer worldserver, List<NBTTagCompound> list) {
          if (!list.isEmpty()) {
--            worldserver.b(EntityTypes.a(list, (World) worldserver));
+-            worldserver.addWorldGenChunkEntities(EntityTypes.loadEntitiesRecursive(list, worldserver));
 +            // CraftBukkit start - these are spawned serialized (DefinedStructure) and we don't call an add event below at the moment due to ordering complexities
-+            worldserver.b(EntityTypes.a(list, (World) worldserver).filter((entity) -> {
++            worldserver.addWorldGenChunkEntities(EntityTypes.loadEntitiesRecursive(list, worldserver).filter((entity) -> {
 +                boolean needsRemoval = false;
 +                net.minecraft.server.dedicated.DedicatedServer server = worldserver.getCraftServer().getServer();
-+                if (!server.getSpawnNPCs() && entity instanceof net.minecraft.world.entity.npc.NPC) {
-+                    entity.die();
++                if (!server.areNpcsEnabled() && entity instanceof net.minecraft.world.entity.npc.NPC) {
++                    entity.discard();
 +                    needsRemoval = true;
 +                }
-+                if (!server.getSpawnAnimals() && (entity instanceof net.minecraft.world.entity.animal.EntityAnimal || entity instanceof net.minecraft.world.entity.animal.EntityWaterAnimal)) {
-+                    entity.die();
++                if (!server.isSpawningAnimals() && (entity instanceof net.minecraft.world.entity.animal.EntityAnimal || entity instanceof net.minecraft.world.entity.animal.EntityWaterAnimal)) {
++                    entity.discard();
 +                    needsRemoval = true;
 +                }
 +                return !needsRemoval;
@@ -101,35 +93,35 @@
          }
  
      }
-@@ -844,7 +883,8 @@
+@@ -894,7 +934,8 @@
                  return ichunkaccess instanceof Chunk ? Optional.of((Chunk) ichunkaccess) : Optional.empty();
              });
  
--            csvwriter.a(chunkcoordintpair.x, chunkcoordintpair.z, playerchunk.getTicketLevel(), optional.isPresent(), optional.map(IChunkAccess::getChunkStatus).orElse((Object) null), optional1.map(Chunk::getState).orElse((Object) null), a(playerchunk.c()), a(playerchunk.a()), a(playerchunk.b()), this.distanceManager.c(entry.getLongKey()), !this.isOutsideOfRange(chunkcoordintpair), optional1.map((chunk) -> {
+-            csvwriter.writeRow(chunkcoordintpair.x, chunkcoordintpair.z, playerchunk.getTicketLevel(), optional.isPresent(), optional.map(IChunkAccess::getStatus).orElse((Object) null), optional1.map(Chunk::getFullStatus).orElse((Object) null), printFuture(playerchunk.getFullChunkFuture()), printFuture(playerchunk.getTickingChunkFuture()), printFuture(playerchunk.getEntityTickingChunkFuture()), this.distanceManager.getTicketDebugString(i), this.anyPlayerCloseEnoughForSpawning(chunkcoordintpair), optional1.map((chunk) -> {
 +            // CraftBukkit - decompile error
-+            csvwriter.a(chunkcoordintpair.x, chunkcoordintpair.z, playerchunk.getTicketLevel(), optional.isPresent(), optional.map(IChunkAccess::getChunkStatus).orElse(null), optional1.map(Chunk::getState).orElse(null), a(playerchunk.c()), a(playerchunk.a()), a(playerchunk.b()), this.distanceManager.c(entry.getLongKey()), !this.isOutsideOfRange(chunkcoordintpair), optional1.map((chunk) -> {
-                 return chunk.getTileEntities().size();
-             }).orElse(0));
-         }
-@@ -853,7 +893,7 @@
++            csvwriter.writeRow(chunkcoordintpair.x, chunkcoordintpair.z, playerchunk.getTicketLevel(), optional.isPresent(), optional.map(IChunkAccess::getStatus).orElse(null), optional1.map(Chunk::getFullStatus).orElse(null), printFuture(playerchunk.getFullChunkFuture()), printFuture(playerchunk.getTickingChunkFuture()), printFuture(playerchunk.getEntityTickingChunkFuture()), this.distanceManager.getTicketDebugString(i), this.anyPlayerCloseEnoughForSpawning(chunkcoordintpair), optional1.map((chunk) -> {
+                 return chunk.getBlockEntities().size();
+             }).orElse(0), tickingtracker.getTicketDebugString(i), tickingtracker.getLevel(i), optional1.map((chunk) -> {
+                 return chunk.getBlockTicks().count();
+@@ -907,7 +948,7 @@
  
-     private static String a(CompletableFuture<Either<Chunk, PlayerChunk.Failure>> completablefuture) {
+     private static String printFuture(CompletableFuture<Either<Chunk, PlayerChunk.Failure>> completablefuture) {
          try {
 -            Either<Chunk, PlayerChunk.Failure> either = (Either) completablefuture.getNow((Object) null);
 +            Either<Chunk, PlayerChunk.Failure> either = (Either) completablefuture.getNow(null); // CraftBukkit - decompile error
  
              return either != null ? (String) either.map((chunk) -> {
                  return "done";
-@@ -871,7 +911,7 @@
-     private NBTTagCompound readChunkData(ChunkCoordIntPair chunkcoordintpair) throws IOException {
+@@ -925,7 +966,7 @@
+     private NBTTagCompound readChunk(ChunkCoordIntPair chunkcoordintpair) throws IOException {
          NBTTagCompound nbttagcompound = this.read(chunkcoordintpair);
  
--        return nbttagcompound == null ? null : this.getChunkData(this.level.getDimensionKey(), this.overworldDataStorage, nbttagcompound);
-+        return nbttagcompound == null ? null : this.getChunkData(this.level.getTypeKey(), this.overworldDataStorage, nbttagcompound, chunkcoordintpair, level); // CraftBukkit
+-        return nbttagcompound == null ? null : this.upgradeChunkTag(this.level.dimension(), this.overworldDataStorage, nbttagcompound, this.generator.getTypeNameForDataFixer());
++        return nbttagcompound == null ? null : this.upgradeChunkTag(this.level.getTypeKey(), this.overworldDataStorage, nbttagcompound, this.generator.getTypeNameForDataFixer(), chunkcoordintpair, level); // CraftBukkit
      }
  
-     boolean isOutsideOfRange(ChunkCoordIntPair chunkcoordintpair) {
-@@ -1238,7 +1278,7 @@
+     boolean anyPlayerCloseEnoughForSpawning(ChunkCoordIntPair chunkcoordintpair) {
+@@ -1349,7 +1390,7 @@
          public final Set<ServerPlayerConnection> seenBy = Sets.newIdentityHashSet();
  
          public EntityTracker(Entity entity, int i, int j, boolean flag) {
@@ -137,15 +129,17 @@
 +            this.serverEntity = new EntityTrackerEntry(PlayerChunkMap.this.level, entity, j, flag, this::broadcast, seenBy); // CraftBukkit
              this.entity = entity;
              this.range = i;
-             this.lastSectionPos = SectionPosition.a(entity);
-@@ -1291,10 +1331,18 @@
+             this.lastSectionPos = SectionPosition.of(entity);
+@@ -1402,12 +1443,20 @@
  
          public void updatePlayer(EntityPlayer entityplayer) {
              if (entityplayer != this.entity) {
--                Vec3D vec3d = entityplayer.getPositionVector().d(this.serverEntity.b());
-+                Vec3D vec3d = entityplayer.getPositionVector().d(this.entity.getPositionVector()); // MC-155077, SPIGOT-5113
-                 int i = Math.min(this.b(), (PlayerChunkMap.this.viewDistance - 1) * 16);
-                 boolean flag = vec3d.x >= (double) (-i) && vec3d.x <= (double) i && vec3d.z >= (double) (-i) && vec3d.z <= (double) i && this.entity.a(entityplayer);
+-                Vec3D vec3d = entityplayer.position().subtract(this.serverEntity.sentPos());
++                Vec3D vec3d = entityplayer.position().subtract(this.entity.position()); // MC-155077, SPIGOT-5113
+                 double d0 = (double) Math.min(this.getEffectiveRange(), (PlayerChunkMap.this.viewDistance - 1) * 16);
+                 double d1 = vec3d.x * vec3d.x + vec3d.z * vec3d.z;
+                 double d2 = d0 * d0;
+                 boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(entityplayer);
  
 +                // CraftBukkit start - respect vanish API
 +                if (this.entity instanceof EntityPlayer) {
@@ -157,4 +151,4 @@
 +                // CraftBukkit end
                  if (flag) {
                      if (this.seenBy.add(entityplayer.connection)) {
-                         this.serverEntity.b(entityplayer);
+                         this.serverEntity.addPairing(entityplayer);

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/PlayerInteractManager.java
 +++ b/net/minecraft/server/level/PlayerInteractManager.java
-@@ -25,6 +25,27 @@
+@@ -24,6 +24,27 @@
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
@@ -28,7 +28,7 @@
  public class PlayerInteractManager {
  
      private static final Logger LOGGER = LogManager.getLogger();
-@@ -55,6 +76,13 @@
+@@ -54,6 +75,13 @@
          if (enumgamemode == this.gameModeForPlayer) {
              return false;
          } else {
@@ -39,93 +39,93 @@
 +                return false;
 +            }
 +            // CraftBukkit end
-             this.a(enumgamemode, this.gameModeForPlayer);
+             this.setGameModeForPlayer(enumgamemode, this.gameModeForPlayer);
              return true;
          }
-@@ -65,7 +93,7 @@
+@@ -64,7 +92,7 @@
          this.gameModeForPlayer = enumgamemode;
-         enumgamemode.a(this.player.getAbilities());
-         this.player.updateAbilities();
--        this.player.server.getPlayerList().sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.UPDATE_GAME_MODE, new EntityPlayer[]{this.player}));
-+        this.player.server.getPlayerList().sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.UPDATE_GAME_MODE, new EntityPlayer[]{this.player}), this.player); // CraftBukkit
-         this.level.everyoneSleeping();
+         enumgamemode.updatePlayerAbilities(this.player.getAbilities());
+         this.player.onUpdateAbilities();
+-        this.player.server.getPlayerList().broadcastAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.UPDATE_GAME_MODE, new EntityPlayer[]{this.player}));
++        this.player.server.getPlayerList().broadcastAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.UPDATE_GAME_MODE, new EntityPlayer[]{this.player}), this.player); // CraftBukkit
+         this.level.updateSleepingPlayerList();
      }
  
-@@ -87,7 +115,7 @@
+@@ -86,7 +114,7 @@
      }
  
-     public void a() {
+     public void tick() {
 -        ++this.gameTicks;
 +        this.gameTicks = MinecraftServer.currentTick; // CraftBukkit;
          IBlockData iblockdata;
  
          if (this.hasDelayedDestroy) {
-@@ -143,9 +171,31 @@
+@@ -142,9 +170,31 @@
  
              if (packetplayinblockdig_enumplayerdigtype == PacketPlayInBlockDig.EnumPlayerDigType.START_DESTROY_BLOCK) {
-                 if (!this.level.a((EntityHuman) this.player, blockposition)) {
+                 if (!this.level.mayInteract(this.player, blockposition)) {
 +                    // CraftBukkit start - fire PlayerInteractEvent
-+                    CraftEventFactory.callPlayerInteractEvent(this.player, Action.LEFT_CLICK_BLOCK, blockposition, enumdirection, this.player.getInventory().getItemInHand(), EnumHand.MAIN_HAND);
-                     this.player.connection.sendPacket(new PacketPlayOutBlockBreak(blockposition, this.level.getType(blockposition), packetplayinblockdig_enumplayerdigtype, false, "may not interact"));
++                    CraftEventFactory.callPlayerInteractEvent(this.player, Action.LEFT_CLICK_BLOCK, blockposition, enumdirection, this.player.getInventory().getSelected(), EnumHand.MAIN_HAND);
+                     this.player.connection.send(new PacketPlayOutBlockBreak(blockposition, this.level.getBlockState(blockposition), packetplayinblockdig_enumplayerdigtype, false, "may not interact"));
 +                    // Update any tile entity data for this block
-+                    TileEntity tileentity = level.getTileEntity(blockposition);
++                    TileEntity tileentity = level.getBlockEntity(blockposition);
 +                    if (tileentity != null) {
-+                        this.player.connection.sendPacket(tileentity.getUpdatePacket());
++                        this.player.connection.send(tileentity.getUpdatePacket());
 +                    }
 +                    // CraftBukkit end
 +                    return;
 +                }
 +
 +                // CraftBukkit start
-+                PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.LEFT_CLICK_BLOCK, blockposition, enumdirection, this.player.getInventory().getItemInHand(), EnumHand.MAIN_HAND);
++                PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.LEFT_CLICK_BLOCK, blockposition, enumdirection, this.player.getInventory().getSelected(), EnumHand.MAIN_HAND);
 +                if (event.isCancelled()) {
 +                    // Let the client know the block still exists
-+                    this.player.connection.sendPacket(new PacketPlayOutBlockChange(this.level, blockposition));
++                    this.player.connection.send(new PacketPlayOutBlockChange(this.level, blockposition));
 +                    // Update any tile entity data for this block
-+                    TileEntity tileentity = this.level.getTileEntity(blockposition);
++                    TileEntity tileentity = this.level.getBlockEntity(blockposition);
 +                    if (tileentity != null) {
-+                        this.player.connection.sendPacket(tileentity.getUpdatePacket());
++                        this.player.connection.send(tileentity.getUpdatePacket());
 +                    }
                      return;
                  }
 +                // CraftBukkit end
  
                  if (this.isCreative()) {
-                     this.a(blockposition, packetplayinblockdig_enumplayerdigtype, "creative destroy");
-@@ -161,11 +211,43 @@
+                     this.destroyAndAck(blockposition, packetplayinblockdig_enumplayerdigtype, "creative destroy");
+@@ -160,11 +210,43 @@
                  float f = 1.0F;
  
-                 iblockdata = this.level.getType(blockposition);
+                 iblockdata = this.level.getBlockState(blockposition);
 -                if (!iblockdata.isAir()) {
 +                // CraftBukkit start - Swings at air do *NOT* exist.
 +                if (event.useInteractedBlock() == Event.Result.DENY) {
 +                    // If we denied a door from opening, we need to send a correcting update to the client, as it already opened the door.
-+                    IBlockData data = this.level.getType(blockposition);
++                    IBlockData data = this.level.getBlockState(blockposition);
 +                    if (data.getBlock() instanceof BlockDoor) {
 +                        // For some reason *BOTH* the bottom/top part have to be marked updated.
-+                        boolean bottom = data.get(BlockDoor.HALF) == BlockPropertyDoubleBlockHalf.LOWER;
-+                        this.player.connection.sendPacket(new PacketPlayOutBlockChange(this.level, blockposition));
-+                        this.player.connection.sendPacket(new PacketPlayOutBlockChange(this.level, bottom ? blockposition.up() : blockposition.down()));
++                        boolean bottom = data.getValue(BlockDoor.HALF) == BlockPropertyDoubleBlockHalf.LOWER;
++                        this.player.connection.send(new PacketPlayOutBlockChange(this.level, blockposition));
++                        this.player.connection.send(new PacketPlayOutBlockChange(this.level, bottom ? blockposition.above() : blockposition.below()));
 +                    } else if (data.getBlock() instanceof BlockTrapdoor) {
-+                        this.player.connection.sendPacket(new PacketPlayOutBlockChange(this.level, blockposition));
++                        this.player.connection.send(new PacketPlayOutBlockChange(this.level, blockposition));
 +                    }
 +                } else if (!iblockdata.isAir()) {
                      iblockdata.attack(this.level, blockposition, this.player);
-                     f = iblockdata.getDamage(this.player, this.player.level, blockposition);
+                     f = iblockdata.getDestroyProgress(this.player, this.player.level, blockposition);
                  }
  
 +                if (event.useItemInHand() == Event.Result.DENY) {
 +                    // If we 'insta destroyed' then the client needs to be informed.
 +                    if (f > 1.0f) {
-+                        this.player.connection.sendPacket(new PacketPlayOutBlockChange(this.level, blockposition));
++                        this.player.connection.send(new PacketPlayOutBlockChange(this.level, blockposition));
 +                    }
 +                    return;
 +                }
-+                org.bukkit.event.block.BlockDamageEvent blockEvent = CraftEventFactory.callBlockDamageEvent(this.player, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this.player.getInventory().getItemInHand(), f >= 1.0f);
++                org.bukkit.event.block.BlockDamageEvent blockEvent = CraftEventFactory.callBlockDamageEvent(this.player, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this.player.getInventory().getSelected(), f >= 1.0f);
 +
 +                if (blockEvent.isCancelled()) {
 +                    // Let the client know the block still exists
-+                    this.player.connection.sendPacket(new PacketPlayOutBlockChange(this.level, blockposition));
++                    this.player.connection.send(new PacketPlayOutBlockChange(this.level, blockposition));
 +                    return;
 +                }
 +
@@ -135,42 +135,42 @@
 +                // CraftBukkit end
 +
                  if (!iblockdata.isAir() && f >= 1.0F) {
-                     this.a(blockposition, packetplayinblockdig_enumplayerdigtype, "insta mine");
+                     this.destroyAndAck(blockposition, packetplayinblockdig_enumplayerdigtype, "insta mine");
                  } else {
-@@ -209,7 +291,7 @@
+@@ -208,7 +290,7 @@
              } else if (packetplayinblockdig_enumplayerdigtype == PacketPlayInBlockDig.EnumPlayerDigType.ABORT_DESTROY_BLOCK) {
                  this.isDestroyingBlock = false;
                  if (!Objects.equals(this.destroyPos, blockposition)) {
 -                    PlayerInteractManager.LOGGER.warn("Mismatch in destroy block pos: {} {}", this.destroyPos, blockposition);
 +                    PlayerInteractManager.LOGGER.debug("Mismatch in destroy block pos: {} {}", this.destroyPos, blockposition); // CraftBukkit - SPIGOT-5457 sent by client when interact event cancelled
-                     this.level.a(this.player.getId(), this.destroyPos, -1);
-                     this.player.connection.sendPacket(new PacketPlayOutBlockBreak(this.destroyPos, this.level.getType(this.destroyPos), packetplayinblockdig_enumplayerdigtype, true, "aborted mismatched destroying"));
+                     this.level.destroyBlockProgress(this.player.getId(), this.destroyPos, -1);
+                     this.player.connection.send(new PacketPlayOutBlockBreak(this.destroyPos, this.level.getBlockState(this.destroyPos), packetplayinblockdig_enumplayerdigtype, true, "aborted mismatched destroying"));
                  }
-@@ -225,17 +307,72 @@
-         if (this.breakBlock(blockposition)) {
-             this.player.connection.sendPacket(new PacketPlayOutBlockBreak(blockposition, this.level.getType(blockposition), packetplayinblockdig_enumplayerdigtype, true, s));
+@@ -224,17 +306,72 @@
+         if (this.destroyBlock(blockposition)) {
+             this.player.connection.send(new PacketPlayOutBlockBreak(blockposition, this.level.getBlockState(blockposition), packetplayinblockdig_enumplayerdigtype, true, s));
          } else {
--            this.player.connection.sendPacket(new PacketPlayOutBlockBreak(blockposition, this.level.getType(blockposition), packetplayinblockdig_enumplayerdigtype, false, s));
-+            this.player.connection.sendPacket(new PacketPlayOutBlockChange(this.level, blockposition)); // CraftBukkit - SPIGOT-5196
+-            this.player.connection.send(new PacketPlayOutBlockBreak(blockposition, this.level.getBlockState(blockposition), packetplayinblockdig_enumplayerdigtype, false, s));
++            this.player.connection.send(new PacketPlayOutBlockChange(this.level, blockposition)); // CraftBukkit - SPIGOT-5196
          }
  
      }
  
-     public boolean breakBlock(BlockPosition blockposition) {
-         IBlockData iblockdata = this.level.getType(blockposition);
+     public boolean destroyBlock(BlockPosition blockposition) {
+         IBlockData iblockdata = this.level.getBlockState(blockposition);
 +        // CraftBukkit start - fire BlockBreakEvent
 +        org.bukkit.block.Block bblock = CraftBlock.at(level, blockposition);
 +        BlockBreakEvent event = null;
 +
 +        if (this.player instanceof EntityPlayer) {
 +            // Sword + Creative mode pre-cancel
-+            boolean isSwordNoBreak = !this.player.getItemInMainHand().getItem().a(iblockdata, this.level, blockposition, (EntityHuman) this.player);
++            boolean isSwordNoBreak = !this.player.getMainHandItem().getItem().canAttackBlock(iblockdata, this.level, blockposition, this.player);
 +
 +            // Tell client the block is gone immediately then process events
 +            // Don't tell the client if its a creative sword break because its not broken!
-+            if (level.getTileEntity(blockposition) == null && !isSwordNoBreak) {
-+                PacketPlayOutBlockChange packet = new PacketPlayOutBlockChange(blockposition, Blocks.AIR.getBlockData());
-+                this.player.connection.sendPacket(packet);
++            if (level.getBlockEntity(blockposition) == null && !isSwordNoBreak) {
++                PacketPlayOutBlockChange packet = new PacketPlayOutBlockChange(blockposition, Blocks.AIR.defaultBlockState());
++                this.player.connection.send(packet);
 +            }
 +
 +            event = new BlockBreakEvent(bblock, this.player.getBukkitEntity());
@@ -179,12 +179,12 @@
 +            event.setCancelled(isSwordNoBreak);
 +
 +            // Calculate default block experience
-+            IBlockData nmsData = this.level.getType(blockposition);
++            IBlockData nmsData = this.level.getBlockState(blockposition);
 +            Block nmsBlock = nmsData.getBlock();
 +
-+            ItemStack itemstack = this.player.getEquipment(EnumItemSlot.MAINHAND);
++            ItemStack itemstack = this.player.getItemBySlot(EnumItemSlot.MAINHAND);
 +
-+            if (nmsBlock != null && !event.isCancelled() && !this.isCreative() && this.player.hasBlock(nmsBlock.getBlockData())) {
++            if (nmsBlock != null && !event.isCancelled() && !this.isCreative() && this.player.hasCorrectToolForDrops(nmsBlock.defaultBlockState())) {
 +                event.setExpToDrop(nmsBlock.getExpDrop(nmsData, this.level, blockposition, itemstack));
 +            }
 +
@@ -195,58 +195,58 @@
 +                    return false;
 +                }
 +                // Let the client know the block still exists
-+                this.player.connection.sendPacket(new PacketPlayOutBlockChange(this.level, blockposition));
++                this.player.connection.send(new PacketPlayOutBlockChange(this.level, blockposition));
 +
 +                // Brute force all possible updates
 +                for (EnumDirection dir : EnumDirection.values()) {
-+                    this.player.connection.sendPacket(new PacketPlayOutBlockChange(level, blockposition.shift(dir)));
++                    this.player.connection.send(new PacketPlayOutBlockChange(level, blockposition.relative(dir)));
 +                }
  
--        if (!this.player.getItemInMainHand().getItem().a(iblockdata, (World) this.level, blockposition, (EntityHuman) this.player)) {
+-        if (!this.player.getMainHandItem().getItem().canAttackBlock(iblockdata, this.level, blockposition, this.player)) {
 +                // Update any tile entity data for this block
-+                TileEntity tileentity = this.level.getTileEntity(blockposition);
++                TileEntity tileentity = this.level.getBlockEntity(blockposition);
 +                if (tileentity != null) {
-+                    this.player.connection.sendPacket(tileentity.getUpdatePacket());
++                    this.player.connection.send(tileentity.getUpdatePacket());
 +                }
 +                return false;
 +            }
 +        }
 +        // CraftBukkit end
 +
-+        if (false && !this.player.getItemInMainHand().getItem().a(iblockdata, (World) this.level, blockposition, (EntityHuman) this.player)) { // CraftBukkit - false
++        if (false && !this.player.getMainHandItem().getItem().canAttackBlock(iblockdata, this.level, blockposition, this.player)) { // CraftBukkit - false
              return false;
          } else {
-+            iblockdata = this.level.getType(blockposition); // CraftBukkit - update state from plugins
++            iblockdata = this.level.getBlockState(blockposition); // CraftBukkit - update state from plugins
 +            if (iblockdata.isAir()) return false; // CraftBukkit - A plugin set block to air without cancelling
-             TileEntity tileentity = this.level.getTileEntity(blockposition);
+             TileEntity tileentity = this.level.getBlockEntity(blockposition);
              Block block = iblockdata.getBlock();
  
-@@ -245,6 +382,10 @@
-             } else if (this.player.a((World) this.level, blockposition, this.gameModeForPlayer)) {
+@@ -244,6 +381,10 @@
+             } else if (this.player.blockActionRestricted(this.level, blockposition, this.gameModeForPlayer)) {
                  return false;
              } else {
 +                // CraftBukkit start
 +                org.bukkit.block.BlockState state = bblock.getState();
 +                level.captureDrops = new ArrayList<>();
 +                // CraftBukkit end
-                 block.a((World) this.level, blockposition, iblockdata, (EntityHuman) this.player);
-                 boolean flag = this.level.a(blockposition, false);
+                 block.playerWillDestroy(this.level, blockposition, iblockdata, this.player);
+                 boolean flag = this.level.removeBlock(blockposition, false);
  
-@@ -253,19 +394,32 @@
+@@ -252,19 +393,32 @@
                  }
  
                  if (this.isCreative()) {
 -                    return true;
 +                    // return true; // CraftBukkit
                  } else {
-                     ItemStack itemstack = this.player.getItemInMainHand();
-                     ItemStack itemstack1 = itemstack.cloneItemStack();
-                     boolean flag1 = this.player.hasBlock(iblockdata);
+                     ItemStack itemstack = this.player.getMainHandItem();
+                     ItemStack itemstack1 = itemstack.copy();
+                     boolean flag1 = this.player.hasCorrectToolForDrops(iblockdata);
  
-                     itemstack.a(this.level, iblockdata, blockposition, this.player);
+                     itemstack.mineBlock(this.level, iblockdata, blockposition, this.player);
 -                    if (flag && flag1) {
 +                    if (flag && flag1 && event.isDropItems()) { // CraftBukkit - Check if block should drop items
-                         block.a(this.level, this.player, blockposition, iblockdata, tileentity, itemstack1);
+                         block.playerDestroy(this.level, this.player, blockposition, iblockdata, tileentity, itemstack1);
                      }
  
 -                    return true;
@@ -260,7 +260,7 @@
 +
 +                // Drop event experience
 +                if (flag && event != null) {
-+                    iblockdata.getBlock().dropExperience(this.level, blockposition, event.getExpToDrop());
++                    iblockdata.getBlock().popExperience(this.level, blockposition, event.getExpToDrop());
                  }
 +
 +                return true;
@@ -268,7 +268,7 @@
              }
          }
      }
-@@ -307,12 +461,52 @@
+@@ -306,12 +460,52 @@
          }
      }
  
@@ -278,63 +278,63 @@
 +    public BlockPosition interactPosition;
 +    public EnumHand interactHand;
 +    public ItemStack interactItemStack;
-     public EnumInteractionResult a(EntityPlayer entityplayer, World world, ItemStack itemstack, EnumHand enumhand, MovingObjectPositionBlock movingobjectpositionblock) {
-         BlockPosition blockposition = movingobjectpositionblock.getBlockPosition();
-         IBlockData iblockdata = world.getType(blockposition);
+     public EnumInteractionResult useItemOn(EntityPlayer entityplayer, World world, ItemStack itemstack, EnumHand enumhand, MovingObjectPositionBlock movingobjectpositionblock) {
+         BlockPosition blockposition = movingobjectpositionblock.getBlockPos();
+         IBlockData iblockdata = world.getBlockState(blockposition);
 +        EnumInteractionResult enuminteractionresult = EnumInteractionResult.PASS;
 +        boolean cancelledBlock = false;
  
          if (this.gameModeForPlayer == EnumGamemode.SPECTATOR) {
-             ITileInventory itileinventory = iblockdata.b(world, blockposition);
+             ITileInventory itileinventory = iblockdata.getMenuProvider(world, blockposition);
 +            cancelledBlock = !(itileinventory instanceof ITileInventory);
 +        }
 +
-+        if (entityplayer.getCooldownTracker().hasCooldown(itemstack.getItem())) {
++        if (entityplayer.getCooldowns().isOnCooldown(itemstack.getItem())) {
 +            cancelledBlock = true;
 +        }
 +
 +        PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(entityplayer, Action.RIGHT_CLICK_BLOCK, blockposition, movingobjectpositionblock.getDirection(), itemstack, cancelledBlock, enumhand);
 +        firedInteract = true;
 +        interactResult = event.useItemInHand() == Event.Result.DENY;
-+        interactPosition = blockposition.immutableCopy();
++        interactPosition = blockposition.immutable();
 +        interactHand = enumhand;
-+        interactItemStack = itemstack.cloneItemStack();
++        interactItemStack = itemstack.copy();
 +
 +        if (event.useInteractedBlock() == Event.Result.DENY) {
 +            // If we denied a door from opening, we need to send a correcting update to the client, as it already opened the door.
 +            if (iblockdata.getBlock() instanceof BlockDoor) {
-+                boolean bottom = iblockdata.get(BlockDoor.HALF) == BlockPropertyDoubleBlockHalf.LOWER;
-+                entityplayer.connection.sendPacket(new PacketPlayOutBlockChange(world, bottom ? blockposition.up() : blockposition.down()));
++                boolean bottom = iblockdata.getValue(BlockDoor.HALF) == BlockPropertyDoubleBlockHalf.LOWER;
++                entityplayer.connection.send(new PacketPlayOutBlockChange(world, bottom ? blockposition.above() : blockposition.below()));
 +            } else if (iblockdata.getBlock() instanceof BlockCake) {
 +                entityplayer.getBukkitEntity().sendHealthUpdate(); // SPIGOT-1341 - reset health for cake
 +            } else if (interactItemStack.getItem() instanceof ItemBisected) {
 +                // send a correcting update to the client, as it already placed the upper half of the bisected item
-+                entityplayer.connection.sendPacket(new PacketPlayOutBlockChange(world, blockposition.shift(movingobjectpositionblock.getDirection()).up()));
++                entityplayer.connection.send(new PacketPlayOutBlockChange(world, blockposition.relative(movingobjectpositionblock.getDirection()).above()));
 +
 +                // send a correcting update to the client for the block above as well, this because of replaceable blocks (such as grass, sea grass etc)
-+                entityplayer.connection.sendPacket(new PacketPlayOutBlockChange(world, blockposition.up()));
++                entityplayer.connection.send(new PacketPlayOutBlockChange(world, blockposition.above()));
 +            }
 +            entityplayer.getBukkitEntity().updateInventory(); // SPIGOT-2867
 +            enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS;
 +        } else if (this.gameModeForPlayer == EnumGamemode.SPECTATOR) {
-+            ITileInventory itileinventory = iblockdata.b(world, blockposition);
++            ITileInventory itileinventory = iblockdata.getMenuProvider(world, blockposition);
  
              if (itileinventory != null) {
-                 entityplayer.openContainer(itileinventory);
-@@ -326,7 +520,7 @@
-             ItemStack itemstack1 = itemstack.cloneItemStack();
+                 entityplayer.openMenu(itileinventory);
+@@ -325,7 +519,7 @@
+             ItemStack itemstack1 = itemstack.copy();
  
              if (!flag1) {
--                EnumInteractionResult enuminteractionresult = iblockdata.interact(world, entityplayer, enumhand, movingobjectpositionblock);
-+                enuminteractionresult = iblockdata.interact(world, entityplayer, enumhand, movingobjectpositionblock);
+-                EnumInteractionResult enuminteractionresult = iblockdata.use(world, entityplayer, enumhand, movingobjectpositionblock);
++                enuminteractionresult = iblockdata.use(world, entityplayer, enumhand, movingobjectpositionblock);
  
-                 if (enuminteractionresult.a()) {
-                     CriterionTriggers.ITEM_USED_ON_BLOCK.a(entityplayer, blockposition, itemstack1);
-@@ -334,17 +528,17 @@
+                 if (enuminteractionresult.consumesAction()) {
+                     CriterionTriggers.ITEM_USED_ON_BLOCK.trigger(entityplayer, blockposition, itemstack1);
+@@ -333,17 +527,17 @@
                  }
              }
  
--            if (!itemstack.isEmpty() && !entityplayer.getCooldownTracker().hasCooldown(itemstack.getItem())) {
+-            if (!itemstack.isEmpty() && !entityplayer.getCooldowns().isOnCooldown(itemstack.getItem())) {
 +            if (!itemstack.isEmpty() && enuminteractionresult != EnumInteractionResult.SUCCESS && !interactResult) { // add !interactResult SPIGOT-764
                  ItemActionContext itemactioncontext = new ItemActionContext(entityplayer, enumhand, movingobjectpositionblock);
                  EnumInteractionResult enuminteractionresult1;
@@ -342,16 +342,16 @@
                  if (this.isCreative()) {
                      int i = itemstack.getCount();
  
--                    enuminteractionresult1 = itemstack.placeItem(itemactioncontext);
-+                    enuminteractionresult1 = itemstack.placeItem(itemactioncontext, enumhand);
+-                    enuminteractionresult1 = itemstack.useOn(itemactioncontext);
++                    enuminteractionresult1 = itemstack.useOn(itemactioncontext, enumhand);
                      itemstack.setCount(i);
                  } else {
--                    enuminteractionresult1 = itemstack.placeItem(itemactioncontext);
-+                    enuminteractionresult1 = itemstack.placeItem(itemactioncontext, enumhand);
+-                    enuminteractionresult1 = itemstack.useOn(itemactioncontext);
++                    enuminteractionresult1 = itemstack.useOn(itemactioncontext, enumhand);
                  }
  
-                 if (enuminteractionresult1.a()) {
-@@ -352,10 +546,10 @@
+                 if (enuminteractionresult1.consumesAction()) {
+@@ -351,10 +545,10 @@
                  }
  
                  return enuminteractionresult1;
@@ -363,4 +363,4 @@
 +        // CraftBukkit end
      }
  
-     public void a(WorldServer worldserver) {
+     public void setLevel(WorldServer worldserver) {

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

@@ -1,16 +1,16 @@
 --- a/net/minecraft/server/level/RegionLimitedWorldAccess.java
 +++ b/net/minecraft/server/level/RegionLimitedWorldAccess.java
-@@ -308,6 +308,13 @@
+@@ -319,6 +319,13 @@
  
      @Override
-     public boolean addEntity(Entity entity) {
+     public boolean addFreshEntity(Entity entity) {
 +        // CraftBukkit start
-+        return addEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT);
++        return addFreshEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT);
 +    }
 +
 +    @Override
-+    public boolean addEntity(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
++    public boolean addFreshEntity(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
 +        // CraftBukkit end
-         int i = SectionPosition.a(entity.cW());
-         int j = SectionPosition.a(entity.dc());
+         int i = SectionPosition.blockToSectionCoord(entity.getBlockX());
+         int j = SectionPosition.blockToSectionCoord(entity.getBlockZ());
  

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

@@ -1,11 +1,11 @@
 --- a/net/minecraft/server/level/TicketType.java
 +++ b/net/minecraft/server/level/TicketType.java
 @@ -23,6 +23,8 @@
-     public static final TicketType<BlockPosition> PORTAL = a("portal", BaseBlockPosition::compareTo, 300);
-     public static final TicketType<Integer> POST_TELEPORT = a("post_teleport", Integer::compareTo, 5);
-     public static final TicketType<ChunkCoordIntPair> UNKNOWN = a("unknown", Comparator.comparingLong(ChunkCoordIntPair::pair), 1);
-+    public static final TicketType<Unit> PLUGIN = a("plugin", (a, b) -> 0); // CraftBukkit
-+    public static final TicketType<org.bukkit.plugin.Plugin> PLUGIN_TICKET = a("plugin_ticket", (plugin1, plugin2) -> plugin1.getClass().getName().compareTo(plugin2.getClass().getName())); // CraftBukkit
+     public static final TicketType<BlockPosition> PORTAL = create("portal", BaseBlockPosition::compareTo, 300);
+     public static final TicketType<Integer> POST_TELEPORT = create("post_teleport", Integer::compareTo, 5);
+     public static final TicketType<ChunkCoordIntPair> UNKNOWN = create("unknown", Comparator.comparingLong(ChunkCoordIntPair::toLong), 1);
++    public static final TicketType<Unit> PLUGIN = create("plugin", (a, b) -> 0); // CraftBukkit
++    public static final TicketType<org.bukkit.plugin.Plugin> PLUGIN_TICKET = create("plugin_ticket", (plugin1, plugin2) -> plugin1.getClass().getName().compareTo(plugin2.getClass().getName())); // CraftBukkit
  
-     public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
+     public static <T> TicketType<T> create(String s, Comparator<T> comparator) {
          return new TicketType<>(s, comparator, 0L);

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
-@@ -152,6 +152,19 @@
+@@ -147,6 +147,19 @@
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
@@ -20,7 +20,7 @@
  public class WorldServer extends World implements GeneratorAccessSeed {
  
      public static final BlockPosition END_SPAWN_POINT = new BlockPosition(100, 50, 0);
-@@ -160,7 +173,7 @@
+@@ -164,7 +177,7 @@
      final List<EntityPlayer> players;
      private final ChunkProviderServer chunkSource;
      private final MinecraftServer server;
@@ -29,13 +29,13 @@
      final EntityTickList entityTickList;
      public final PersistentEntitySectionManager<Entity> entityManager;
      public boolean noSave;
-@@ -180,31 +193,52 @@
-     private final StructureManager structureFeatureManager;
+@@ -186,9 +199,24 @@
+     private final StructureCheck structureCheck;
      private final boolean tickTime;
  
 -    public WorldServer(MinecraftServer minecraftserver, Executor executor, Convertable.ConversionSession convertable_conversionsession, IWorldDataServer iworlddataserver, ResourceKey<World> resourcekey, DimensionManager dimensionmanager, WorldLoadListener worldloadlistener, ChunkGenerator chunkgenerator, boolean flag, long i, List<MobSpawner> list, boolean flag1) {
 -        Objects.requireNonNull(minecraftserver);
--        super(iworlddataserver, resourcekey, dimensionmanager, minecraftserver::getMethodProfiler, false, flag, i);
+-        super(iworlddataserver, resourcekey, dimensionmanager, minecraftserver::getProfiler, false, flag, i);
 +
 +    // CraftBukkit start
 +    private int tickPosition;
@@ -43,39 +43,21 @@
 +    public final UUID uuid;
 +
 +    public Chunk getChunkIfLoaded(int x, int z) {
-+        return this.chunkSource.getChunkAt(x, z, false);
++        return this.chunkSource.getChunk(x, z, false);
 +    }
 +
 +    // Add env and gen to constructor, WorldData -> WorldDataServer
 +    public WorldServer(MinecraftServer minecraftserver, Executor executor, Convertable.ConversionSession convertable_conversionsession, IWorldDataServer iworlddataserver, ResourceKey<World> resourcekey, DimensionManager dimensionmanager, WorldLoadListener worldloadlistener, ChunkGenerator chunkgenerator, boolean flag, long i, List<MobSpawner> list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
 +        // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
-+        super(iworlddataserver, resourcekey, dimensionmanager, minecraftserver::getMethodProfiler, false, flag, i, gen, biomeProvider, env);
-+        this.pvpMode = minecraftserver.getPVP();
++        super(iworlddataserver, resourcekey, dimensionmanager, minecraftserver::getProfiler, false, flag, i, gen, biomeProvider, env);
++        this.pvpMode = minecraftserver.isPvpAllowed();
 +        convertable = convertable_conversionsession;
 +        uuid = WorldUUID.getUUID(convertable_conversionsession.levelPath.toFile());
 +        // CraftBukkit end
          this.players = Lists.newArrayList();
          this.entityTickList = new EntityTickList();
--        Predicate predicate = (block) -> {
-+        Predicate<Block> predicate = (block) -> { // CraftBukkit - decompile eror
-             return block == null || block.getBlockData().isAir();
-         };
-         RegistryBlocks registryblocks = IRegistry.BLOCK;
- 
-         Objects.requireNonNull(registryblocks);
--        this.blockTicks = new TickListServer<>(this, predicate, registryblocks::getKey, this::b);
--        predicate = (fluidtype) -> {
-+        this.blockTicks = new TickListServer<>(this, predicate, IRegistry.BLOCK::getKey, this::b); // CraftBukkit - decompile error
-+        Predicate<FluidType> predicate2 = (fluidtype) -> { // CraftBukkit - decompile error
-             return fluidtype == null || fluidtype == FluidTypes.EMPTY;
-         };
-         registryblocks = IRegistry.FLUID;
-         Objects.requireNonNull(registryblocks);
--        this.liquidTicks = new TickListServer<>(this, predicate, registryblocks::getKey, this::a);
-+        this.liquidTicks = new TickListServer<>(this, predicate2, IRegistry.FLUID::getKey, this::a); // CraftBukkit - decompile error
-         this.navigatingMobs = new ObjectOpenHashSet();
-         this.blockEvents = new ObjectLinkedOpenHashSet();
-         this.dragonParts = new Int2ObjectOpenHashMap();
+         this.blockTicks = new TickListServer<>(this::isPositionTickingWithEntitiesLoaded, this.getProfilerSupplier());
+@@ -200,7 +228,13 @@
          this.tickTime = flag1;
          this.server = minecraftserver;
          this.customSpawners = list;
@@ -87,18 +69,18 @@
 +            chunkgenerator = new org.bukkit.craftbukkit.generator.CustomChunkGenerator(this, chunkgenerator, gen);
 +        }
 +        // CraftBukkit end
-         boolean flag2 = minecraftserver.isSyncChunkWrites();
-         DataFixer datafixer = minecraftserver.getDataFixer();
-         EntityPersistentStorage<Entity> entitypersistentstorage = new EntityStorage(this, new File(convertable_conversionsession.a(resourcekey), "entities"), datafixer, flag2, minecraftserver);
+         boolean flag2 = minecraftserver.forceSynchronousWrites();
+         DataFixer datafixer = minecraftserver.getFixerUpper();
+         EntityPersistentStorage<Entity> entitypersistentstorage = new EntityStorage(this, convertable_conversionsession.getDimensionPath(resourcekey).resolve("entities"), datafixer, flag2, minecraftserver);
 @@ -231,14 +265,15 @@
-             iworlddataserver.setGameType(minecraftserver.getGamemode());
-         }
+         long l = minecraftserver.getWorldData().worldGenSettings().seed();
  
--        this.structureFeatureManager = new StructureManager(this, minecraftserver.getSaveData().getGeneratorSettings());
-+        this.structureFeatureManager = new StructureManager(this, this.serverLevelData.getGeneratorSettings()); // CraftBukkit
-         if (this.getDimensionManager().isCreateDragonBattle()) {
--            this.dragonFight = new EnderDragonBattle(this, minecraftserver.getSaveData().getGeneratorSettings().getSeed(), minecraftserver.getSaveData().C());
-+            this.dragonFight = new EnderDragonBattle(this, this.serverLevelData.getGeneratorSettings().getSeed(), this.serverLevelData.C()); // CraftBukkit
+         this.structureCheck = new StructureCheck(this.chunkSource.chunkScanner(), this.registryAccess(), minecraftserver.getStructureManager(), resourcekey, chunkgenerator, this, chunkgenerator.getBiomeSource(), l, datafixer);
+-        this.structureFeatureManager = new StructureManager(this, minecraftserver.getWorldData().worldGenSettings(), this.structureCheck);
++        this.structureFeatureManager = new StructureManager(this, this.serverLevelData.worldGenSettings(), structureCheck); // CraftBukkit
+         if (this.dimensionType().createDragonFight()) {
+-            this.dragonFight = new EnderDragonBattle(this, l, minecraftserver.getWorldData().endDragonFightData());
++            this.dragonFight = new EnderDragonBattle(this, this.serverLevelData.worldGenSettings().seed(), this.serverLevelData.endDragonFightData()); // CraftBukkit
          } else {
              this.dragonFight = null;
          }
@@ -107,18 +89,101 @@
 +        this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
      }
  
-     public void a(int i, int j, boolean flag, boolean flag1) {
-@@ -331,6 +366,7 @@
-             this.rainLevel = MathHelper.a(this.rainLevel, 0.0F, 1.0F);
+     public void setWeatherParameters(int i, int j, boolean flag, boolean flag1) {
+@@ -270,12 +305,20 @@
+         long j;
+ 
+         if (this.sleepStatus.areEnoughSleeping(i) && this.sleepStatus.areEnoughDeepSleeping(i, this.players)) {
++            // CraftBukkit start
++            j = this.levelData.getDayTime() + 24000L;
++            TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (j - j % 24000L) - this.getDayTime());
+             if (this.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
+-                j = this.levelData.getDayTime() + 24000L;
+-                this.setDayTime(j - j % 24000L);
++                getCraftServer().getPluginManager().callEvent(event);
++                if (!event.isCancelled()) {
++                    this.setDayTime(this.getDayTime() + event.getSkipAmount());
++                }
+             }
+ 
+-            this.wakeUpAllPlayers();
++            if (!event.isCancelled()) {
++                this.wakeUpAllPlayers();
++            }
++            // CraftBukkit end
+             if (this.getGameRules().getBoolean(GameRules.RULE_WEATHER_CYCLE) && this.isRaining()) {
+                 this.resetWeatherCycle();
+             }
+@@ -301,7 +344,7 @@
+         this.runBlockEvents();
+         this.handlingTick = false;
+         gameprofilerfiller.pop();
+-        boolean flag = !this.players.isEmpty() || !this.getForcedChunks().isEmpty();
++        boolean flag = true || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players
+ 
+         if (flag) {
+             this.resetEmptyTime();
+@@ -317,7 +360,7 @@
+ 
+             this.entityTickList.forEach((entity) -> {
+                 if (!entity.isRemoved()) {
+-                    if (this.shouldDiscardEntity(entity)) {
++                    if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
+                         entity.discard();
+                     } else {
+                         gameprofilerfiller.push("checkDespawn");
+@@ -389,7 +432,7 @@
+ 
+     private void wakeUpAllPlayers() {
+         this.sleepStatus.removeAllSleepers();
+-        ((List) this.players.stream().filter(EntityLiving::isSleeping).collect(Collectors.toList())).forEach((entityplayer) -> {
++        (this.players.stream().filter(EntityLiving::isSleeping).collect(Collectors.toList())).forEach((entityplayer) -> { // CraftBukkit - decompile error
+             entityplayer.stopSleepInBed(false, false);
+         });
+     }
+@@ -416,14 +459,14 @@
+                     entityhorseskeleton.setTrap(true);
+                     entityhorseskeleton.setAge(0);
+                     entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
+-                    this.addFreshEntity(entityhorseskeleton);
++                    this.addFreshEntity(entityhorseskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
+                 }
+ 
+                 EntityLightning entitylightning = (EntityLightning) EntityTypes.LIGHTNING_BOLT.create(this);
+ 
+                 entitylightning.moveTo(Vec3D.atBottomCenterOf(blockposition));
+                 entitylightning.setVisualOnly(flag1);
+-                this.addFreshEntity(entitylightning);
++                this.strikeLightning(entitylightning, org.bukkit.event.weather.LightningStrikeEvent.Cause.WEATHER); // CraftBukkit
+             }
+         }
+ 
+@@ -434,12 +477,12 @@
+             BiomeBase biomebase = this.getBiome(blockposition);
+ 
+             if (biomebase.shouldFreeze(this, blockposition1)) {
+-                this.setBlockAndUpdate(blockposition1, Blocks.ICE.defaultBlockState());
++                org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockposition1, Blocks.ICE.defaultBlockState(), null); // CraftBukkit
+             }
+ 
+             if (flag) {
+                 if (biomebase.shouldSnow(this, blockposition)) {
+-                    this.setBlockAndUpdate(blockposition, Blocks.SNOW.defaultBlockState());
++                    org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockposition, Blocks.SNOW.defaultBlockState(), null); // CraftBukkit
+                 }
+ 
+                 IBlockData iblockdata = this.getBlockState(blockposition1);
+@@ -635,6 +678,7 @@
+             this.rainLevel = MathHelper.clamp(this.rainLevel, 0.0F, 1.0F);
          }
  
 +        /* CraftBukkit start
          if (this.oRainLevel != this.rainLevel) {
-             this.server.getPlayerList().a((Packet) (new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, this.rainLevel)), this.getDimensionKey());
+             this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, this.rainLevel), this.dimension());
          }
-@@ -349,16 +385,45 @@
-             this.server.getPlayerList().sendAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, this.rainLevel));
-             this.server.getPlayerList().sendAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.THUNDER_LEVEL_CHANGE, this.thunderLevel));
+@@ -653,14 +697,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));
          }
 +        // */
 +        for (int idx = 0; idx < this.players.size(); ++idx) {
@@ -142,100 +207,17 @@
 +        }
 +        // CraftBukkit end
  
-         i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
-         if (this.sleepStatus.a(i) && this.sleepStatus.a(i, this.players)) {
-+            // CraftBukkit start
-+            long l = this.levelData.getDayTime() + 24000L;
-+            TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (l - l % 24000L) - this.getDayTime());
-             if (this.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
--                long l = this.levelData.getDayTime() + 24000L;
-+                getCraftServer().getPluginManager().callEvent(event);
-+                if (!event.isCancelled()) {
-+                    this.setDayTime(this.getDayTime() + event.getSkipAmount());
-+                }
- 
--                this.setDayTime(l - l % 24000L);
-             }
- 
--            this.wakeupPlayers();
-+            if (!event.isCancelled()) {
-+                this.wakeupPlayers();
-+            }
-+            // CraftBukkit end
-             if (this.getGameRules().getBoolean(GameRules.RULE_WEATHER_CYCLE)) {
-                 this.clearWeather();
-             }
-@@ -380,7 +445,7 @@
-         this.aq();
-         this.handlingTick = false;
-         gameprofilerfiller.exit();
--        boolean flag3 = !this.players.isEmpty() || !this.getForceLoadedChunks().isEmpty();
-+        boolean flag3 = true || !this.players.isEmpty() || !this.getForceLoadedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players
- 
-         if (flag3) {
-             this.resetEmptyTime();
-@@ -396,7 +461,7 @@
- 
-             this.entityTickList.a((entity) -> {
-                 if (!entity.isRemoved()) {
--                    if (this.i(entity)) {
-+                    if (false && this.i(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
-                         entity.die();
-                     } else {
-                         gameprofilerfiller.enter("checkDespawn");
-@@ -461,7 +526,7 @@
- 
-     private void wakeupPlayers() {
-         this.sleepStatus.a();
--        ((List) this.players.stream().filter(EntityLiving::isSleeping).collect(Collectors.toList())).forEach((entityplayer) -> {
-+        (this.players.stream().filter(EntityLiving::isSleeping).collect(Collectors.toList())).forEach((entityplayer) -> { // CraftBukkit - decompile error
-             entityplayer.wakeup(false, false);
-         });
-     }
-@@ -488,14 +553,14 @@
-                     entityhorseskeleton.v(true);
-                     entityhorseskeleton.setAgeRaw(0);
-                     entityhorseskeleton.setPosition((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
--                    this.addEntity(entityhorseskeleton);
-+                    this.addEntity(entityhorseskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
-                 }
- 
-                 EntityLightning entitylightning = (EntityLightning) EntityTypes.LIGHTNING_BOLT.a((World) this);
- 
-                 entitylightning.d(Vec3D.c((BaseBlockPosition) blockposition));
-                 entitylightning.setEffect(flag1);
--                this.addEntity(entitylightning);
-+                this.strikeLightning(entitylightning, org.bukkit.event.weather.LightningStrikeEvent.Cause.WEATHER); // CraftBukkit
-             }
-         }
- 
-@@ -506,12 +571,12 @@
-             BiomeBase biomebase = this.getBiome(blockposition);
- 
-             if (biomebase.a((IWorldReader) this, blockposition1)) {
--                this.setTypeUpdate(blockposition1, Blocks.ICE.getBlockData());
-+                org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockposition1, Blocks.ICE.getBlockData(), null); // CraftBukkit
-             }
- 
-             if (flag) {
-                 if (biomebase.b(this, blockposition)) {
--                    this.setTypeUpdate(blockposition, Blocks.SNOW.getBlockData());
-+                    org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockposition, Blocks.SNOW.getBlockData(), null); // CraftBukkit
-                 }
- 
-                 IBlockData iblockdata = this.getType(blockposition1);
-@@ -642,10 +707,22 @@
      }
  
-     private void clearWeather() {
--        this.serverLevelData.setWeatherDuration(0);
+     private void resetWeatherCycle() {
+-        this.serverLevelData.setRainTime(0);
 +        // CraftBukkit start
-         this.serverLevelData.setStorm(false);
--        this.serverLevelData.setThunderDuration(0);
+         this.serverLevelData.setRaining(false);
+-        this.serverLevelData.setThunderTime(0);
 +        // If we stop due to everyone sleeping we should reset the weather duration to some other random value.
 +        // Not that everyone ever manages to get the whole server to sleep at the same time....
-+        if (!this.serverLevelData.hasStorm()) {
-+            this.serverLevelData.setWeatherDuration(0);
++        if (!this.serverLevelData.isRaining()) {
++            this.serverLevelData.setRainTime(0);
 +        }
 +        // CraftBukkit end
          this.serverLevelData.setThundering(false);
@@ -243,37 +225,37 @@
 +        // If we stop due to everyone sleeping we should reset the weather duration to some other random value.
 +        // Not that everyone ever manages to get the whole server to sleep at the same time....
 +        if (!this.serverLevelData.isThundering()) {
-+            this.serverLevelData.setThunderDuration(0);
++            this.serverLevelData.setThunderTime(0);
 +        }
 +        // CraftBukkit end
      }
  
      public void resetEmptyTime() {
-@@ -680,6 +757,7 @@
+@@ -695,6 +772,7 @@
          });
-         gameprofilerfiller.c("tickNonPassenger");
+         gameprofilerfiller.incrementCounter("tickNonPassenger");
          entity.tick();
 +        entity.postTick(); // CraftBukkit
-         this.getMethodProfiler().exit();
+         this.getProfiler().pop();
          Iterator iterator = entity.getPassengers().iterator();
  
-@@ -703,6 +781,7 @@
+@@ -718,6 +796,7 @@
                  });
-                 gameprofilerfiller.c("tickPassenger");
-                 entity1.passengerTick();
+                 gameprofilerfiller.incrementCounter("tickPassenger");
+                 entity1.rideTick();
 +                entity1.postTick(); // CraftBukkit
-                 gameprofilerfiller.exit();
+                 gameprofilerfiller.pop();
                  Iterator iterator = entity1.getPassengers().iterator();
  
-@@ -727,6 +806,7 @@
-         ChunkProviderServer chunkproviderserver = this.getChunkProvider();
+@@ -742,6 +821,7 @@
+         ChunkProviderServer chunkproviderserver = this.getChunkSource();
  
          if (!flag1) {
 +            org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit
              if (iprogressupdate != null) {
-                 iprogressupdate.a(new ChatMessage("menu.savingLevel"));
+                 iprogressupdate.progressStartNoAbort(new ChatMessage("menu.savingLevel"));
              }
-@@ -744,11 +824,19 @@
+@@ -759,11 +839,19 @@
              }
  
          }
@@ -281,105 +263,100 @@
 +        // CraftBukkit start - moved from MinecraftServer.saveChunks
 +        WorldServer worldserver1 = this;
 +
-+        serverLevelData.a(worldserver1.getWorldBorder().t());
-+        serverLevelData.setCustomBossEvents(this.server.getBossBattleCustomData().save());
-+        convertable.a(this.server.registryHolder, this.serverLevelData, this.server.getPlayerList().save());
++        serverLevelData.setWorldBorder(worldserver1.getWorldBorder().createSettings());
++        serverLevelData.setCustomBossEvents(this.server.getCustomBossEvents().save());
++        convertable.saveDataTag(this.server.registryHolder, this.serverLevelData, this.server.getPlayerList().getSingleplayerData());
 +        // CraftBukkit end
      }
  
-     private void ap() {
+     private void saveLevelData() {
          if (this.dragonFight != null) {
--            this.server.getSaveData().a(this.dragonFight.a());
-+            this.serverLevelData.a(this.dragonFight.a()); // CraftBukkit
+-            this.server.getWorldData().setEndDragonFightData(this.dragonFight.saveData());
++            this.serverLevelData.setEndDragonFightData(this.dragonFight.saveData()); // CraftBukkit
          }
  
-         this.getChunkProvider().getWorldPersistentData().a();
-@@ -794,15 +882,34 @@
+         this.getChunkSource().getDataStorage().save();
+@@ -809,15 +897,34 @@
  
      @Override
-     public boolean addEntity(Entity entity) {
--        return this.addEntity0(entity);
+     public boolean addFreshEntity(Entity entity) {
+-        return this.addEntity(entity);
 +        // CraftBukkit start
-+        return this.addEntity0(entity, CreatureSpawnEvent.SpawnReason.DEFAULT);
++        return this.addFreshEntity(entity, CreatureSpawnEvent.SpawnReason.DEFAULT);
 +    }
 +
 +    @Override
-+    public boolean addEntity(Entity entity, CreatureSpawnEvent.SpawnReason reason) {
-+        return this.addEntity0(entity, reason);
++    public boolean addFreshEntity(Entity entity, CreatureSpawnEvent.SpawnReason reason) {
++        return this.addEntity(entity, reason);
 +        // CraftBukkit end
      }
  
-     public boolean addEntitySerialized(Entity entity) {
--        return this.addEntity0(entity);
+     public boolean addWithUUID(Entity entity) {
+-        return this.addEntity(entity);
 +        // CraftBukkit start
-+        return this.addEntitySerialized(entity, CreatureSpawnEvent.SpawnReason.DEFAULT);
++        return this.addWithUUID(entity, CreatureSpawnEvent.SpawnReason.DEFAULT);
 +    }
 +
-+    public boolean addEntitySerialized(Entity entity, CreatureSpawnEvent.SpawnReason reason) {
-+        return this.addEntity0(entity, reason);
++    public boolean addWithUUID(Entity entity, CreatureSpawnEvent.SpawnReason reason) {
++        return this.addEntity(entity, reason);
 +        // CraftBukkit end
      }
  
-     public void addEntityTeleport(Entity entity) {
--        this.addEntity0(entity);
+     public void addDuringTeleport(Entity entity) {
+-        this.addEntity(entity);
 +        // CraftBukkit start
-+        this.addEntity0(entity, CreatureSpawnEvent.SpawnReason.DEFAULT);
++        this.addDuringTeleport(entity, CreatureSpawnEvent.SpawnReason.DEFAULT);
 +    }
 +
-+    public void addEntityTeleport(Entity entity, CreatureSpawnEvent.SpawnReason reason) {
-+        this.addEntity0(entity, reason);
++    public void addDuringTeleport(Entity entity, CreatureSpawnEvent.SpawnReason reason) {
++        this.addEntity(entity, reason);
 +        // CraftBukkit end
      }
  
-     public void addPlayerCommand(EntityPlayer entityplayer) {
-@@ -830,27 +937,39 @@
-             this.a((EntityPlayer) entity, Entity.RemovalReason.DISCARDED);
-         }
- 
--        this.entityManager.a((EntityAccess) entityplayer);
-+        this.entityManager.a(entityplayer); // CraftBukkit - decompile error
+     public void addDuringCommandTeleport(EntityPlayer entityplayer) {
+@@ -848,24 +955,36 @@
+         this.entityManager.addNewEntity(entityplayer);
      }
  
--    private boolean addEntity0(Entity entity) {
+-    private boolean addEntity(Entity entity) {
 +    // CraftBukkit start
-+    private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
++    private boolean addEntity(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
          if (entity.isRemoved()) {
--            WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType()));
-+            // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit
+-            WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType()));
++            // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
              return false;
          } else {
--            return this.entityManager.a((EntityAccess) entity);
 +            if (!CraftEventFactory.doEntityAddEventCalling(this, entity, spawnReason)) {
 +                return false;
 +            }
 +            // CraftBukkit end
 +
-+            return this.entityManager.a(entity); // CraftBukkit - decompile error
+             return this.entityManager.addNewEntity(entity);
          }
      }
  
-     public boolean addAllEntitiesSafely(Entity entity) {
--        Stream stream = entity.recursiveStream().map(Entity::getUniqueID);
+     public boolean tryAddFreshEntityWithPassengers(Entity entity) {
+-        Stream stream = entity.getSelfAndPassengers().map(Entity::getUUID);
 +        // CraftBukkit start
-+        return this.addAllEntitiesSafely(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT);
++        return this.tryAddFreshEntityWithPassengers(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT);
 +    }
 +
-+    public boolean addAllEntitiesSafely(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
++    public boolean tryAddFreshEntityWithPassengers(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
 +        // CraftBukkit end
-+        Stream<UUID> stream = entity.recursiveStream().map(Entity::getUniqueID); // CraftBukkit - decompile error
++        Stream<UUID> stream = entity.getSelfAndPassengers().map(Entity::getUUID); // CraftBukkit - decompile error
          PersistentEntitySectionManager persistententitysectionmanager = this.entityManager;
  
          Objects.requireNonNull(this.entityManager);
-         if (stream.anyMatch(persistententitysectionmanager::a)) {
+         if (stream.anyMatch(persistententitysectionmanager::isLoaded)) {
              return false;
          } else {
--            this.addAllEntities(entity);
-+            this.addAllEntities(entity, reason); // CraftBukkit
+-            this.addFreshEntityWithPassengers(entity);
++            this.addFreshEntityWithPassengers(entity, reason); // CraftBukkit
              return true;
          }
      }
-@@ -863,10 +982,32 @@
-         entityplayer.a(entity_removalreason);
+@@ -879,10 +998,32 @@
+         entityplayer.remove(entity_removalreason);
      }
  
 +    // CraftBukkit start
@@ -394,12 +371,12 @@
 +            return false;
 +        }
 +
-+        return this.addEntity(entitylightning);
++        return this.addFreshEntity(entitylightning);
 +    }
 +    // CraftBukkit end
 +
      @Override
-     public void a(int i, BlockPosition blockposition, int j) {
+     public void destroyBlockProgress(int i, BlockPosition blockposition, int j) {
          Iterator iterator = this.server.getPlayerList().getPlayers().iterator();
  
 +        // CraftBukkit start
@@ -411,9 +388,9 @@
          while (iterator.hasNext()) {
              EntityPlayer entityplayer = (EntityPlayer) iterator.next();
  
-@@ -875,6 +1016,12 @@
-                 double d1 = (double) blockposition.getY() - entityplayer.locY();
-                 double d2 = (double) blockposition.getZ() - entityplayer.locZ();
+@@ -891,6 +1032,12 @@
+                 double d1 = (double) blockposition.getY() - entityplayer.getY();
+                 double d2 = (double) blockposition.getZ() - entityplayer.getZ();
  
 +                // CraftBukkit start
 +                if (entityhuman != null && entityhuman instanceof EntityPlayer && !entityplayer.getBukkitEntity().canSee(((EntityPlayer) entityhuman).getBukkitEntity())) {
@@ -422,9 +399,9 @@
 +                // CraftBukkit end
 +
                  if (d0 * d0 + d1 * d1 + d2 * d2 < 1024.0D) {
-                     entityplayer.connection.sendPacket(new PacketPlayOutBlockBreakAnimation(i, blockposition, j));
+                     entityplayer.connection.send(new PacketPlayOutBlockBreakAnimation(i, blockposition, j));
                  }
-@@ -923,7 +1070,18 @@
+@@ -938,7 +1085,18 @@
              Iterator iterator = this.navigatingMobs.iterator();
  
              while (iterator.hasNext()) {
@@ -437,19 +414,19 @@
 +                    // This can happen because the pathfinder update below may trigger a chunk load, which in turn may cause more navigators to register
 +                    // In this case we just run the update again across all the iterators as the chunk will then be loaded
 +                    // As this is a relative edge case it is much faster than copying navigators (on either read or write)
-+                    notify(blockposition, iblockdata, iblockdata1, i);
++                    sendBlockUpdated(blockposition, iblockdata, iblockdata1, i);
 +                    return;
 +                }
 +                // CraftBukkit end
                  NavigationAbstract navigationabstract = entityinsentient.getNavigation();
  
-                 if (!navigationabstract.i()) {
-@@ -946,10 +1104,20 @@
+                 if (!navigationabstract.hasDelayedRecomputation()) {
+@@ -961,10 +1119,20 @@
  
      @Override
-     public Explosion createExplosion(@Nullable Entity entity, @Nullable DamageSource damagesource, @Nullable ExplosionDamageCalculator explosiondamagecalculator, double d0, double d1, double d2, float f, boolean flag, Explosion.Effect explosion_effect) {
+     public Explosion explode(@Nullable Entity entity, @Nullable DamageSource damagesource, @Nullable ExplosionDamageCalculator explosiondamagecalculator, double d0, double d1, double d2, float f, boolean flag, Explosion.Effect explosion_effect) {
 +        // CraftBukkit start
-+        Explosion explosion = super.createExplosion(entity, damagesource, explosiondamagecalculator, d0, d1, d2, f, flag, explosion_effect);
++        Explosion explosion = super.explode(entity, damagesource, explosiondamagecalculator, d0, d1, d2, f, flag, explosion_effect);
 +
 +        if (explosion.wasCanceled) {
 +            return explosion;
@@ -458,17 +435,17 @@
 +        /* Remove
          Explosion explosion = new Explosion(this, entity, damagesource, explosiondamagecalculator, d0, d1, d2, f, flag, explosion_effect);
  
-         explosion.a();
-         explosion.a(false);
+         explosion.explode();
+         explosion.finalizeExplosion(false);
 +        */
 +        // CraftBukkit end - TODO: Check if explosions are still properly implemented
          if (explosion_effect == Explosion.Effect.NONE) {
-             explosion.clearBlocks();
+             explosion.clearToBlow();
          }
-@@ -1023,13 +1191,20 @@
+@@ -1045,13 +1213,20 @@
      }
  
-     public <T extends ParticleParam> int a(T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6) {
+     public <T extends ParticleParam> int sendParticles(T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6) {
 -        PacketPlayOutWorldParticles packetplayoutworldparticles = new PacketPlayOutWorldParticles(t0, false, d0, d1, d2, (float) d3, (float) d4, (float) d5, (float) d6, i);
 +        // CraftBukkit - visibility api support
 +        return sendParticles(null, t0, d0, d1, d2, i, d3, d4, d5, d6, false);
@@ -483,72 +460,72 @@
              EntityPlayer entityplayer = (EntityPlayer) this.players.get(k);
 +            if (sender != null && !entityplayer.getBukkitEntity().canSee(sender.getBukkitEntity())) continue; // CraftBukkit
  
--            if (this.a(entityplayer, false, d0, d1, d2, packetplayoutworldparticles)) {
-+            if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
+-            if (this.sendParticles(entityplayer, false, d0, d1, d2, packetplayoutworldparticles)) {
++            if (this.sendParticles(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
                  ++j;
              }
          }
-@@ -1079,7 +1254,7 @@
+@@ -1101,7 +1276,7 @@
  
      @Nullable
-     public BlockPosition a(StructureGenerator<?> structuregenerator, BlockPosition blockposition, int i, boolean flag) {
--        return !this.server.getSaveData().getGeneratorSettings().shouldGenerateMapFeatures() ? null : this.getChunkProvider().getChunkGenerator().findNearestMapFeature(this, structuregenerator, blockposition, i, flag);
-+        return !this.serverLevelData.getGeneratorSettings().shouldGenerateMapFeatures() ? null : this.getChunkProvider().getChunkGenerator().findNearestMapFeature(this, structuregenerator, blockposition, i, flag); // CraftBukkit
+     public BlockPosition findNearestMapFeature(StructureGenerator<?> structuregenerator, BlockPosition blockposition, int i, boolean flag) {
+-        return !this.server.getWorldData().worldGenSettings().generateFeatures() ? null : this.getChunkSource().getGenerator().findNearestMapFeature(this, structuregenerator, blockposition, i, flag);
++        return !this.serverLevelData.worldGenSettings().generateFeatures() ? null : this.getChunkSource().getGenerator().findNearestMapFeature(this, structuregenerator, blockposition, i, flag); // CraftBukkit
      }
  
      @Nullable
-@@ -1116,11 +1291,21 @@
+@@ -1138,11 +1313,21 @@
      @Nullable
      @Override
-     public WorldMap a(String s) {
--        return (WorldMap) this.getMinecraftServer().E().getWorldPersistentData().a(WorldMap::b, s);
-+        return (WorldMap) this.getMinecraftServer().E().getWorldPersistentData().a((nbttagcompound) -> {
-+            // CraftBukkit start
+     public WorldMap getMapData(String s) {
+-        return (WorldMap) this.getServer().overworld().getDataStorage().get(WorldMap::load, s);
++        // CraftBukkit start
++        return (WorldMap) this.getServer().overworld().getDataStorage().get((nbttagcompound) -> {
 +            // We only get here when the data file exists, but is not a valid map
-+            WorldMap newMap = WorldMap.b(nbttagcompound);
++            WorldMap newMap = WorldMap.load(nbttagcompound);
 +            newMap.id = s;
 +            MapInitializeEvent event = new MapInitializeEvent(newMap.mapView);
 +            Bukkit.getServer().getPluginManager().callEvent(event);
 +            return newMap;
-+            // CraftBukkit end
 +        }, s);
++        // CraftBukkit end
      }
  
      @Override
-     public void a(String s, WorldMap worldmap) {
+     public void setMapData(String s, WorldMap worldmap) {
 +        worldmap.id = s; // CraftBukkit
-         this.getMinecraftServer().E().getWorldPersistentData().a(s, (PersistentBase) worldmap);
+         this.getServer().overworld().getDataStorage().set(s, worldmap);
      }
  
-@@ -1432,6 +1617,11 @@
+@@ -1454,6 +1639,11 @@
      @Override
-     public void update(BlockPosition blockposition, Block block) {
-         if (!this.isDebugWorld()) {
+     public void blockUpdated(BlockPosition blockposition, Block block) {
+         if (!this.isDebug()) {
 +            // CraftBukkit start
 +            if (populating) {
 +                return;
 +            }
 +            // CraftBukkit end
-             this.applyPhysics(blockposition, block);
+             this.updateNeighborsAt(blockposition, block);
          }
  
-@@ -1451,12 +1641,12 @@
+@@ -1473,12 +1663,12 @@
      }
  
-     public boolean isFlatWorld() {
--        return this.server.getSaveData().getGeneratorSettings().isFlatWorld();
-+        return this.serverLevelData.getGeneratorSettings().isFlatWorld(); // CraftBukkit
+     public boolean isFlat() {
+-        return this.server.getWorldData().worldGenSettings().isFlatWorld();
++        return this.serverLevelData.worldGenSettings().isFlatWorld(); // CraftBukkit
      }
  
      @Override
      public long getSeed() {
--        return this.server.getSaveData().getGeneratorSettings().getSeed();
-+        return this.serverLevelData.getGeneratorSettings().getSeed(); // CraftBukkit
+-        return this.server.getWorldData().worldGenSettings().seed();
++        return this.serverLevelData.worldGenSettings().seed(); // CraftBukkit
      }
  
      @Nullable
-@@ -1484,7 +1674,7 @@
-     private static <T> String a(Iterable<T> iterable, Function<T, String> function) {
+@@ -1506,7 +1696,7 @@
+     private static <T> String getTypeCount(Iterable<T> iterable, Function<T, String> function) {
          try {
              Object2IntOpenHashMap<String> object2intopenhashmap = new Object2IntOpenHashMap();
 -            Iterator iterator = iterable.iterator();
@@ -556,7 +533,7 @@
  
              while (iterator.hasNext()) {
                  T t0 = iterator.next();
-@@ -1493,7 +1683,7 @@
+@@ -1515,7 +1705,7 @@
                  object2intopenhashmap.addTo(s, 1);
              }
  
@@ -565,15 +542,15 @@
                  String s1 = (String) entry.getKey();
  
                  return s1 + ":" + entry.getIntValue();
-@@ -1504,17 +1694,33 @@
+@@ -1526,17 +1716,33 @@
      }
  
-     public static void a(WorldServer worldserver) {
+     public static void makeObsidianPlatform(WorldServer worldserver) {
 +        // CraftBukkit start
-+        WorldServer.a(worldserver, null);
++        WorldServer.makeObsidianPlatform(worldserver, null);
 +    }
 +
-+    public static void a(WorldServer worldserver, Entity entity) {
++    public static void makeObsidianPlatform(WorldServer worldserver, Entity entity) {
 +        // CraftBukkit end
          BlockPosition blockposition = WorldServer.END_SPAWN_POINT;
          int i = blockposition.getX();
@@ -582,13 +559,13 @@
  
 +        // CraftBukkit start
 +        org.bukkit.craftbukkit.util.BlockStateListPopulator blockList = new org.bukkit.craftbukkit.util.BlockStateListPopulator(worldserver);
-         BlockPosition.b(i - 2, j + 1, k - 2, i + 2, j + 3, k + 2).forEach((blockposition1) -> {
--            worldserver.setTypeUpdate(blockposition1, Blocks.AIR.getBlockData());
-+            blockList.setTypeAndData(blockposition1, Blocks.AIR.getBlockData(), 3);
+         BlockPosition.betweenClosed(i - 2, j + 1, k - 2, i + 2, j + 3, k + 2).forEach((blockposition1) -> {
+-            worldserver.setBlockAndUpdate(blockposition1, Blocks.AIR.defaultBlockState());
++            blockList.setBlock(blockposition1, Blocks.AIR.defaultBlockState(), 3);
          });
-         BlockPosition.b(i - 2, j, k - 2, i + 2, j, k + 2).forEach((blockposition1) -> {
--            worldserver.setTypeUpdate(blockposition1, Blocks.OBSIDIAN.getBlockData());
-+            blockList.setTypeAndData(blockposition1, Blocks.OBSIDIAN.getBlockData(), 3);
+         BlockPosition.betweenClosed(i - 2, j, k - 2, i + 2, j, k + 2).forEach((blockposition1) -> {
+-            worldserver.setBlockAndUpdate(blockposition1, Blocks.OBSIDIAN.defaultBlockState());
++            blockList.setBlock(blockposition1, Blocks.OBSIDIAN.defaultBlockState(), 3);
          });
 +        org.bukkit.World bworld = worldserver.getWorld();
 +        org.bukkit.event.world.PortalCreateEvent portalEvent = new org.bukkit.event.world.PortalCreateEvent((List<org.bukkit.block.BlockState>) (List) blockList.getList(), bworld, (entity == null) ? null : entity.getBukkitEntity(), org.bukkit.event.world.PortalCreateEvent.CreateReason.END_PLATFORM);
@@ -601,16 +578,16 @@
      }
  
      @Override
-@@ -1601,6 +1807,7 @@
+@@ -1629,6 +1835,7 @@
                  }
              }
  
 +            entity.valid = true; // CraftBukkit
          }
  
-         public void a(Entity entity) {
-@@ -1633,6 +1840,7 @@
-                 gameeventlistenerregistrar.a(entity.level);
+         public void onTrackingEnd(Entity entity) {
+@@ -1661,6 +1868,7 @@
+                 gameeventlistenerregistrar.onListenerRemoved(entity.level);
              }
  
 +            entity.valid = false; // CraftBukkit

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

@@ -19,21 +19,21 @@
      private final MinecraftServer server;
      private final NetworkManager connection;
 @@ -27,6 +36,40 @@
-         switch (packethandshakinginsetprotocol.b()) {
+         switch (packethandshakinginsetprotocol.getIntention()) {
              case LOGIN:
                  this.connection.setProtocol(EnumProtocol.LOGIN);
 +                // CraftBukkit start - Connection throttle
 +                try {
 +                    long currentTime = System.currentTimeMillis();
 +                    long connectionThrottle = this.server.server.getConnectionThrottle();
-+                    InetAddress address = ((java.net.InetSocketAddress) this.connection.getSocketAddress()).getAddress();
++                    InetAddress address = ((java.net.InetSocketAddress) this.connection.getRemoteAddress()).getAddress();
 +
 +                    synchronized (throttleTracker) {
 +                        if (throttleTracker.containsKey(address) && !"127.0.0.1".equals(address.getHostAddress()) && currentTime - throttleTracker.get(address) < connectionThrottle) {
 +                            throttleTracker.put(address, currentTime);
 +                            ChatMessage chatmessage = new ChatMessage("Connection throttled! Please wait before reconnecting.");
-+                            this.connection.sendPacket(new PacketLoginOutDisconnect(chatmessage));
-+                            this.connection.close(chatmessage);
++                            this.connection.send(new PacketLoginOutDisconnect(chatmessage));
++                            this.connection.disconnect(chatmessage);
 +                            return;
 +                        }
 +
@@ -56,14 +56,14 @@
 +                    org.apache.logging.log4j.LogManager.getLogger().debug("Failed to check connection throttle", t);
 +                }
 +                // CraftBukkit end
-                 if (packethandshakinginsetprotocol.c() != SharedConstants.getGameVersion().getProtocolVersion()) {
+                 if (packethandshakinginsetprotocol.getProtocolVersion() != SharedConstants.getCurrentVersion().getProtocolVersion()) {
                      ChatMessage chatmessage;
  
 @@ -40,6 +83,7 @@
-                     this.connection.close(chatmessage);
+                     this.connection.disconnect(chatmessage);
                  } else {
-                     this.connection.setPacketListener(new LoginListener(this.server, this.connection));
-+                    ((LoginListener) this.connection.j()).hostname = packethandshakinginsetprotocol.hostName + ":" + packethandshakinginsetprotocol.port; // CraftBukkit - set hostname
+                     this.connection.setListener(new LoginListener(this.server, this.connection));
++                    ((LoginListener) this.connection.getPacketListener()).hostname = packethandshakinginsetprotocol.hostName + ":" + packethandshakinginsetprotocol.port; // CraftBukkit - set hostname
                  }
                  break;
              case STATUS:

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

@@ -1,7 +1,7 @@
 --- a/net/minecraft/server/network/LegacyPingHandler.java
 +++ b/net/minecraft/server/network/LegacyPingHandler.java
 @@ -36,11 +36,12 @@
-             MinecraftServer minecraftserver = this.serverConnectionListener.d();
+             MinecraftServer minecraftserver = this.serverConnectionListener.getServer();
              int i = bytebuf.readableBytes();
              String s;
 +            org.bukkit.event.server.ServerListPingEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callServerListPingEvent(minecraftserver.server, inetsocketaddress.getAddress(), minecraftserver.getMotd(), minecraftserver.getPlayerCount(), minecraftserver.getMaxPlayers()); // CraftBukkit
@@ -11,24 +11,24 @@
                      LegacyPingHandler.LOGGER.debug("Ping: (<1.3.x) from {}:{}", inetsocketaddress.getAddress(), inetsocketaddress.getPort());
 -                    s = String.format("%s\u00a7%d\u00a7%d", minecraftserver.getMotd(), minecraftserver.getPlayerCount(), minecraftserver.getMaxPlayers());
 +                    s = String.format("%s\u00a7%d\u00a7%d", event.getMotd(), event.getNumPlayers(), event.getMaxPlayers()); // CraftBukkit
-                     this.a(channelhandlercontext, this.a(s));
+                     this.sendFlushAndClose(channelhandlercontext, this.createReply(s));
                      break;
                  case 1:
 @@ -49,7 +50,7 @@
                      }
  
                      LegacyPingHandler.LOGGER.debug("Ping: (1.4-1.5.x) from {}:{}", inetsocketaddress.getAddress(), inetsocketaddress.getPort());
--                    s = String.format("\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", 127, minecraftserver.getVersion(), minecraftserver.getMotd(), minecraftserver.getPlayerCount(), minecraftserver.getMaxPlayers());
-+                    s = String.format("\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", 127, minecraftserver.getVersion(), event.getMotd(), event.getNumPlayers(), event.getMaxPlayers()); // CraftBukkit
-                     this.a(channelhandlercontext, this.a(s));
+-                    s = String.format("\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", 127, minecraftserver.getServerVersion(), minecraftserver.getMotd(), minecraftserver.getPlayerCount(), minecraftserver.getMaxPlayers());
++                    s = String.format("\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", 127, minecraftserver.getServerVersion(), event.getMotd(), event.getNumPlayers(), event.getMaxPlayers()); // CraftBukkit
+                     this.sendFlushAndClose(channelhandlercontext, this.createReply(s));
                      break;
                  default:
 @@ -68,7 +69,7 @@
                      }
  
                      LegacyPingHandler.LOGGER.debug("Ping: (1.6) from {}:{}", inetsocketaddress.getAddress(), inetsocketaddress.getPort());
--                    String s1 = String.format("\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", 127, minecraftserver.getVersion(), minecraftserver.getMotd(), minecraftserver.getPlayerCount(), minecraftserver.getMaxPlayers());
-+                    String s1 = String.format("\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", 127, minecraftserver.getVersion(), event.getMotd(), event.getNumPlayers(), event.getMaxPlayers()); // CraftBukkit
-                     ByteBuf bytebuf1 = this.a(s1);
+-                    String s1 = String.format("\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", 127, minecraftserver.getServerVersion(), minecraftserver.getMotd(), minecraftserver.getPlayerCount(), minecraftserver.getMaxPlayers());
++                    String s1 = String.format("\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", 127, minecraftserver.getServerVersion(), event.getMotd(), event.getNumPlayers(), event.getMaxPlayers()); // CraftBukkit
+                     ByteBuf bytebuf1 = this.createReply(s1);
  
                      try {

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

@@ -31,9 +31,9 @@
 +    public void disconnect(String s) {
 +        try {
 +            IChatBaseComponent ichatbasecomponent = new ChatComponentText(s);
-+            LoginListener.LOGGER.info("Disconnecting {}: {}", this.d(), s);
-+            this.connection.sendPacket(new PacketLoginOutDisconnect(ichatbasecomponent));
-+            this.connection.close(ichatbasecomponent);
++            LoginListener.LOGGER.info("Disconnecting {}: {}", this.getUserName(), s);
++            this.connection.send(new PacketLoginOutDisconnect(ichatbasecomponent));
++            this.connection.disconnect(ichatbasecomponent);
 +        } catch (Exception exception) {
 +            LoginListener.LOGGER.error("Error whilst disconnecting player", exception);
 +        }
@@ -41,15 +41,15 @@
 +    // CraftBukkit end
 +
      @Override
-     public NetworkManager a() {
+     public NetworkManager getConnection() {
          return this.connection;
 @@ -101,10 +123,12 @@
-             this.gameProfile = this.a(this.gameProfile);
+             this.gameProfile = this.createFakeProfile(this.gameProfile);
          }
  
--        IChatBaseComponent ichatbasecomponent = this.server.getPlayerList().attemptLogin(this.connection.getSocketAddress(), this.gameProfile);
+-        IChatBaseComponent ichatbasecomponent = this.server.getPlayerList().canPlayerLogin(this.connection.getRemoteAddress(), this.gameProfile);
 +        // CraftBukkit start - fire PlayerLoginEvent
-+        EntityPlayer s = this.server.getPlayerList().attemptLogin(this, this.gameProfile, hostname);
++        EntityPlayer s = this.server.getPlayerList().canPlayerLogin(this, this.gameProfile, hostname);
  
 -        if (ichatbasecomponent != null) {
 -            this.disconnect(ichatbasecomponent);
@@ -58,19 +58,19 @@
 +            // CraftBukkit end
          } else {
              this.state = LoginListener.EnumProtocolState.ACCEPTED;
-             if (this.server.av() >= 0 && !this.connection.isLocal()) {
+             if (this.server.getCompressionThreshold() >= 0 && !this.connection.isMemoryConnection()) {
 @@ -117,7 +141,7 @@
              EntityPlayer entityplayer = this.server.getPlayerList().getPlayer(this.gameProfile.getId());
  
              try {
--                EntityPlayer entityplayer1 = this.server.getPlayerList().processLogin(this.gameProfile);
-+                EntityPlayer entityplayer1 = this.server.getPlayerList().processLogin(this.gameProfile, s); // CraftBukkit - add player reference
+-                EntityPlayer entityplayer1 = this.server.getPlayerList().getPlayerForLogin(this.gameProfile);
++                EntityPlayer entityplayer1 = this.server.getPlayerList().getPlayerForLogin(this.gameProfile, s); // CraftBukkit - add player reference
  
                  if (entityplayer != null) {
                      this.state = LoginListener.EnumProtocolState.DELAY_ACCEPT;
-@@ -191,6 +215,43 @@
+@@ -192,6 +216,43 @@
                  try {
-                     LoginListener.this.gameProfile = LoginListener.this.server.getMinecraftSessionService().hasJoinedServer(new GameProfile((UUID) null, gameprofile.getName()), s, this.a());
+                     LoginListener.this.gameProfile = LoginListener.this.server.getSessionService().hasJoinedServer(new GameProfile((UUID) null, gameprofile.getName()), s, this.getAddress());
                      if (LoginListener.this.gameProfile != null) {
 +                        // CraftBukkit start - fire PlayerPreLoginEvent
 +                        if (!connection.isConnected()) {
@@ -78,7 +78,7 @@
 +                        }
 +
 +                        String playerName = gameProfile.getName();
-+                        java.net.InetAddress address = ((java.net.InetSocketAddress) connection.getSocketAddress()).getAddress();
++                        java.net.InetAddress address = ((java.net.InetSocketAddress) connection.getRemoteAddress()).getAddress();
 +                        java.util.UUID uniqueId = gameProfile.getId();
 +                        final org.bukkit.craftbukkit.CraftServer server = LoginListener.this.server.server;
 +
@@ -111,8 +111,8 @@
 +                        // CraftBukkit end
                          LoginListener.LOGGER.info("UUID of player {} is {}", LoginListener.this.gameProfile.getName(), LoginListener.this.gameProfile.getId());
                          LoginListener.this.state = LoginListener.EnumProtocolState.READY_TO_ACCEPT;
-                     } else if (LoginListener.this.server.isEmbeddedServer()) {
-@@ -210,6 +271,11 @@
+                     } else if (LoginListener.this.server.isSingleplayer()) {
+@@ -211,6 +272,11 @@
                          LoginListener.this.disconnect(new ChatMessage("multiplayer.disconnect.authservers_down"));
                          LoginListener.LOGGER.error("Couldn't verify username because servers are unavailable");
                      }

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

@@ -19,11 +19,11 @@
  public class PacketStatusListener implements PacketStatusInListener {
  
      private static final IChatBaseComponent DISCONNECT_REASON = new ChatMessage("multiplayer.status.request_handled");
-@@ -36,8 +48,96 @@
-             this.connection.close(PacketStatusListener.DISCONNECT_REASON);
+@@ -36,7 +48,95 @@
+             this.connection.disconnect(PacketStatusListener.DISCONNECT_REASON);
          } else {
              this.hasRequestedStatus = true;
--            this.connection.sendPacket(new PacketStatusOutServerInfo(this.server.getServerPing()));
+-            this.connection.send(new PacketStatusOutServerInfo(this.server.getStatus()));
 +            // CraftBukkit start
 +            // this.networkManager.sendPacket(new PacketStatusOutServerInfo(this.minecraftServer.getServerPing()));
 +            final Object[] players = server.getPlayerList().players.toArray();
@@ -32,7 +32,7 @@
 +                CraftIconCache icon = server.server.getServerIcon();
 +
 +                ServerListPingEvent() {
-+                    super(((InetSocketAddress) connection.getSocketAddress()).getAddress(), server.getMotd(), server.getPlayerList().getMaxPlayers());
++                    super(((InetSocketAddress) connection.getRemoteAddress()).getAddress(), server.getMotd(), server.getPlayerList().getMaxPlayers());
 +                }
 +
 +                @Override
@@ -97,23 +97,22 @@
 +            java.util.List<GameProfile> profiles = new java.util.ArrayList<GameProfile>(players.length);
 +            for (Object player : players) {
 +                if (player != null) {
-+                    profiles.add(((EntityPlayer) player).getProfile());
++                    profiles.add(((EntityPlayer) player).getGameProfile());
 +                }
 +            }
 +
 +            ServerPing.ServerPingPlayerSample playerSample = new ServerPing.ServerPingPlayerSample(event.getMaxPlayers(), profiles.size());
-+            playerSample.a(profiles.toArray(new GameProfile[profiles.size()]));
++            playerSample.setSample(profiles.toArray(new GameProfile[profiles.size()]));
 +
 +            ServerPing ping = new ServerPing();
 +            ping.setFavicon(event.icon.value);
-+            ping.setMOTD(CraftChatMessage.fromString(event.getMotd(), true)[0]);
-+            ping.setPlayerSample(playerSample);
-+            int version = SharedConstants.getGameVersion().getProtocolVersion();
-+            ping.setServerInfo(new ServerPing.ServerData(server.getServerModName() + " " + server.getVersion(), version));
++            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));
 +
-+            this.connection.sendPacket(new PacketStatusOutServerInfo(ping));
++            this.connection.send(new PacketStatusOutServerInfo(ping));
++            // CraftBukkit end
          }
-+        // CraftBukkit end
      }
  
-     @Override

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

@@ -1,16 +1,16 @@
 --- a/net/minecraft/server/network/ServerConnection.java
 +++ b/net/minecraft/server/network/ServerConnection.java
 @@ -96,14 +96,24 @@
-                     int j = ServerConnection.this.server.l();
+                     int j = ServerConnection.this.server.getRateLimitPacketsPerSecond();
                      Object object = j > 0 ? new NetworkManagerServer(j) : new NetworkManager(EnumProtocolDirection.SERVERBOUND);
  
 -                    ServerConnection.this.connections.add(object);
 +                    ServerConnection.this.connections.add((NetworkManager) object); // CraftBukkit - decompile error
                      channel.pipeline().addLast("packet_handler", (ChannelHandler) object);
-                     ((NetworkManager) object).setPacketListener(new HandshakeListener(ServerConnection.this.server, (NetworkManager) object));
+                     ((NetworkManager) object).setListener(new HandshakeListener(ServerConnection.this.server, (NetworkManager) object));
                  }
--            }).group((EventLoopGroup) lazyinitvar.a()).localAddress(inetaddress, i)).bind().syncUninterruptibly());
-+            }).group((EventLoopGroup) lazyinitvar.a()).localAddress(inetaddress, i)).option(ChannelOption.AUTO_READ, false).bind().syncUninterruptibly()); // CraftBukkit
+-            }).group((EventLoopGroup) lazyinitvar.get()).localAddress(inetaddress, i)).bind().syncUninterruptibly());
++            }).group((EventLoopGroup) lazyinitvar.get()).localAddress(inetaddress, i)).option(ChannelOption.AUTO_READ, false).bind().syncUninterruptibly()); // CraftBukkit
          }
      }
  
@@ -24,6 +24,6 @@
 +    }
 +    // CraftBukkit end
 +
-     public SocketAddress a() {
+     public SocketAddress startMemoryChannel() {
          List list = this.channels;
          ChannelFuture channelfuture;

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

@@ -1,15 +1,15 @@
 --- a/net/minecraft/server/players/ExpirableListEntry.java
 +++ b/net/minecraft/server/players/ExpirableListEntry.java
-@@ -25,7 +25,7 @@
+@@ -26,7 +26,7 @@
      }
  
      protected ExpirableListEntry(T t0, JsonObject jsonobject) {
 -        super(t0);
-+        super(checkExpiry(t0, jsonobject));
++        super(checkExpiry(t0, jsonobject)); // CraftBukkit
  
          Date date;
  
-@@ -80,4 +80,22 @@
+@@ -82,4 +82,22 @@
          jsonobject.addProperty("expires", this.expires == null ? "forever" : ExpirableListEntry.DATE_FORMAT.format(this.expires));
          jsonobject.addProperty("reason", this.reason);
      }

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

@@ -3,9 +3,9 @@
 @@ -54,7 +54,7 @@
      @Nullable
      public V get(K k0) {
-         this.g();
--        return (JsonListEntry) this.map.get(this.a(k0));
-+        return (V) this.map.get(this.a(k0)); // CraftBukkit - fix decompile error
+         this.removeExpired();
+-        return (JsonListEntry) this.map.get(this.getKeyForUser(k0));
++        return (V) this.map.get(this.getKeyForUser(k0)); // CraftBukkit - fix decompile error
      }
  
      public void remove(K k0) {
@@ -30,7 +30,7 @@
 +            V v0 = (V) iterator.next(); // CraftBukkit - decompile error
  
              if (v0.hasExpired()) {
-                 list.add(v0.getKey());
+                 list.add(v0.getUser());
 @@ -103,7 +109,7 @@
          iterator = list.iterator();
  
@@ -38,9 +38,9 @@
 -            K k0 = iterator.next();
 +            K k0 = (K) iterator.next(); // CraftBukkit - decompile error
  
-             this.map.remove(this.a(k0));
+             this.map.remove(this.getKeyForUser(k0));
          }
-@@ -118,11 +124,11 @@
+@@ -118,7 +124,7 @@
  
      public void save() throws IOException {
          JsonArray jsonarray = new JsonArray();
@@ -49,17 +49,12 @@
              JsonObject jsonobject = new JsonObject();
  
              Objects.requireNonNull(jsonlistentry);
--            return (JsonObject) SystemUtils.a((Object) jsonobject, jsonlistentry::a);
-+            return (JsonObject) SystemUtils.a(jsonobject, jsonlistentry::a); // CraftBukkit - decompile error
-         });
- 
-         Objects.requireNonNull(jsonarray);
 @@ -165,7 +171,7 @@
-                     JsonListEntry<K> jsonlistentry = this.a(jsonobject);
+                     JsonListEntry<K> jsonlistentry = this.createEntry(jsonobject);
  
-                     if (jsonlistentry.getKey() != null) {
--                        this.map.put(this.a(jsonlistentry.getKey()), jsonlistentry);
-+                        this.map.put(this.a(jsonlistentry.getKey()), (V) jsonlistentry); // CraftBukkit - fix decompile error
+                     if (jsonlistentry.getUser() != null) {
+-                        this.map.put(this.getKeyForUser(jsonlistentry.getUser()), jsonlistentry);
++                        this.map.put(this.getKeyForUser(jsonlistentry.getUser()), (V) jsonlistentry); // CraftBukkit - decompile error
                      }
                  }
              } catch (Throwable throwable) {

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

@@ -16,8 +16,8 @@
                  try {
                      gameprofilebanlist.load();
                  } catch (IOException ioexception) {
--                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", gameprofilebanlist.b().getName(), ioexception);
-+                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", gameprofilebanlist.b().getName()); // CraftBukkit - don't print stacktrace
+-                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", gameprofilebanlist.getFile().getName(), ioexception);
++                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", gameprofilebanlist.getFile().getName()); // CraftBukkit - don't print stacktrace
                  }
              }
  
@@ -25,8 +25,8 @@
                  try {
                      ipbanlist.load();
                  } catch (IOException ioexception) {
--                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", ipbanlist.b().getName(), ioexception);
-+                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", ipbanlist.b().getName()); // CraftBukkit - don't print stacktrace
+-                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", ipbanlist.getFile().getName(), ioexception);
++                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", ipbanlist.getFile().getName()); // CraftBukkit - don't print stacktrace
                  }
              }
  
@@ -34,8 +34,8 @@
                  try {
                      oplist.load();
                  } catch (IOException ioexception) {
--                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", oplist.b().getName(), ioexception);
-+                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", oplist.b().getName()); // CraftBukkit - don't print stacktrace
+-                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", oplist.getFile().getName(), ioexception);
++                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", oplist.getFile().getName()); // CraftBukkit - don't print stacktrace
                  }
              }
  
@@ -43,8 +43,8 @@
                  try {
                      whitelist.load();
                  } catch (IOException ioexception) {
--                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", whitelist.b().getName(), ioexception);
-+                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", whitelist.b().getName()); // CraftBukkit - don't print stacktrace
+-                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", whitelist.getFile().getName(), ioexception);
++                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", whitelist.getFile().getName()); // CraftBukkit - don't print stacktrace
                  }
              }
  
@@ -56,26 +56,26 @@
 +                        NBTTagCompound root = null;
 +
 +                        try {
-+                            root = NBTCompressedStreamTools.a(new java.io.FileInputStream(file5));
++                            root = NBTCompressedStreamTools.readCompressed(new java.io.FileInputStream(file5));
 +                        } catch (Exception exception) {
 +                            exception.printStackTrace();
 +                        }
 +
 +                        if (root != null) {
-+                            if (!root.hasKey("bukkit")) {
-+                                root.set("bukkit", new NBTTagCompound());
++                            if (!root.contains("bukkit")) {
++                                root.put("bukkit", new NBTTagCompound());
 +                            }
 +                            NBTTagCompound data = root.getCompound("bukkit");
-+                            data.setString("lastKnownName", s2);
++                            data.putString("lastKnownName", s2);
 +
 +                            try {
-+                                NBTCompressedStreamTools.a(root, new java.io.FileOutputStream(file2));
++                                NBTCompressedStreamTools.writeCompressed(root, new java.io.FileOutputStream(file2));
 +                            } catch (Exception exception) {
 +                                exception.printStackTrace();
 +                            }
 +                       }
 +                        // CraftBukkit end
 +
-                         NameReferencingFileConverter.a(file4);
+                         NameReferencingFileConverter.ensureDirectoryExists(file4);
                          if (!file5.renameTo(file6)) {
                              throw new NameReferencingFileConverter.FileConversionException("Could not convert file for " + s2);

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

@@ -47,7 +47,7 @@
      public final WorldNBTStorage playerIo;
      private boolean doWhiteList;
      private final IRegistryCustom.Dimension registryHolder;
-@@ -122,13 +144,23 @@
+@@ -123,13 +145,23 @@
      private static final boolean ALLOW_LOGOUTIVATOR = false;
      private int sendAllPlayerInfoIn;
  
@@ -73,51 +73,51 @@
          this.server = minecraftserver;
          this.registryHolder = iregistrycustom_dimension;
          this.maxPlayers = i;
-@@ -144,6 +176,12 @@
-         usercache.a(gameprofile);
-         NBTTagCompound nbttagcompound = this.a(entityplayer);
+@@ -145,6 +177,12 @@
+         usercache.add(gameprofile);
+         NBTTagCompound nbttagcompound = this.load(entityplayer);
          ResourceKey resourcekey;
 +        // CraftBukkit start - Better rename detection
-+        if (nbttagcompound != null && nbttagcompound.hasKey("bukkit")) {
++        if (nbttagcompound != null && nbttagcompound.contains("bukkit")) {
 +            NBTTagCompound bukkit = nbttagcompound.getCompound("bukkit");
-+            s = bukkit.hasKeyOfType("lastKnownName", 8) ? bukkit.getString("lastKnownName") : s;
++            s = bukkit.contains("lastKnownName", 8) ? bukkit.getString("lastKnownName") : s;
 +        }
 +        // CraftBukkit end
  
          if (nbttagcompound != null) {
-             DataResult dataresult = DimensionManager.a(new Dynamic(DynamicOpsNBT.INSTANCE, nbttagcompound.get("Dimension")));
-@@ -173,7 +211,8 @@
-             s1 = networkmanager.getSocketAddress().toString();
+             DataResult dataresult = DimensionManager.parseLegacy(new Dynamic(DynamicOpsNBT.INSTANCE, nbttagcompound.get("Dimension")));
+@@ -174,7 +212,8 @@
+             s1 = networkmanager.getRemoteAddress().toString();
          }
  
--        PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ({}, {}, {})", entityplayer.getDisplayName().getString(), s1, entityplayer.getId(), entityplayer.locX(), entityplayer.locY(), entityplayer.locZ());
+-        PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ({}, {}, {})", entityplayer.getName().getString(), s1, entityplayer.getId(), entityplayer.getX(), entityplayer.getY(), entityplayer.getZ());
 +        // CraftBukkit - Moved message to after join
-+        // PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ({}, {}, {})", entityplayer.getDisplayName().getString(), s1, entityplayer.getId(), entityplayer.locX(), entityplayer.locY(), entityplayer.locZ());
-         WorldData worlddata = worldserver1.getWorldData();
++        // PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ({}, {}, {})", entityplayer.getName().getString(), s1, entityplayer.getId(), entityplayer.getX(), entityplayer.getY(), entityplayer.getZ());
+         WorldData worlddata = worldserver1.getLevelData();
  
-         entityplayer.c(nbttagcompound);
-@@ -183,6 +222,7 @@
+         entityplayer.loadGameTypes(nbttagcompound);
+@@ -184,6 +223,7 @@
          boolean flag1 = gamerules.getBoolean(GameRules.RULE_REDUCEDDEBUGINFO);
  
-         playerconnection.sendPacket(new PacketPlayOutLogin(entityplayer.getId(), entityplayer.gameMode.getGameMode(), entityplayer.gameMode.c(), BiomeManager.a(worldserver1.getSeed()), worlddata.isHardcore(), this.server.F(), this.registryHolder, worldserver1.getDimensionManager(), worldserver1.getDimensionKey(), this.getMaxPlayers(), this.viewDistance, flag1, !flag, worldserver1.isDebugWorld(), worldserver1.isFlatWorld()));
+         playerconnection.send(new PacketPlayOutLogin(entityplayer.getId(), worlddata.isHardcore(), entityplayer.gameMode.getGameModeForPlayer(), entityplayer.gameMode.getPreviousGameModeForPlayer(), this.server.levelKeys(), this.registryHolder, worldserver1.dimensionType(), worldserver1.dimension(), BiomeManager.obfuscateSeed(worldserver1.getSeed()), this.getMaxPlayers(), this.viewDistance, this.simulationDistance, flag1, !flag, worldserver1.isDebug(), worldserver1.isFlat()));
 +        entityplayer.getBukkitEntity().sendSupportedChannels(); // CraftBukkit
-         playerconnection.sendPacket(new PacketPlayOutCustomPayload(PacketPlayOutCustomPayload.BRAND, (new PacketDataSerializer(Unpooled.buffer())).a(this.getServer().getServerModName())));
-         playerconnection.sendPacket(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
-         playerconnection.sendPacket(new PacketPlayOutAbilities(entityplayer.getAbilities()));
-@@ -201,19 +241,66 @@
+         playerconnection.send(new PacketPlayOutCustomPayload(PacketPlayOutCustomPayload.BRAND, (new PacketDataSerializer(Unpooled.buffer())).writeUtf(this.getServer().getServerModName())));
+         playerconnection.send(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
+         playerconnection.send(new PacketPlayOutAbilities(entityplayer.getAbilities()));
+@@ -202,19 +242,66 @@
          } else {
-             chatmessage = new ChatMessage("multiplayer.player.joined.renamed", new Object[]{entityplayer.getScoreboardDisplayName(), s});
+             chatmessage = new ChatMessage("multiplayer.player.joined.renamed", new Object[]{entityplayer.getDisplayName(), s});
          }
 +        // CraftBukkit start
-+        chatmessage.a(EnumChatFormat.YELLOW);
++        chatmessage.withStyle(EnumChatFormat.YELLOW);
 +        String joinMessage = CraftChatMessage.fromComponent(chatmessage);
  
--        this.sendMessage(chatmessage.a(EnumChatFormat.YELLOW), ChatMessageType.SYSTEM, SystemUtils.NIL_UUID);
-         playerconnection.b(entityplayer.locX(), entityplayer.locY(), entityplayer.locZ(), entityplayer.getYRot(), entityplayer.getXRot());
+-        this.broadcastMessage(chatmessage.withStyle(EnumChatFormat.YELLOW), ChatMessageType.SYSTEM, SystemUtils.NIL_UUID);
+         playerconnection.teleport(entityplayer.getX(), entityplayer.getY(), entityplayer.getZ(), entityplayer.getYRot(), entityplayer.getXRot());
          this.players.add(entityplayer);
-         this.playersByUUID.put(entityplayer.getUniqueID(), entityplayer);
--        this.sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[]{entityplayer}));
-+        // this.sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[]{entityplayer})); // CraftBukkit - replaced with loop below
+         this.playersByUUID.put(entityplayer.getUUID(), entityplayer);
+-        this.broadcastAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[]{entityplayer}));
++        // this.broadcastAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[]{entityplayer})); // CraftBukkit - replaced with loop below
 +
 +        // CraftBukkit start
 +        CraftPlayer bukkitPlayer = entityplayer.getBukkitEntity();
@@ -136,7 +136,7 @@
 +
 +        if (joinMessage != null && joinMessage.length() > 0) {
 +            for (IChatBaseComponent line : org.bukkit.craftbukkit.util.CraftChatMessage.fromString(joinMessage)) {
-+                server.getPlayerList().sendAll(new PacketPlayOutChat(line, ChatMessageType.SYSTEM, SystemUtils.NIL_UUID));
++                server.getPlayerList().broadcastAll(new PacketPlayOutChat(line, ChatMessageType.SYSTEM, SystemUtils.NIL_UUID));
 +            }
 +        }
 +        // CraftBukkit end
@@ -145,142 +145,142 @@
 +        PacketPlayOutPlayerInfo packet = new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, entityplayer);
  
          for (int i = 0; i < this.players.size(); ++i) {
--            entityplayer.connection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[]{(EntityPlayer) this.players.get(i)}));
+-            entityplayer.connection.send(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[]{(EntityPlayer) this.players.get(i)}));
 +            EntityPlayer entityplayer1 = (EntityPlayer) this.players.get(i);
 +
 +            if (entityplayer1.getBukkitEntity().canSee(bukkitPlayer)) {
-+                entityplayer1.connection.sendPacket(packet);
++                entityplayer1.connection.send(packet);
 +            }
 +
 +            if (!bukkitPlayer.canSee(entityplayer1.getBukkitEntity())) {
 +                continue;
 +            }
 +
-+            entityplayer.connection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[] { entityplayer1}));
++            entityplayer.connection.send(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[]{entityplayer1}));
          }
 +        entityplayer.sentListPacket = true;
 +        // CraftBukkit end
  
--        worldserver1.addPlayerJoin(entityplayer);
--        this.server.getBossBattleCustomData().a(entityplayer);
-+        entityplayer.connection.sendPacket(new PacketPlayOutEntityMetadata(entityplayer.getId(), entityplayer.getDataWatcher(), true)); // CraftBukkit - BungeeCord#2321, send complete data to self on spawn
+-        worldserver1.addNewPlayer(entityplayer);
+-        this.server.getCustomBossEvents().onPlayerConnect(entityplayer);
++        entityplayer.connection.send(new PacketPlayOutEntityMetadata(entityplayer.getId(), entityplayer.getEntityData(), true)); // CraftBukkit - BungeeCord#2321, send complete data to self on spawn
 +
 +        // CraftBukkit start - Only add if the player wasn't moved in the event
-+        if (entityplayer.level == worldserver1 && !worldserver1.getPlayers().contains(entityplayer)) {
-+            worldserver1.addPlayerJoin(entityplayer);
-+            this.server.getBossBattleCustomData().a(entityplayer);
++        if (entityplayer.level == worldserver1 && !worldserver1.players().contains(entityplayer)) {
++            worldserver1.addNewPlayer(entityplayer);
++            this.server.getCustomBossEvents().onPlayerConnect(entityplayer);
 +        }
 +
-+        worldserver1 = entityplayer.getWorldServer();  // CraftBukkit - Update in case join event changed it
++        worldserver1 = entityplayer.getLevel(); // CraftBukkit - Update in case join event changed it
 +        // CraftBukkit end
-         this.a(entityplayer, worldserver1);
+         this.sendLevelInfo(entityplayer, worldserver1);
          if (!this.server.getResourcePack().isEmpty()) {
-             entityplayer.setResourcePack(this.server.getResourcePack(), this.server.getResourcePackHash(), this.server.aX(), this.server.ba());
-@@ -229,8 +316,11 @@
+             entityplayer.sendTexturePack(this.server.getResourcePack(), this.server.getResourcePackHash(), this.server.isResourcePackRequired(), this.server.getResourcePackPrompt());
+@@ -230,8 +317,11 @@
  
-         if (nbttagcompound != null && nbttagcompound.hasKeyOfType("RootVehicle", 10)) {
+         if (nbttagcompound != null && nbttagcompound.contains("RootVehicle", 10)) {
              NBTTagCompound nbttagcompound1 = nbttagcompound.getCompound("RootVehicle");
--            Entity entity = EntityTypes.a(nbttagcompound1.getCompound("Entity"), worldserver1, (entity1) -> {
--                return !worldserver1.addEntitySerialized(entity1) ? null : entity1;
+-            Entity entity = EntityTypes.loadEntityRecursive(nbttagcompound1.getCompound("Entity"), worldserver1, (entity1) -> {
+-                return !worldserver1.addWithUUID(entity1) ? null : entity1;
 +            // CraftBukkit start
 +            WorldServer finalWorldServer = worldserver1;
-+            Entity entity = EntityTypes.a(nbttagcompound1.getCompound("Entity"), finalWorldServer, (entity1) -> {
-+                return !finalWorldServer.addEntitySerialized(entity1) ? null : entity1;
++            Entity entity = EntityTypes.loadEntityRecursive(nbttagcompound1.getCompound("Entity"), finalWorldServer, (entity1) -> {
++                return !finalWorldServer.addWithUUID(entity1) ? null : entity1;
 +                // CraftBukkit end
              });
  
              if (entity != null) {
-@@ -273,6 +363,8 @@
+@@ -274,6 +364,8 @@
          }
  
-         entityplayer.syncInventory();
+         entityplayer.initInventoryMenu();
 +        // CraftBukkit - Moved from above, added world
-+        PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", entityplayer.getDisplayName().getString(), s1, entityplayer.getId(), worldserver1.serverLevelData.getName(), entityplayer.locX(), entityplayer.locY(), entityplayer.locZ());
++        PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", entityplayer.getName().getString(), s1, entityplayer.getId(), worldserver1.serverLevelData.getLevelName(), entityplayer.getX(), entityplayer.getY(), entityplayer.getZ());
      }
  
-     public void sendScoreboard(ScoreboardServer scoreboardserver, EntityPlayer entityplayer) {
-@@ -305,30 +397,31 @@
+     public void updateEntireScoreboard(ScoreboardServer scoreboardserver, EntityPlayer entityplayer) {
+@@ -306,30 +398,31 @@
      }
  
-     public void setPlayerFileData(WorldServer worldserver) {
+     public void addWorldborderListener(WorldServer worldserver) {
 +        if (playerIo != null) return; // CraftBukkit
-         worldserver.getWorldBorder().a(new IWorldBorderListener() {
+         worldserver.getWorldBorder().addListener(new IWorldBorderListener() {
              @Override
-             public void a(WorldBorder worldborder, double d0) {
--                PlayerList.this.sendAll(new ClientboundSetBorderSizePacket(worldborder));
-+                PlayerList.this.sendAll(new ClientboundSetBorderSizePacket(worldborder), worldborder.world); // CraftBukkit
+             public void onBorderSizeSet(WorldBorder worldborder, double d0) {
+-                PlayerList.this.broadcastAll(new ClientboundSetBorderSizePacket(worldborder));
++                PlayerList.this.broadcastAll(new ClientboundSetBorderSizePacket(worldborder), worldborder.world); // CraftBukkit
              }
  
              @Override
-             public void a(WorldBorder worldborder, double d0, double d1, long i) {
--                PlayerList.this.sendAll(new ClientboundSetBorderLerpSizePacket(worldborder));
-+                PlayerList.this.sendAll(new ClientboundSetBorderLerpSizePacket(worldborder), worldborder.world); // CraftBukkit
+             public void onBorderSizeLerping(WorldBorder worldborder, double d0, double d1, long i) {
+-                PlayerList.this.broadcastAll(new ClientboundSetBorderLerpSizePacket(worldborder));
++                PlayerList.this.broadcastAll(new ClientboundSetBorderLerpSizePacket(worldborder), worldborder.world); // CraftBukkit
              }
  
              @Override
-             public void a(WorldBorder worldborder, double d0, double d1) {
--                PlayerList.this.sendAll(new ClientboundSetBorderCenterPacket(worldborder));
-+                PlayerList.this.sendAll(new ClientboundSetBorderCenterPacket(worldborder), worldborder.world); // CraftBukkit
+             public void onBorderCenterSet(WorldBorder worldborder, double d0, double d1) {
+-                PlayerList.this.broadcastAll(new ClientboundSetBorderCenterPacket(worldborder));
++                PlayerList.this.broadcastAll(new ClientboundSetBorderCenterPacket(worldborder), worldborder.world); // CraftBukkit
              }
  
              @Override
-             public void a(WorldBorder worldborder, int i) {
--                PlayerList.this.sendAll(new ClientboundSetBorderWarningDelayPacket(worldborder));
-+                PlayerList.this.sendAll(new ClientboundSetBorderWarningDelayPacket(worldborder), worldborder.world); // CraftBukkit
+             public void onBorderSetWarningTime(WorldBorder worldborder, int i) {
+-                PlayerList.this.broadcastAll(new ClientboundSetBorderWarningDelayPacket(worldborder));
++                PlayerList.this.broadcastAll(new ClientboundSetBorderWarningDelayPacket(worldborder), worldborder.world); // CraftBukkit
              }
  
              @Override
-             public void b(WorldBorder worldborder, int i) {
--                PlayerList.this.sendAll(new ClientboundSetBorderWarningDistancePacket(worldborder));
-+                PlayerList.this.sendAll(new ClientboundSetBorderWarningDistancePacket(worldborder), worldborder.world); // CraftBukkit
+             public void onBorderSetWarningBlocks(WorldBorder worldborder, int i) {
+-                PlayerList.this.broadcastAll(new ClientboundSetBorderWarningDistancePacket(worldborder));
++                PlayerList.this.broadcastAll(new ClientboundSetBorderWarningDistancePacket(worldborder), worldborder.world); // CraftBukkit
              }
  
              @Override
-@@ -356,14 +449,15 @@
+@@ -357,14 +450,15 @@
      }
  
-     protected void savePlayerFile(EntityPlayer entityplayer) {
+     protected void save(EntityPlayer entityplayer) {
 +        if (!entityplayer.getBukkitEntity().isPersistent()) return; // CraftBukkit
          this.playerIo.save(entityplayer);
--        ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) this.stats.get(entityplayer.getUniqueID());
-+        ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) entityplayer.getStatisticManager(); // CraftBukkit
+-        ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) this.stats.get(entityplayer.getUUID());
++        ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) entityplayer.getStats(); // CraftBukkit
  
          if (serverstatisticmanager != null) {
              serverstatisticmanager.save();
          }
  
--        AdvancementDataPlayer advancementdataplayer = (AdvancementDataPlayer) this.advancements.get(entityplayer.getUniqueID());
-+        AdvancementDataPlayer advancementdataplayer = (AdvancementDataPlayer) entityplayer.getAdvancementData(); // CraftBukkit
+-        AdvancementDataPlayer advancementdataplayer = (AdvancementDataPlayer) this.advancements.get(entityplayer.getUUID());
++        AdvancementDataPlayer advancementdataplayer = (AdvancementDataPlayer) entityplayer.getAdvancements(); // CraftBukkit
  
          if (advancementdataplayer != null) {
-             advancementdataplayer.b();
-@@ -371,10 +465,24 @@
+             advancementdataplayer.save();
+@@ -372,10 +466,24 @@
  
      }
  
--    public void disconnect(EntityPlayer entityplayer) {
-+    public String disconnect(EntityPlayer entityplayer) { // CraftBukkit - return string
-         WorldServer worldserver = entityplayer.getWorldServer();
+-    public void remove(EntityPlayer entityplayer) {
++    public String remove(EntityPlayer entityplayer) { // CraftBukkit - return string
+         WorldServer worldserver = entityplayer.getLevel();
  
-         entityplayer.a(StatisticList.LEAVE_GAME);
+         entityplayer.awardStat(StatisticList.LEAVE_GAME);
 +
 +        // CraftBukkit start - Quitting must be before we do final save of data, in case plugins need to modify it
 +        // See SPIGOT-5799, SPIGOT-6145
 +        if (entityplayer.containerMenu != entityplayer.inventoryMenu) {
-+            entityplayer.closeInventory();
++            entityplayer.closeContainer();
 +        }
 +
-+        PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), "\u00A7e" + entityplayer.getName() + " left the game");
++        PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), "\u00A7e" + entityplayer.getScoreboardName() + " left the game");
 +        cserver.getPluginManager().callEvent(playerQuitEvent);
 +        entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());
 +
-+        entityplayer.playerTick(); // SPIGOT-924
++        entityplayer.doTick(); // SPIGOT-924
 +        // CraftBukkit end
 +
-         this.savePlayerFile(entityplayer);
+         this.save(entityplayer);
          if (entityplayer.isPassenger()) {
              Entity entity = entityplayer.getRootVehicle();
-@@ -398,18 +506,66 @@
+@@ -399,18 +507,66 @@
  
          if (entityplayer1 == entityplayer) {
              this.playersByUUID.remove(uuid);
@@ -293,13 +293,13 @@
 +        }
 +
 +        // CraftBukkit start
-+        // this.sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, new EntityPlayer[]{entityplayer}));
++        // this.broadcastAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, new EntityPlayer[]{entityplayer}));
 +        PacketPlayOutPlayerInfo packet = new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, entityplayer);
 +        for (int i = 0; i < players.size(); i++) {
 +            EntityPlayer entityplayer2 = (EntityPlayer) this.players.get(i);
 +
 +            if (entityplayer2.getBukkitEntity().canSee(entityplayer.getBukkitEntity())) {
-+                entityplayer2.connection.sendPacket(packet);
++                entityplayer2.connection.send(packet);
 +            } else {
 +                entityplayer2.getBukkitEntity().removeDisconnectingPlayer(entityplayer.getBukkitEntity());
 +            }
@@ -308,26 +308,26 @@
 +        cserver.getScoreboardManager().removePlayer(entityplayer.getBukkitEntity());
 +        // CraftBukkit end
  
--        this.sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, new EntityPlayer[]{entityplayer}));
+-        this.broadcastAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, new EntityPlayer[]{entityplayer}));
 +        return playerQuitEvent.getQuitMessage(); // CraftBukkit
      }
  
 -    @Nullable
--    public IChatBaseComponent attemptLogin(SocketAddress socketaddress, GameProfile gameprofile) {
+-    public IChatBaseComponent canPlayerLogin(SocketAddress socketaddress, GameProfile gameprofile) {
 +    // CraftBukkit start - Whole method, SocketAddress to LoginListener, added hostname to signature, return EntityPlayer
-+    public EntityPlayer attemptLogin(LoginListener loginlistener, GameProfile gameprofile, String hostname) {
++    public EntityPlayer canPlayerLogin(LoginListener loginlistener, GameProfile gameprofile, String hostname) {
          ChatMessage chatmessage;
  
 -        if (this.bans.isBanned(gameprofile)) {
 +        // Moved from processLogin
-+        UUID uuid = EntityHuman.a(gameprofile);
++        UUID uuid = EntityHuman.createPlayerUUID(gameprofile);
 +        List<EntityPlayer> list = Lists.newArrayList();
 +
 +        EntityPlayer entityplayer;
 +
 +        for (int i = 0; i < this.players.size(); ++i) {
 +            entityplayer = (EntityPlayer) this.players.get(i);
-+            if (entityplayer.getUniqueID().equals(uuid)) {
++            if (entityplayer.getUUID().equals(uuid)) {
 +                list.add(entityplayer);
 +            }
 +        }
@@ -336,50 +336,50 @@
 +
 +        while (iterator.hasNext()) {
 +            entityplayer = (EntityPlayer) iterator.next();
-+            savePlayerFile(entityplayer); // CraftBukkit - Force the player's inventory to be saved
++            save(entityplayer); // CraftBukkit - Force the player's inventory to be saved
 +            entityplayer.connection.disconnect(new ChatMessage("multiplayer.disconnect.duplicate_login", new Object[0]));
 +        }
 +
 +        // Instead of kicking then returning, we need to store the kick reason
 +        // in the event, check with plugins to see if it's ok, and THEN kick
 +        // depending on the outcome.
-+        SocketAddress socketaddress = loginlistener.connection.getSocketAddress();
++        SocketAddress socketaddress = loginlistener.connection.getRemoteAddress();
 +
-+        EntityPlayer entity = new EntityPlayer(this.server, this.server.getWorldServer(World.OVERWORLD), gameprofile);
++        EntityPlayer entity = new EntityPlayer(this.server, this.server.getLevel(World.OVERWORLD), gameprofile);
 +        Player player = entity.getBukkitEntity();
 +        PlayerLoginEvent event = new PlayerLoginEvent(player, hostname, ((java.net.InetSocketAddress) socketaddress).getAddress());
 +
-+        if (getProfileBans().isBanned(gameprofile) && !getProfileBans().get(gameprofile).hasExpired()) {
++        if (getBans().isBanned(gameprofile) && !getBans().get(gameprofile).hasExpired()) {
              GameProfileBanEntry gameprofilebanentry = (GameProfileBanEntry) this.bans.get(gameprofile);
  
              chatmessage = new ChatMessage("multiplayer.disconnect.banned.reason", new Object[]{gameprofilebanentry.getReason()});
-@@ -417,10 +573,12 @@
-                 chatmessage.addSibling(new ChatMessage("multiplayer.disconnect.banned.expiration", new Object[]{PlayerList.BAN_DATE_FORMAT.format(gameprofilebanentry.getExpires())}));
+@@ -418,10 +574,12 @@
+                 chatmessage.append((IChatBaseComponent) (new ChatMessage("multiplayer.disconnect.banned.expiration", new Object[]{PlayerList.BAN_DATE_FORMAT.format(gameprofilebanentry.getExpires())})));
              }
  
 -            return chatmessage;
 +            // return chatmessage;
 +            event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(chatmessage));
-         } else if (!this.isWhitelisted(gameprofile)) {
+         } else if (!this.isWhiteListed(gameprofile)) {
 -            return new ChatMessage("multiplayer.disconnect.not_whitelisted");
 -        } else if (this.ipBans.isBanned(socketaddress)) {
 +            chatmessage = new ChatMessage("multiplayer.disconnect.not_whitelisted");
 +            event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, CraftChatMessage.fromComponent(chatmessage));
-+        } else if (getIPBans().isBanned(socketaddress) && !getIPBans().get(socketaddress).hasExpired()) {
++        } else if (getIpBans().isBanned(socketaddress) && !getIpBans().get(socketaddress).hasExpired()) {
              IpBanEntry ipbanentry = this.ipBans.get(socketaddress);
  
              chatmessage = new ChatMessage("multiplayer.disconnect.banned_ip.reason", new Object[]{ipbanentry.getReason()});
-@@ -428,13 +586,25 @@
-                 chatmessage.addSibling(new ChatMessage("multiplayer.disconnect.banned_ip.expiration", new Object[]{PlayerList.BAN_DATE_FORMAT.format(ipbanentry.getExpires())}));
+@@ -429,13 +587,25 @@
+                 chatmessage.append((IChatBaseComponent) (new ChatMessage("multiplayer.disconnect.banned_ip.expiration", new Object[]{PlayerList.BAN_DATE_FORMAT.format(ipbanentry.getExpires())})));
              }
  
 -            return chatmessage;
 +            // return chatmessage;
 +            event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(chatmessage));
          } else {
--            return this.players.size() >= this.maxPlayers && !this.d(gameprofile) ? new ChatMessage("multiplayer.disconnect.server_full") : null;
-+            // return this.players.size() >= this.maxPlayers && !this.d(gameprofile) ? new ChatMessage("multiplayer.disconnect.server_full") : null;
-+            if (this.players.size() >= this.maxPlayers && !this.d(gameprofile)) {
+-            return this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameprofile) ? new ChatMessage("multiplayer.disconnect.server_full") : null;
++            // return this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameprofile) ? new ChatMessage("multiplayer.disconnect.server_full") : null;
++            if (this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameprofile)) {
 +                event.disallow(PlayerLoginEvent.Result.KICK_FULL, "The server is full");
 +            }
          }
@@ -392,41 +392,41 @@
 +        return entity;
      }
  
--    public EntityPlayer processLogin(GameProfile gameprofile) {
-+    public EntityPlayer processLogin(GameProfile gameprofile, EntityPlayer player) { // CraftBukkit - added EntityPlayer
+-    public EntityPlayer getPlayerForLogin(GameProfile gameprofile) {
++    public EntityPlayer getPlayerForLogin(GameProfile gameprofile, EntityPlayer player) { // CraftBukkit - added EntityPlayer
 +        /* CraftBukkit startMoved up
-         UUID uuid = EntityHuman.a(gameprofile);
+         UUID uuid = EntityHuman.createPlayerUUID(gameprofile);
          List<EntityPlayer> list = Lists.newArrayList();
  
-@@ -461,14 +631,24 @@
+@@ -462,14 +632,24 @@
          }
  
-         return new EntityPlayer(this.server, this.server.E(), gameprofile);
+         return new EntityPlayer(this.server, this.server.overworld(), gameprofile);
 +        */
 +        return player;
 +        // CraftBukkit end
      }
  
 +    // CraftBukkit start
-     public EntityPlayer moveToWorld(EntityPlayer entityplayer, boolean flag) {
-+        return this.moveToWorld(entityplayer, this.server.getWorldServer(entityplayer.getSpawnDimension()), flag, null, true);
+     public EntityPlayer respawn(EntityPlayer entityplayer, boolean flag) {
++        return this.respawn(entityplayer, this.server.getLevel(entityplayer.getRespawnDimension()), flag, null, true);
 +    }
 +
-+    public EntityPlayer moveToWorld(EntityPlayer entityplayer, WorldServer worldserver, boolean flag, Location location, boolean avoidSuffocation) {
++    public EntityPlayer respawn(EntityPlayer entityplayer, WorldServer worldserver, boolean flag, Location location, boolean avoidSuffocation) {
 +        entityplayer.stopRiding(); // CraftBukkit
          this.players.remove(entityplayer);
-         entityplayer.getWorldServer().a(entityplayer, Entity.RemovalReason.DISCARDED);
-         BlockPosition blockposition = entityplayer.getSpawn();
-         float f = entityplayer.getSpawnAngle();
-         boolean flag1 = entityplayer.isSpawnForced();
+         entityplayer.getLevel().removePlayerImmediately(entityplayer, Entity.RemovalReason.DISCARDED);
+         BlockPosition blockposition = entityplayer.getRespawnPosition();
+         float f = entityplayer.getRespawnAngle();
+         boolean flag1 = entityplayer.isRespawnForced();
 +        /* CraftBukkit start
-         WorldServer worldserver = this.server.getWorldServer(entityplayer.getSpawnDimension());
+         WorldServer worldserver = this.server.getLevel(entityplayer.getRespawnDimension());
          Optional optional;
  
-@@ -480,6 +660,11 @@
+@@ -481,6 +661,11 @@
  
-         WorldServer worldserver1 = worldserver != null && optional.isPresent() ? worldserver : this.server.E();
-         EntityPlayer entityplayer1 = new EntityPlayer(this.server, worldserver1, entityplayer.getProfile());
+         WorldServer worldserver1 = worldserver != null && optional.isPresent() ? worldserver : this.server.overworld();
+         EntityPlayer entityplayer1 = new EntityPlayer(this.server, worldserver1, entityplayer.getGameProfile());
 +        // */
 +        EntityPlayer entityplayer1 = entityplayer;
 +        org.bukkit.World fromWorld = entityplayer.getBukkitEntity().getWorld();
@@ -434,69 +434,69 @@
 +        // CraftBukkit end
  
          entityplayer1.connection = entityplayer.connection;
-         entityplayer1.copyFrom(entityplayer, flag);
-@@ -495,49 +680,111 @@
+         entityplayer1.restoreFrom(entityplayer, flag);
+@@ -496,49 +681,110 @@
  
          boolean flag2 = false;
  
 -        if (optional.isPresent()) {
--            IBlockData iblockdata = worldserver1.getType(blockposition);
--            boolean flag3 = iblockdata.a(Blocks.RESPAWN_ANCHOR);
+-            IBlockData iblockdata = worldserver1.getBlockState(blockposition);
+-            boolean flag3 = iblockdata.is(Blocks.RESPAWN_ANCHOR);
 -            Vec3D vec3d = (Vec3D) optional.get();
 -            float f1;
 +        // CraftBukkit start - fire PlayerRespawnEvent
 +        if (location == null) {
 +            boolean isBedSpawn = false;
-+            WorldServer worldserver1 = this.server.getWorldServer(entityplayer.getSpawnDimension());
++            WorldServer worldserver1 = this.server.getLevel(entityplayer.getRespawnDimension());
 +            if (worldserver1 != null) {
 +                Optional optional;
  
--            if (!iblockdata.a((Tag) TagsBlock.BEDS) && !flag3) {
+-            if (!iblockdata.is((Tag) TagsBlock.BEDS) && !flag3) {
 -                f1 = f;
 -            } else {
--                Vec3D vec3d1 = Vec3D.c((BaseBlockPosition) blockposition).d(vec3d).d();
+-                Vec3D vec3d1 = Vec3D.atBottomCenterOf(blockposition).subtract(vec3d).normalize();
 +                if (blockposition != null) {
-+                    optional = EntityHuman.getBed(worldserver1, blockposition, f, flag1, flag);
++                    optional = EntityHuman.findRespawnPositionAndUseSpawnBlock(worldserver1, blockposition, f, flag1, flag);
 +                } else {
 +                    optional = Optional.empty();
 +                }
 +
 +                if (optional.isPresent()) {
-+                    IBlockData iblockdata = worldserver1.getType(blockposition);
-+                    boolean flag3 = iblockdata.a(Blocks.RESPAWN_ANCHOR);
++                    IBlockData iblockdata = worldserver1.getBlockState(blockposition);
++                    boolean flag3 = iblockdata.is(Blocks.RESPAWN_ANCHOR);
 +                    Vec3D vec3d = (Vec3D) optional.get();
 +                    float f1;
 +
-+                    if (!iblockdata.a((Tag) TagsBlock.BEDS) && !flag3) {
++                    if (!iblockdata.is((Tag) TagsBlock.BEDS) && !flag3) {
 +                        f1 = f;
 +                    } else {
-+                        Vec3D vec3d1 = Vec3D.c((BaseBlockPosition) blockposition).d(vec3d).d();
++                        Vec3D vec3d1 = Vec3D.atBottomCenterOf(blockposition).subtract(vec3d).normalize();
  
--                f1 = (float) MathHelper.f(MathHelper.d(vec3d1.z, vec3d1.x) * 57.2957763671875D - 90.0D);
-+                        f1 = (float) MathHelper.f(MathHelper.d(vec3d1.z, vec3d1.x) * 57.2957763671875D - 90.0D);
+-                f1 = (float) MathHelper.wrapDegrees(MathHelper.atan2(vec3d1.z, vec3d1.x) * 57.2957763671875D - 90.0D);
++                        f1 = (float) MathHelper.wrapDegrees(MathHelper.atan2(vec3d1.z, vec3d1.x) * 57.2957763671875D - 90.0D);
 +                    }
 +
-+                    entityplayer1.setRespawnPosition(worldserver1.getDimensionKey(), blockposition, f, flag1, false);
++                    entityplayer1.setRespawnPosition(worldserver1.dimension(), blockposition, f, flag1, false);
 +                    flag2 = !flag && flag3;
 +                    isBedSpawn = true;
 +                    location = new Location(worldserver1.getWorld(), vec3d.x, vec3d.y, vec3d.z, f1, 0.0F);
 +                } else if (blockposition != null) {
-+                    entityplayer1.connection.sendPacket(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F));
++                    entityplayer1.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F));
 +                    entityplayer1.setRespawnPosition(null, null, 0f, false, false); // CraftBukkit - SPIGOT-5988: Clear respawn location when obstructed
 +                }
 +            }
 +
 +            if (location == null) {
-+                worldserver1 = this.server.getWorldServer(World.OVERWORLD);
++                worldserver1 = this.server.getLevel(World.OVERWORLD);
 +                blockposition = entityplayer1.getSpawnPoint(worldserver1);
 +                location = new Location(worldserver1.getWorld(), (double) ((float) blockposition.getX() + 0.5F), (double) ((float) blockposition.getY() + 0.1F), (double) ((float) blockposition.getZ() + 0.5F));
              }
  
--            entityplayer1.setPositionRotation(vec3d.x, vec3d.y, vec3d.z, f1, 0.0F);
--            entityplayer1.setRespawnPosition(worldserver1.getDimensionKey(), blockposition, f, flag1, false);
+-            entityplayer1.moveTo(vec3d.x, vec3d.y, vec3d.z, f1, 0.0F);
+-            entityplayer1.setRespawnPosition(worldserver1.dimension(), blockposition, f, flag1, false);
 -            flag2 = !flag && flag3;
 -        } else if (blockposition != null) {
--            entityplayer1.connection.sendPacket(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F));
+-            entityplayer1.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F));
 +            Player respawnPlayer = entityplayer1.getBukkitEntity();
 +            PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !flag2, flag2);
 +            cserver.getPluginManager().callEvent(respawnEvent);
@@ -510,52 +510,51 @@
 +        entityplayer1.forceSetPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
 +        // CraftBukkit end
  
--        while (!worldserver1.getCubes(entityplayer1) && entityplayer1.locY() < (double) worldserver1.getMaxBuildHeight()) {
-+        while (avoidSuffocation && !worldserver1.getCubes(entityplayer1) && entityplayer1.locY() < (double) worldserver1.getMaxBuildHeight()) {
-             entityplayer1.setPosition(entityplayer1.locX(), entityplayer1.locY() + 1.0D, entityplayer1.locZ());
+-        while (!worldserver1.noCollision((Entity) entityplayer1) && entityplayer1.getY() < (double) worldserver1.getMaxBuildHeight()) {
++        while (avoidSuffocation && !worldserver1.noCollision(entityplayer1) && entityplayer1.getY() < (double) worldserver1.getMaxBuildHeight()) {
+             entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
          }
 +        // CraftBukkit start
-+        WorldData worlddata = worldserver1.getWorldData();
-+        entityplayer1.connection.sendPacket(new PacketPlayOutRespawn(worldserver1.getDimensionManager(), worldserver1.getDimensionKey(), BiomeManager.a(worldserver1.getSeed()), entityplayer1.gameMode.getGameMode(), entityplayer1.gameMode.c(), worldserver1.isDebugWorld(), worldserver1.isFlatWorld(), flag));
++        WorldData worlddata = worldserver1.getLevelData();
++        entityplayer1.connection.send(new PacketPlayOutRespawn(worldserver1.dimensionType(), worldserver1.dimension(), BiomeManager.obfuscateSeed(worldserver1.getSeed()), entityplayer1.gameMode.getGameModeForPlayer(), entityplayer1.gameMode.getPreviousGameModeForPlayer(), worldserver1.isDebug(), worldserver1.isFlat(), flag));
 +        entityplayer1.spawnIn(worldserver1);
 +        entityplayer1.unsetRemoved();
-+        entityplayer1.connection.teleport(new Location(worldserver1.getWorld(), entityplayer1.locX(), entityplayer1.locY(), entityplayer1.locZ(), entityplayer1.getYRot(), entityplayer1.getXRot()));
-+        entityplayer1.setSneaking(false);
++        entityplayer1.connection.teleport(new Location(worldserver1.getWorld(), entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot()));
++        entityplayer1.setShiftKeyDown(false);
  
--        WorldData worlddata = entityplayer1.level.getWorldData();
+-        WorldData worlddata = entityplayer1.level.getLevelData();
 -
--        entityplayer1.connection.sendPacket(new PacketPlayOutRespawn(entityplayer1.level.getDimensionManager(), entityplayer1.level.getDimensionKey(), BiomeManager.a(entityplayer1.getWorldServer().getSeed()), entityplayer1.gameMode.getGameMode(), entityplayer1.gameMode.c(), entityplayer1.getWorldServer().isDebugWorld(), entityplayer1.getWorldServer().isFlatWorld(), flag));
--        entityplayer1.connection.b(entityplayer1.locX(), entityplayer1.locY(), entityplayer1.locZ(), entityplayer1.getYRot(), entityplayer1.getXRot());
-+        // entityplayer1.connection.b(entityplayer1.locX(), entityplayer1.locY(), entityplayer1.locZ(), entityplayer1.getYRot(), entityplayer1.getXRot());
-         entityplayer1.connection.sendPacket(new PacketPlayOutSpawnPosition(worldserver1.getSpawn(), worldserver1.x()));
-         entityplayer1.connection.sendPacket(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
-         entityplayer1.connection.sendPacket(new PacketPlayOutExperience(entityplayer1.experienceProgress, entityplayer1.totalExperience, entityplayer1.experienceLevel));
-         this.a(entityplayer1, worldserver1);
-         this.d(entityplayer1);
--        worldserver1.addPlayerRespawn(entityplayer1);
+-        entityplayer1.connection.send(new PacketPlayOutRespawn(entityplayer1.level.dimensionType(), entityplayer1.level.dimension(), BiomeManager.obfuscateSeed(entityplayer1.getLevel().getSeed()), entityplayer1.gameMode.getGameModeForPlayer(), entityplayer1.gameMode.getPreviousGameModeForPlayer(), entityplayer1.getLevel().isDebug(), entityplayer1.getLevel().isFlat(), flag));
+-        entityplayer1.connection.teleport(entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot());
++        // entityplayer1.connection.teleport(entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot());
+         entityplayer1.connection.send(new PacketPlayOutSpawnPosition(worldserver1.getSharedSpawnPos(), worldserver1.getSharedSpawnAngle()));
+         entityplayer1.connection.send(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
+         entityplayer1.connection.send(new PacketPlayOutExperience(entityplayer1.experienceProgress, entityplayer1.totalExperience, entityplayer1.experienceLevel));
+         this.sendLevelInfo(entityplayer1, worldserver1);
+         this.sendPlayerPermissionLevel(entityplayer1);
+-        worldserver1.addRespawnedPlayer(entityplayer1);
 -        this.players.add(entityplayer1);
--        this.playersByUUID.put(entityplayer1.getUniqueID(), entityplayer1);
--        entityplayer1.syncInventory();
+-        this.playersByUUID.put(entityplayer1.getUUID(), entityplayer1);
+-        entityplayer1.initInventoryMenu();
 +        if (!entityplayer.connection.isDisconnected()) {
-+            worldserver1.addPlayerRespawn(entityplayer1);
++            worldserver1.addRespawnedPlayer(entityplayer1);
 +            this.players.add(entityplayer1);
-+            this.playersByUUID.put(entityplayer1.getUniqueID(), entityplayer1);
++            this.playersByUUID.put(entityplayer1.getUUID(), entityplayer1);
 +        }
-+        // entityplayer1.syncInventory();
++        // entityplayer1.initInventoryMenu();
          entityplayer1.setHealth(entityplayer1.getHealth());
          if (flag2) {
-             entityplayer1.connection.sendPacket(new PacketPlayOutNamedSoundEffect(SoundEffects.RESPAWN_ANCHOR_DEPLETE, SoundCategory.BLOCKS, (double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ(), 1.0F, 1.0F));
+             entityplayer1.connection.send(new PacketPlayOutNamedSoundEffect(SoundEffects.RESPAWN_ANCHOR_DEPLETE, SoundCategory.BLOCKS, (double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ(), 1.0F, 1.0F));
          }
 +        // Added from changeDimension
-+        updateClient(entityplayer); // Update health, etc...
-+        entityplayer.updateAbilities();
-+        for (Object o1 : entityplayer.getEffects()) {
-+            MobEffect mobEffect = (MobEffect) o1;
-+            entityplayer.connection.sendPacket(new PacketPlayOutEntityEffect(entityplayer.getId(), mobEffect));
++        sendAllPlayerInfo(entityplayer); // Update health, etc...
++        entityplayer.onUpdateAbilities();
++        for (MobEffect mobEffect : entityplayer.getActiveEffects()) {
++            entityplayer.connection.send(new PacketPlayOutEntityEffect(entityplayer.getId(), mobEffect));
 +        }
 +
 +        // Fire advancement trigger
-+        entityplayer.triggerDimensionAdvancements(((CraftWorld) fromWorld).getHandle());
++        entityplayer.triggerDimensionChangeTriggers(((CraftWorld) fromWorld).getHandle());
  
 +        // Don't fire on respawn
 +        if (fromWorld != location.getWorld()) {
@@ -565,22 +564,22 @@
 +
 +        // Save player file again if they were disconnected
 +        if (entityplayer.connection.isDisconnected()) {
-+            this.savePlayerFile(entityplayer);
++            this.save(entityplayer);
 +        }
 +        // CraftBukkit end
          return entityplayer1;
      }
  
-@@ -550,7 +797,18 @@
+@@ -551,7 +797,18 @@
  
      public void tick() {
          if (++this.sendAllPlayerInfoIn > 600) {
--            this.sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.UPDATE_LATENCY, this.players));
+-            this.broadcastAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.UPDATE_LATENCY, this.players));
 +            // CraftBukkit start
 +            for (int i = 0; i < this.players.size(); ++i) {
 +                final EntityPlayer target = (EntityPlayer) this.players.get(i);
 +
-+                target.connection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.UPDATE_LATENCY, this.players.stream().filter(new Predicate<EntityPlayer>() {
++                target.connection.send(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.UPDATE_LATENCY, this.players.stream().filter(new Predicate<EntityPlayer>() {
 +                    @Override
 +                    public boolean apply(EntityPlayer input) {
 +                        return target.getBukkitEntity().canSee(input.getBukkitEntity());
@@ -591,41 +590,50 @@
              this.sendAllPlayerInfoIn = 0;
          }
  
-@@ -567,6 +825,25 @@
+@@ -568,6 +825,25 @@
  
      }
  
 +    // CraftBukkit start - add a world/entity limited version
-+    public void sendAll(Packet packet, EntityHuman entityhuman) {
++    public void broadcastAll(Packet packet, EntityHuman entityhuman) {
 +        for (int i = 0; i < this.players.size(); ++i) {
 +            EntityPlayer entityplayer =  this.players.get(i);
 +            if (entityhuman != null && entityhuman instanceof EntityPlayer && !entityplayer.getBukkitEntity().canSee(((EntityPlayer) entityhuman).getBukkitEntity())) {
 +                continue;
 +            }
-+            ((EntityPlayer) this.players.get(i)).connection.sendPacket(packet);
++            ((EntityPlayer) this.players.get(i)).connection.send(packet);
 +        }
 +    }
 +
-+    public void sendAll(Packet packet, World world) {
-+        for (int i = 0; i < world.getPlayers().size(); ++i) {
-+            ((EntityPlayer) world.getPlayers().get(i)).connection.sendPacket(packet);
++    public void broadcastAll(Packet packet, World world) {
++        for (int i = 0; i < world.players().size(); ++i) {
++            ((EntityPlayer) world.players().get(i)).connection.send(packet);
 +        }
 +
 +    }
 +    // CraftBukkit end
 +
-     public void a(Packet<?> packet, ResourceKey<World> resourcekey) {
+     public void broadcastAll(Packet<?> packet, ResourceKey<World> resourcekey) {
          Iterator iterator = this.players.iterator();
  
-@@ -669,6 +946,7 @@
-             entityplayer.connection.sendPacket(new PacketPlayOutEntityStatus(entityplayer, b0));
+@@ -646,7 +922,7 @@
+     }
+ 
+     public void deop(GameProfile gameprofile) {
+-        this.ops.remove((Object) gameprofile);
++        this.ops.remove(gameprofile); // CraftBukkit - decompile error
+         EntityPlayer entityplayer = this.getPlayer(gameprofile.getId());
+ 
+         if (entityplayer != null) {
+@@ -670,6 +946,7 @@
+             entityplayer.connection.send(new PacketPlayOutEntityStatus(entityplayer, b0));
          }
  
 +        entityplayer.getBukkitEntity().recalculatePermissions(); // CraftBukkit
-         this.server.getCommandDispatcher().a(entityplayer);
+         this.server.getCommands().sendCommands(entityplayer);
      }
  
-@@ -701,6 +979,12 @@
+@@ -702,6 +979,12 @@
          for (int i = 0; i < this.players.size(); ++i) {
              EntityPlayer entityplayer = (EntityPlayer) this.players.get(i);
  
@@ -635,27 +643,27 @@
 +            }
 +            // CraftBukkit end
 +
-             if (entityplayer != entityhuman && entityplayer.level.getDimensionKey() == resourcekey) {
-                 double d4 = d0 - entityplayer.locX();
-                 double d5 = d1 - entityplayer.locY();
-@@ -740,23 +1024,34 @@
-     public void reloadWhitelist() {}
+             if (entityplayer != entityhuman && entityplayer.level.dimension() == resourcekey) {
+                 double d4 = d0 - entityplayer.getX();
+                 double d5 = d1 - entityplayer.getY();
+@@ -741,23 +1024,34 @@
+     public void reloadWhiteList() {}
  
-     public void a(EntityPlayer entityplayer, WorldServer worldserver) {
--        WorldBorder worldborder = this.server.E().getWorldBorder();
+     public void sendLevelInfo(EntityPlayer entityplayer, WorldServer worldserver) {
+-        WorldBorder worldborder = this.server.overworld().getWorldBorder();
 +        WorldBorder worldborder = entityplayer.level.getWorldBorder(); // CraftBukkit
  
-         entityplayer.connection.sendPacket(new ClientboundInitializeBorderPacket(worldborder));
-         entityplayer.connection.sendPacket(new PacketPlayOutUpdateTime(worldserver.getTime(), worldserver.getDayTime(), worldserver.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)));
-         entityplayer.connection.sendPacket(new PacketPlayOutSpawnPosition(worldserver.getSpawn(), worldserver.x()));
+         entityplayer.connection.send(new ClientboundInitializeBorderPacket(worldborder));
+         entityplayer.connection.send(new PacketPlayOutUpdateTime(worldserver.getGameTime(), worldserver.getDayTime(), worldserver.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)));
+         entityplayer.connection.send(new PacketPlayOutSpawnPosition(worldserver.getSharedSpawnPos(), worldserver.getSharedSpawnAngle()));
          if (worldserver.isRaining()) {
--            entityplayer.connection.sendPacket(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.START_RAINING, 0.0F));
--            entityplayer.connection.sendPacket(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, worldserver.d(1.0F)));
--            entityplayer.connection.sendPacket(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.THUNDER_LEVEL_CHANGE, worldserver.b(1.0F)));
+-            entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.START_RAINING, 0.0F));
+-            entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, worldserver.getRainLevel(1.0F)));
+-            entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.THUNDER_LEVEL_CHANGE, worldserver.getThunderLevel(1.0F)));
 +            // CraftBukkit start - handle player weather
-+            // entityplayer.playerConnection.sendPacket(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.b, 0.0F));
-+            // entityplayer.playerConnection.sendPacket(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.h, worldserver.d(1.0F)));
-+            // entityplayer.playerConnection.sendPacket(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.i, worldserver.b(1.0F)));
++            // entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.START_RAINING, 0.0F));
++            // entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, worldserver.getRainLevel(1.0F)));
++            // entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.THUNDER_LEVEL_CHANGE, worldserver.getThunderLevel(1.0F)));
 +            entityplayer.setPlayerWeather(org.bukkit.WeatherType.DOWNFALL, false);
 +            entityplayer.updateWeather(-worldserver.rainLevel, worldserver.rainLevel, -worldserver.thunderLevel, worldserver.thunderLevel);
 +            // CraftBukkit end
@@ -663,25 +671,25 @@
  
      }
  
-     public void updateClient(EntityPlayer entityplayer) {
-         entityplayer.inventoryMenu.updateInventory();
--        entityplayer.triggerHealthUpdate();
-+        // entityplayer.triggerHealthUpdate();
+     public void sendAllPlayerInfo(EntityPlayer entityplayer) {
+         entityplayer.inventoryMenu.sendAllDataToRemote();
+-        entityplayer.resetSentInfo();
++        // entityplayer.resetSentInfo();
 +        entityplayer.getBukkitEntity().updateScaledHealth(); // CraftBukkit - Update scaled health on respawn and worldchange
-         entityplayer.connection.sendPacket(new PacketPlayOutHeldItemSlot(entityplayer.getInventory().selected));
+         entityplayer.connection.send(new PacketPlayOutHeldItemSlot(entityplayer.getInventory().selected));
 +        // CraftBukkit start - from GameRules
 +        int i = entityplayer.level.getGameRules().getBoolean(GameRules.RULE_REDUCEDDEBUGINFO) ? 22 : 23;
-+        entityplayer.connection.sendPacket(new PacketPlayOutEntityStatus(entityplayer, (byte) i));
++        entityplayer.connection.send(new PacketPlayOutEntityStatus(entityplayer, (byte) i));
 +        float immediateRespawn = entityplayer.level.getGameRules().getBoolean(GameRules.RULE_DO_IMMEDIATE_RESPAWN) ? 1.0F: 0.0F;
-+        entityplayer.connection.sendPacket(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.IMMEDIATE_RESPAWN, immediateRespawn));
++        entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.IMMEDIATE_RESPAWN, immediateRespawn));
 +        // CraftBukkit end
      }
  
      public int getPlayerCount() {
-@@ -807,12 +1102,22 @@
+@@ -813,12 +1107,22 @@
      }
  
-     public void shutdown() {
+     public void removeAll() {
 -        for (int i = 0; i < this.players.size(); ++i) {
 -            ((EntityPlayer) this.players.get(i)).connection.disconnect(new ChatMessage("multiplayer.disconnect.server_shutdown"));
 +        // CraftBukkit start - disconnect safely
@@ -693,45 +701,45 @@
      }
  
 +    // CraftBukkit start
-+    public void sendMessage(IChatBaseComponent[] iChatBaseComponents) {
++    public void broadcastMessage(IChatBaseComponent[] iChatBaseComponents) {
 +        for (IChatBaseComponent component : iChatBaseComponents) {
-+            sendMessage(component, ChatMessageType.SYSTEM, SystemUtils.NIL_UUID);
++            broadcastMessage(component, ChatMessageType.SYSTEM, SystemUtils.NIL_UUID);
 +        }
 +    }
 +    // CraftBukkit end
 +
-     public void sendMessage(IChatBaseComponent ichatbasecomponent, ChatMessageType chatmessagetype, UUID uuid) {
+     public void broadcastMessage(IChatBaseComponent ichatbasecomponent, ChatMessageType chatmessagetype, UUID uuid) {
          this.server.sendMessage(ichatbasecomponent, uuid);
          Iterator iterator = this.players.iterator();
-@@ -840,16 +1145,23 @@
+@@ -846,16 +1150,23 @@
  
      }
  
--    public ServerStatisticManager getStatisticManager(EntityHuman entityhuman) {
--        UUID uuid = entityhuman.getUniqueID();
--        ServerStatisticManager serverstatisticmanager = uuid == null ? null : (ServerStatisticManager) this.stats.get(uuid);
+-    public ServerStatisticManager getPlayerStats(EntityHuman entityhuman) {
+-        UUID uuid = entityhuman.getUUID();
+-        ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) this.stats.get(uuid);
 +    // CraftBukkit start
-+    public ServerStatisticManager getStatisticManager(EntityPlayer entityhuman) {
-+        ServerStatisticManager serverstatisticmanager = entityhuman.getStatisticManager();
-+        return serverstatisticmanager == null ? getStatisticManager(entityhuman.getUniqueID(), entityhuman.getDisplayName().getString()) : serverstatisticmanager;
++    public ServerStatisticManager getPlayerStats(EntityPlayer entityhuman) {
++        ServerStatisticManager serverstatisticmanager = entityhuman.getStats();
++        return serverstatisticmanager == null ? getPlayerStats(entityhuman.getUUID(), entityhuman.getDisplayName().getString()) : serverstatisticmanager;
 +    }
 +
-+    public ServerStatisticManager getStatisticManager(UUID uuid, String displayName) {
++    public ServerStatisticManager getPlayerStats(UUID uuid, String displayName) {
 +        EntityPlayer entityhuman = this.getPlayer(uuid);
-+        ServerStatisticManager serverstatisticmanager = entityhuman == null ? null : (ServerStatisticManager) entityhuman.getStatisticManager();
++        ServerStatisticManager serverstatisticmanager = entityhuman == null ? null : (ServerStatisticManager) entityhuman.getStats();
 +        // CraftBukkit end
  
          if (serverstatisticmanager == null) {
-             File file = this.server.a(SavedFile.PLAYER_STATS_DIR).toFile();
+             File file = this.server.getWorldPath(SavedFile.PLAYER_STATS_DIR).toFile();
              File file1 = new File(file, uuid + ".json");
  
              if (!file1.exists()) {
--                File file2 = new File(file, entityhuman.getDisplayName().getString() + ".json");
+-                File file2 = new File(file, entityhuman.getName().getString() + ".json");
 +                File file2 = new File(file, displayName + ".json"); // CraftBukkit
                  Path path = file2.toPath();
  
-                 if (FileUtils.a(path) && FileUtils.b(path) && path.startsWith(file.getPath()) && file2.isFile()) {
-@@ -858,7 +1170,7 @@
+                 if (FileUtils.isPathNormalized(path) && FileUtils.isPathPortable(path) && path.startsWith(file.getPath()) && file2.isFile()) {
+@@ -864,7 +1175,7 @@
              }
  
              serverstatisticmanager = new ServerStatisticManager(this.server, file1);
@@ -740,27 +748,27 @@
          }
  
          return serverstatisticmanager;
-@@ -866,14 +1178,14 @@
+@@ -872,14 +1183,14 @@
  
-     public AdvancementDataPlayer f(EntityPlayer entityplayer) {
-         UUID uuid = entityplayer.getUniqueID();
+     public AdvancementDataPlayer getPlayerAdvancements(EntityPlayer entityplayer) {
+         UUID uuid = entityplayer.getUUID();
 -        AdvancementDataPlayer advancementdataplayer = (AdvancementDataPlayer) this.advancements.get(uuid);
-+        AdvancementDataPlayer advancementdataplayer = (AdvancementDataPlayer) entityplayer.getAdvancementData(); // CraftBukkit
++        AdvancementDataPlayer advancementdataplayer = (AdvancementDataPlayer) entityplayer.getAdvancements(); // CraftBukkit
  
          if (advancementdataplayer == null) {
-             File file = this.server.a(SavedFile.PLAYER_ADVANCEMENTS_DIR).toFile();
+             File file = this.server.getWorldPath(SavedFile.PLAYER_ADVANCEMENTS_DIR).toFile();
              File file1 = new File(file, uuid + ".json");
  
-             advancementdataplayer = new AdvancementDataPlayer(this.server.getDataFixer(), this, this.server.getAdvancementData(), file1, entityplayer);
+             advancementdataplayer = new AdvancementDataPlayer(this.server.getFixerUpper(), this, this.server.getAdvancements(), file1, entityplayer);
 -            this.advancements.put(uuid, advancementdataplayer);
 +            // this.advancements.put(uuid, advancementdataplayer); // CraftBukkit
          }
  
-         advancementdataplayer.a(entityplayer);
-@@ -909,13 +1221,20 @@
+         advancementdataplayer.setPlayer(entityplayer);
+@@ -930,13 +1241,20 @@
      }
  
-     public void reload() {
+     public void reloadResources() {
 -        Iterator iterator = this.advancements.values().iterator();
 +        // CraftBukkit start
 +        /*Iterator iterator = this.advancements.values().iterator();
@@ -768,14 +776,14 @@
          while (iterator.hasNext()) {
              AdvancementDataPlayer advancementdataplayer = (AdvancementDataPlayer) iterator.next();
  
-             advancementdataplayer.a(this.server.getAdvancementData());
+             advancementdataplayer.reload(this.server.getAdvancements());
 +        }*/
 +
 +        for (EntityPlayer player : players) {
-+            player.getAdvancementData().a(this.server.getAdvancementData());
-+            player.getAdvancementData().b(player); // CraftBukkit - trigger immediate flush of advancements
++            player.getAdvancements().reload(this.server.getAdvancements());
++            player.getAdvancements().flushDirty(player); // CraftBukkit - trigger immediate flush of advancements
          }
 +        // CraftBukkit end
  
-         this.sendAll(new PacketPlayOutTags(this.server.getTagRegistry().a((IRegistryCustom) this.registryHolder)));
-         PacketPlayOutRecipeUpdate packetplayoutrecipeupdate = new PacketPlayOutRecipeUpdate(this.server.getCraftingManager().b());
+         this.broadcastAll(new PacketPlayOutTags(this.server.getTags().serializeToNetwork(this.registryHolder)));
+         PacketPlayOutRecipeUpdate packetplayoutrecipeupdate = new PacketPlayOutRecipeUpdate(this.server.getRecipeManager().getRecipes());

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

@@ -3,18 +3,18 @@
 @@ -18,9 +18,12 @@
      }
  
-     public boolean a(int i, List<EntityPlayer> list) {
--        int j = (int) list.stream().filter(EntityHuman::isDeeplySleeping).count();
+     public boolean areEnoughDeepSleeping(int i, List<EntityPlayer> list) {
+-        int j = (int) list.stream().filter(EntityHuman::isSleepingLongEnough).count();
 +        // CraftBukkit start
-+        int j = (int) list.stream().filter((eh) -> { return eh.isDeeplySleeping() || eh.fauxSleeping; }).count();
-+        boolean anyDeepSleep = list.stream().anyMatch(EntityHuman::isDeeplySleeping);
++        int j = (int) list.stream().filter((eh) -> { return eh.isSleepingLongEnough() || eh.fauxSleeping; }).count();
++        boolean anyDeepSleep = list.stream().anyMatch(EntityHuman::isSleepingLongEnough);
  
--        return j >= this.b(i);
-+        return anyDeepSleep && j >= this.b(i);
+-        return j >= this.sleepersNeeded(i);
++        return anyDeepSleep && j >= this.sleepersNeeded(i);
 +        // CraftBukkit end
      }
  
-     public int b(int i) {
+     public int sleepersNeeded(int i) {
 @@ -42,18 +45,24 @@
          this.activePlayers = 0;
          this.sleepingPlayers = 0;

paper-server/nms-patches/net/minecraft/server/rcon/RemoteControlCommandListener.patch

@@ -1,7 +1,7 @@
 --- a/net/minecraft/server/rcon/RemoteControlCommandListener.java
 +++ b/net/minecraft/server/rcon/RemoteControlCommandListener.java
-@@ -37,6 +37,17 @@
-         return new CommandListenerWrapper(this, Vec3D.b((BaseBlockPosition) worldserver.getSpawn()), Vec2F.ZERO, worldserver, 4, "Rcon", RemoteControlCommandListener.RCON_COMPONENT, this.server, (Entity) null);
+@@ -36,6 +36,17 @@
+         return new CommandListenerWrapper(this, Vec3D.atLowerCornerOf(worldserver.getSharedSpawnPos()), Vec2F.ZERO, worldserver, 4, "Rcon", RemoteControlCommandListener.RCON_COMPONENT, this.server, (Entity) null);
      }
  
 +    // CraftBukkit start - Send a String