From afa25753deca7d3cc69514fe82f87458a213edcc Mon Sep 17 00:00:00 2001
From: Bjarne Koll <git@lynxplay.dev>
Date: Sat, 14 Dec 2024 05:48:25 +0100
Subject: [PATCH] Fix compile issue in MinecraftServer

---
 .../net/minecraft/server/MinecraftServer.java.patch  | 10 +---------
 .../block/entity/ContainerOpenersCounter.java.patch  |  4 ++--
 .../level/block/entity/JukeboxBlockEntity.java.patch | 12 ++++++++----
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/paper-server/patches/sources/net/minecraft/server/MinecraftServer.java.patch b/paper-server/patches/sources/net/minecraft/server/MinecraftServer.java.patch
index ee2f5f535b..2e1e050e3a 100644
--- a/paper-server/patches/sources/net/minecraft/server/MinecraftServer.java.patch
+++ b/paper-server/patches/sources/net/minecraft/server/MinecraftServer.java.patch
@@ -1220,7 +1220,7 @@
      }
  
      @Nullable
-@@ -1980,23 +_,29 @@
+@@ -1980,16 +_,22 @@
      }
  
      public void logChatMessage(Component content, ChatType.Bound boundChatType, @Nullable String header) {
@@ -1247,14 +1247,6 @@
      }
  
      public boolean logIPs() {
-         return true;
-     }
- 
--    public void subscribeToDebugSample(ServerPlayer player, RemoteDebugSampleType sampleType) {
-+    public void subscribeToDebugSample(ServerPlaye player, RemoteDebugSampleType sampleType) {
-     }
- 
-     public boolean acceptsTransfers() {
 @@ -2122,4 +_,53 @@
              };
          }
diff --git a/paper-server/patches/sources/net/minecraft/world/level/block/entity/ContainerOpenersCounter.java.patch b/paper-server/patches/sources/net/minecraft/world/level/block/entity/ContainerOpenersCounter.java.patch
index e999d53387..2f6c3c484c 100644
--- a/paper-server/patches/sources/net/minecraft/world/level/block/entity/ContainerOpenersCounter.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/level/block/entity/ContainerOpenersCounter.java.patch
@@ -21,8 +21,8 @@
 +        this.onClose(level, blockPos, blockState);
 +    }
 +
-+    public void openerAPICountChanged(Level world, BlockPos blockPos, BlockState blockState, int count, int openCount) {
-+        this.openerCountChanged(world, blockPos, blockState, count, openCount);
++    public void openerAPICountChanged(Level level, BlockPos blockPos, BlockState blockState, int count, int openCount) {
++        this.openerCountChanged(level, blockPos, blockState, count, openCount);
 +    }
 +    // CraftBukkit en
 +
diff --git a/paper-server/patches/sources/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java.patch b/paper-server/patches/sources/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java.patch
index 35ee987e0f..cd2c18e407 100644
--- a/paper-server/patches/sources/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java.patch
@@ -54,15 +54,19 @@
      }
  
      @Override
-@@ -147,9 +_,14 @@
+@@ -145,11 +_,16 @@
+     }
+ 
      @VisibleForTesting
-     public void setSongItemWithoutPlaying(ItemStack stack) {
+-    public void setSongItemWithoutPlaying(ItemStack stack) {
++    public void setSongItemWithoutPlaying(ItemStack stack, final long ticksSinceSongStarted) { // CraftBukkit - passed ticks since song started
          this.item = stack;
 -        JukeboxSong.fromStack(this.level.registryAccess(), stack)
+-            .ifPresent(holder -> this.jukeboxSongPlayer.setSongWithoutPlaying((Holder<JukeboxSong>)holder, 0L));
+-        this.level.updateNeighborsAt(this.getBlockPos(), this.getBlockState().getBlock());
 +        this.jukeboxSongPlayer.song = null; // CraftBukkit - reset
 +        JukeboxSong.fromStack(this.level != null ? this.level.registryAccess() : org.bukkit.craftbukkit.CraftRegistry.getMinecraftRegistry(), stack) // Paper - fallback to other RegistyrAccess if no level
-             .ifPresent(holder -> this.jukeboxSongPlayer.setSongWithoutPlaying((Holder<JukeboxSong>)holder, 0L));
--        this.level.updateNeighborsAt(this.getBlockPos(), this.getBlockState().getBlock());
++            .ifPresent(holder -> this.jukeboxSongPlayer.setSongWithoutPlaying((Holder<JukeboxSong>)holder, ticksSinceSongStarted)); // CraftBukkit - passed ticks since song started
 +        // CraftBukkit start - add null check for level
 +        if (this.level != null) {
 +            this.level.updateNeighborsAt(this.getBlockPos(), this.getBlockState().getBlock());