More more more more more more more work

patches/server/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch

@@ -38,7 +38,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        player.loginTime = System.currentTimeMillis(); // Paper
          GameProfile gameprofile = player.getGameProfile();
          GameProfileCache usercache = this.server.getProfileCache();
-         Optional<GameProfile> optional = usercache.get(gameprofile.getId());
+         String s;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java

patches/server/Add-more-Witch-API.patch

@@ -20,24 +20,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                    this.setItemSlot(EquipmentSlot.MAINHAND, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(bukkitStack));
 +                    // Paper start - logic moved into setDrinkingPotion, copy exact impl into the method and then comment out
 +                    this.setDrinkingPotion(potion);
-+//                    org.bukkit.inventory.ItemStack bukkitStack = com.destroystokyo.paper.event.entity.WitchReadyPotionEvent.process((org.bukkit.entity.Witch) this.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(potion));
-+//                    this.setSlot(EnumItemSlot.MAINHAND, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(bukkitStack));
-+//                    // Paper end
-+//                    this.bq = this.getItemInMainHand().k();
-+//                    this.v(true);
-+//                    if (!this.isSilent()) {
-+//                        this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_WITCH_DRINK, this.getSoundCategory(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
-+//                    }
-+//
-+//                    AttributeModifiable attributemodifiable = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED);
-+//
-+//                    attributemodifiable.removeModifier(EntityWitch.bo);
-+//                    attributemodifiable.b(EntityWitch.bo);
                      // Paper end
 -                    this.usingTime = this.getMainHandItem().getUseDuration();
 -                    this.setUsingItem(true);
 -                    if (!this.isSilent()) {
--                        this.level.playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.WITCH_DRINK, this.getSoundSource(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
+-                        this.level().playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.WITCH_DRINK, this.getSoundSource(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
 -                    }
 -
 -                    AttributeInstance attributemodifiable = this.getAttribute(Attributes.MOVEMENT_SPEED);
@@ -59,7 +46,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        this.usingTime = this.getMainHandItem().getUseDuration();
 +        this.setUsingItem(true);
 +        if (!this.isSilent()) {
-+            this.level.playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.WITCH_DRINK, this.getSoundSource(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
++            this.level().playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.WITCH_DRINK, this.getSoundSource(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
 +        }
 +
 +        AttributeInstance attributemodifiable = this.getAttribute(Attributes.MOVEMENT_SPEED);

patches/server/Add-option-to-prevent-players-from-moving-into-unloa.patch

@@ -63,5 +63,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                            }
 +                            // Paper end
  
-                             if (!this.player.isChangingDimension() && (!this.player.getLevel().getGameRules().getBoolean(GameRules.RULE_DISABLE_ELYTRA_MOVEMENT_CHECK) || !this.player.isFallFlying())) {
+                             if (!this.player.isChangingDimension() && (!this.player.level().getGameRules().getBoolean(GameRules.RULE_DISABLE_ELYTRA_MOVEMENT_CHECK) || !this.player.isFallFlying())) {
                                  float f2 = this.player.isFallFlying() ? 300.0F : 100.0F;

patches/server/BlockDestroyEvent.patch

@@ -20,7 +20,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import net.minecraft.resources.ResourceLocation;
 +import io.papermc.paper.util.MCUtil;
  import net.minecraft.server.MinecraftServer;
- import net.minecraft.server.level.ChunkHolder;
+ import net.minecraft.server.level.FullChunkStatus;
  import net.minecraft.server.level.ServerLevel;
 @@ -0,0 +0,0 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              return false;

patches/server/Call-player-spectator-target-events-and-improve-impl.patch

@@ -39,7 +39,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                }
 +            }
 +            // Paper end
-             Level world = this.camera.getLevel();
+             Level world = this.camera.level();
  
              if (world instanceof ServerLevel) {
 @@ -0,0 +0,0 @@ public class ServerPlayer extends Player {

patches/server/Don-t-allow-digging-into-unloaded-chunks.patch

@@ -67,11 +67,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              case ABORT_DESTROY_BLOCK:
              case STOP_DESTROY_BLOCK:
 +                // Paper start - Don't allow digging in unloaded chunks
-+                if (this.player.level.getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4) == null) {
++                if (this.player.level().getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4) == null) {
 +                    this.player.connection.ackBlockChangesUpTo(packet.getSequence());
 +                    return;
 +                }
 +                // Paper end - Don't allow digging in unloaded chunks
-                 this.player.gameMode.handleBlockBreakAction(blockposition, packetplayinblockdig_enumplayerdigtype, packet.getDirection(), this.player.level.getMaxBuildHeight(), packet.getSequence());
+                 this.player.gameMode.handleBlockBreakAction(blockposition, packetplayinblockdig_enumplayerdigtype, packet.getDirection(), this.player.level().getMaxBuildHeight(), packet.getSequence());
                  this.player.connection.ackBlockChangesUpTo(packet.getSequence());
                  return;

patches/server/Fix-SpongeAbsortEvent-handling.patch

@@ -10,16 +10,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
 @@ -0,0 +0,0 @@ public class SpongeBlock extends Block {
-                         // NOP
+                     } else if (iblockdata.is(Blocks.KELP) || iblockdata.is(Blocks.KELP_PLANT) || iblockdata.is(Blocks.SEAGRASS) || iblockdata.is(Blocks.TALL_SEAGRASS)) {
-                     } else if (material == Material.WATER_PLANT || material == Material.REPLACEABLE_WATER_PLANT) {
+                         BlockEntity tileentity = iblockdata.hasBlockEntity() ? world.getBlockEntity(blockposition1) : null;
-                         BlockEntity tileentity = iblockdata.hasBlockEntity() ? world.getBlockEntity(blockposition2) : null;
+ 
--
--                        dropResources(iblockdata, world, blockposition2, tileentity);
 +                        // Paper start
 +                        if (block.getHandle().getMaterial() == Material.AIR) {
-+                            dropResources(iblockdata, world, blockposition2, tileentity);
+                         dropResources(iblockdata, world, blockposition1, tileentity);
 +                        }
 +                        // Paper end
                      }
                  }
-                 world.setBlock(blockposition2, block.getHandle(), block.getFlag());
+                 world.setBlock(blockposition1, block.getHandle(), block.getFlag());

patches/server/MC-50319-Check-other-worlds-for-shooter-of-projectil.patch

@@ -16,12 +16,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -0,0 +0,0 @@ public abstract class Projectile extends Entity implements TraceableEntity {
              return this.cachedOwner;
-         } else if (this.ownerUUID != null && this.level instanceof ServerLevel) {
+         } else if (this.ownerUUID != null && this.level() instanceof ServerLevel) {
-             this.cachedOwner = ((ServerLevel) this.level).getEntity(this.ownerUUID);
+             this.cachedOwner = ((ServerLevel) this.level()).getEntity(this.ownerUUID);
 +            // Paper start - check all worlds
 +            if (this.cachedOwner == null) {
-+                for (final ServerLevel level : this.level.getServer().getAllLevels()) {
++                for (final ServerLevel level : this.level().getServer().getAllLevels()) {
-+                    if (level == this.level) continue;
++                    if (level == this.level()) continue;
 +                    final Entity entity = level.getEntity(this.ownerUUID);
 +                    if (entity != null) {
 +                        this.cachedOwner = entity;

patches/server/Optimize-World-Time-Updates.patch

@@ -18,14 +18,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        if (this.tickCount % 20 == 0) {
 -            for (int i = 0; i < this.getPlayerList().players.size(); ++i) {
 -                ServerPlayer entityplayer = (ServerPlayer) this.getPlayerList().players.get(i);
--                entityplayer.connection.send(new ClientboundSetTimePacket(entityplayer.level.getGameTime(), entityplayer.getPlayerTime(), entityplayer.level.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT))); // Add support for per player time
+-                entityplayer.connection.send(new ClientboundSetTimePacket(entityplayer.level().getGameTime(), entityplayer.getPlayerTime(), entityplayer.level().getGameRules().getBoolean(GameRules.RULE_DAYLIGHT))); // Add support for per player time
 +        // Paper start - optimize time updates
-+        for (final ServerLevel world : this.getAllLevels()) {
++        for (final ServerLevel level : this.getAllLevels()) {
-+            final boolean doDaylight = world.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT);
++            final boolean doDaylight = level.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT);
-+            final long dayTime = world.getDayTime();
++            final long dayTime = level.getDayTime();
-+            long worldTime = world.getGameTime();
++            long worldTime = level.getGameTime();
 +            final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
-+            for (Player entityhuman : world.players()) {
++            for (Player entityhuman : level.players()) {
 +                if (!(entityhuman instanceof ServerPlayer) || (tickCount + entityhuman.getId()) % 20 != 0) {
 +                    continue;
 +                }

patches/server/Turtle-API.patch

@@ -35,7 +35,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                    this.turtle.setLayingEgg(true);
 +                    this.turtle.setLayingEgg(new com.destroystokyo.paper.event.entity.TurtleStartDiggingEvent((org.bukkit.entity.Turtle) this.turtle.getBukkitEntity(), io.papermc.paper.util.MCUtil.toLocation(this.turtle.level, this.getTargetPosition())).callEvent()); // Paper
                  } else if (this.turtle.layEggCounter > this.adjustedTickDelay(200)) {
-                     Level world = this.turtle.level;
+                     Level world = this.turtle.level();
  
                      // CraftBukkit start
 -                    if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.turtle, this.blockPos.above(), (BlockState) Blocks.TURTLE_EGG.defaultBlockState().setValue(TurtleEggBlock.EGGS, this.turtle.random.nextInt(4) + 1)).isCancelled()) {

patches/server/force-entity-dismount-during-teleportation.patch

@@ -89,7 +89,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
 -        super.stopRiding();
 +        super.stopRiding(suppressCancellation); // Paper - suppress
-         if (entity != null && entity != this.getVehicle() && !this.level.isClientSide) {
+         if (entity != null && entity != this.getVehicle() && !this.level().isClientSide) {
              this.dismountVehicle(entity);
          }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java

patches/unapplied/server/Don-t-check-ConvertSigns-boolean-every-sign-save.patch

@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 2 Mar 2019 11:11:29 -0500
-Subject: [PATCH] Don't check ConvertSigns boolean every sign save
-
-property lookups arent super cheap. they synchronize, validate
-and check security managers.
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-@@ -0,0 +0,0 @@ import net.minecraft.world.phys.Vec2;
- import net.minecraft.world.phys.Vec3;
- 
- public class SignBlockEntity extends BlockEntity implements CommandSource { // CraftBukkit - implements
-+    private static final boolean CONVERT_LEGACY_SIGNS = Boolean.getBoolean("convertLegacySigns"); // Paper
- 
-     public static final int LINES = 4;
-     private static final int MAX_TEXT_LINE_WIDTH = 90;
-@@ -0,0 +0,0 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
-         }
- 
-         // CraftBukkit start
--        if (Boolean.getBoolean("convertLegacySigns")) {
-+        if (CONVERT_LEGACY_SIGNS) { // Paper
-             nbt.putBoolean("Bukkit.isConverted", true);
-         }
-         // CraftBukkit end