Updated Upstream (Folia)

2024-05-19 04:52:07 -04:00
parent a33f5c92bb
commit 266ea43135
12 changed files with 98 additions and 106 deletions
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
    java
    `maven-publish`
-    id("io.papermc.paperweight.patcher") version "1.6.3"
+    id("io.papermc.paperweight.patcher") version "1.7.1"
 }

 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
@@ -56,17 +56,6 @@ subprojects {

 }

-tasks.generateDevelopmentBundle {
-    apiCoordinates.set("me.earthme.luminol:luminol-api")
-    mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi")
-    libraryRepositories.set(
-        listOf(
-            "https://repo.maven.apache.org/maven2/",
-            "https://maven.pkg.github.com/LuminolMC/Luminol",
-        )
-    )
-}
-
 paperweight {
    serverProject.set(project(":luminol-server"))

@@ -100,9 +89,9 @@ paperweight {

 tasks.generateDevelopmentBundle {
    apiCoordinates.set("me.earthme.luminol:luminol-api")
-    mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi")
    libraryRepositories.addAll(
        "https://repo.maven.apache.org/maven2/",
+        "https://maven.pkg.github.com/LuminolMC/Luminol",
        paperMavenPublicUrl,
    )
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = me.earthme.luminol
 version = 1.20.6-R0.1-SNAPSHOT

-foliaCommit = b1bfe7b55f33db5a9d68169f7e0a3503cad066ff
+foliaCommit = 78f49e0ce3b65afb8b5c949f55c3a2ffa669dfad

 org.gradle.caching = true
 org.gradle.parallel = true
--- a/patches/server/0001-Fix-build.patch
+++ b/patches/server/0001-Fix-build.patch
@@ -5,24 +5,15 @@ Subject: [PATCH] Fix build


 diff --git a/build.gradle.kts b/build.gradle.kts
-index b1d621ed91c74790fd5b66339c044ec444de62ef..fee54ed7abfc93f8fd911aea6831988e3699f762 100644
+index eb2f9941b24af591f1e56339b97f5284a765cf81..32bfe781e5298e5ad1bd2ed4471fb824c49f0ab4 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -13,7 +13,7 @@ val alsoShade: Configuration by configurations.creating
+@@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
+ val alsoShade: Configuration by configurations.creating
 
 dependencies {
-     // Folia start
-    implementation(project(":folia-api"))
-+    implementation(project(":luminol-api"))//Luminol
-     implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
-         exclude("io.papermc.paper", "paper-api")
-     }
-@@ -83,7 +83,7 @@ tasks.jar {
-         attributes(
-             "Main-Class" to "org.bukkit.craftbukkit.Main",
-             "Implementation-Title" to "CraftBukkit",
-            "Implementation-Version" to "git-Folia-$implementationVersion", // Folia
-+            "Implementation-Version" to "git-Luminol-$implementationVersion", // Folia //Luminol
-             "Implementation-Vendor" to date, // Paper
-             "Specification-Title" to "Bukkit",
-             "Specification-Version" to project.version,
+-    implementation(project(":folia-api")) // Folia
+    implementation(project(":luminol-api")) // Folia // Luminol
+     // Paper start
+     implementation("org.jline:jline-terminal-jansi:3.21.0")
+     implementation("net.minecrell:terminalconsoleappender:1.3.0")
--- a/patches/server/0002-Rebrand-to-Luminol.patch
+++ b/patches/server/0002-Rebrand-to-Luminol.patch
@@ -4,6 +4,30 @@ Date: Tue, 6 Feb 2024 01:35:36 +0000
 Subject: [PATCH] Rebrand to Luminol


+diff --git a/build.gradle.kts b/build.gradle.kts
+index 32bfe781e5298e5ad1bd2ed4471fb824c49f0ab4..f9919b9da90317bd615d7e57607df73ebcc1d077 100644
+--- a/build.gradle.kts
+++ b/build.gradle.kts
+@@ -80,14 +80,14 @@ tasks.jar {
+         val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
+         attributes(
+             "Main-Class" to "org.bukkit.craftbukkit.Main",
+-            "Implementation-Title" to "Folia", // Folia
+            "Implementation-Title" to "Luminol", // Folia // Luminol
+             "Implementation-Version" to implementationVersion,
+             "Implementation-Vendor" to date, // Paper
+-            "Specification-Title" to "Folia", // Folia
+            "Specification-Title" to "Luminol", // Folia // Luminol
+             "Specification-Version" to project.version,
+-            "Specification-Vendor" to "Paper Team",
+-            "Brand-Id" to "papermc:folia", // Folia
+-            "Brand-Name" to "Folia", // Folia
+            "Specification-Vendor" to "LuminolMC Team", // Luminol
+            "Brand-Id" to "luminolmc:luminol", // Folia // Luminol
+            "Brand-Name" to "Luminol", // Folia // Luminol
+             "Build-Number" to (build ?: ""),
+             "Build-Time" to Instant.now().toString(),
+             "Git-Branch" to gitBranch, // Paper
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
 index cb60d58d4a7556dd896f31d0cd249f860bb3ef84..b52a805150e95d7d27403d3c18088b335a355011 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -27,55 +51,43 @@ index cb60d58d4a7556dd896f31d0cd249f860bb3ef84..b52a805150e95d7d27403d3c18088b33
                 metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                     Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index e2f704c115fd6e00960bb56bb0779f1100c89c17..7707908064a75ecf02677a0110207e194c3eefd1 100644
+index 29bd788ae8bc61c1e62a4f84b9e259931a7041ce..2f37873738ab542980d13f36356b04b4904e625b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -20,7 +20,7 @@ import java.util.stream.StreamSupport;
- public class PaperVersionFetcher implements VersionFetcher {
-     private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end
-     private static final String GITHUB_BRANCH_NAME = "master";
+@@ -35,7 +35,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+     private static final Logger LOGGER = LogUtils.getClassLogger();
+     private static final int DISTANCE_ERROR = -1;
+     private static final int DISTANCE_UNKNOWN = -2;
 -    private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper";
 +    private static final String DOWNLOAD_PAGE = "https://github.com/LuminolMC/Luminol"; //Luminol
-     private static @Nullable String mcVer;
 
     @Override
-@@ -31,8 +31,8 @@ public class PaperVersionFetcher implements VersionFetcher {
-     @Nonnull
-     @Override
-     public Component getVersionMessage(@Nonnull String serverVersion) {
-        String[] parts = serverVersion.substring("git-Folia-".length()).split("[-\\s]"); // Folia
-        final Component updateMessage = getUpdateStatusMessage("PaperMC/Folia", GITHUB_BRANCH_NAME, parts[0]); // Folia
-+        String[] parts = serverVersion.substring("git-Luminol-".length()).split("[-\\s]"); // Folia //Luminol
-+        final Component updateMessage = getUpdateStatusMessage("LuminolMC/Luminol", GITHUB_BRANCH_NAME, parts[0]); // Folia //Luminol
-         final Component history = getHistory();
+     public long getCacheTime() {
+@@ -49,7 +49,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+         if (build.buildNumber().isEmpty() && build.gitCommit().isEmpty()) {
+             updateMessage = text("You are running a development version without access to version information", color(0xFF5300));
+         } else {
+-            updateMessage = getUpdateStatusMessage("PaperMC/Folia", build); // Folia
+            updateMessage = getUpdateStatusMessage("LuminolMC/Luminol", build); // Folia // Luminol
+         }
+         final @Nullable Component history = this.getHistory();
 
-         return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 49a121862fbb823a00753d99d24d04c87479fcd1..f5ea50264613e7f739bbcf53c3be0d0305fd337e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2020,7 +2020,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     @DontObfuscate
-     public String getServerModName() {
-        return "Folia"; // Paper // Folia - Folia
-+        return "Luminol"; // Paper // Folia - Folia //Luminol - Luminol
-     }
- 
-     public SystemReport fillSystemReport(SystemReport details) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 57963e9e427e2533ae9cdbd1e98ff3dfadbdebac..dfae16ae414f3f095da0e8088f3755b88fb98592 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -268,7 +268,7 @@ import javax.annotation.Nullable; // Paper
- import javax.annotation.Nonnull; // Paper
- 
- public final class CraftServer implements Server {
-    private final String serverName = "Folia"; // Folia // Paper
-+    private final String serverName = "Luminol"; // Folia // Paper //Luminol
-     private final String serverVersion;
-     private final String bukkitVersion = Versioning.getBukkitVersion();
-     private final Logger logger = Logger.getLogger("Minecraft");
+diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
+index e741201fdbea0dbbc0e42313ebd33368014c9dc4..94b759f220289dcc5cf1f256b0033aa22002f708 100644
+--- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
+++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
+@@ -42,9 +42,9 @@ public record ServerBuildInfoImpl(
+         this(
+             getManifestAttribute(manifest, ATTRIBUTE_BRAND_ID)
+                 .map(Key::key)
+-                .orElse(Key.key("papermc", "folia")), // Folia
+                .orElse(Key.key("luminolmc", "luminol")), // Folia // Luminol
+             getManifestAttribute(manifest, ATTRIBUTE_BRAND_NAME)
+-                .orElse("Folia"), // Folia
+                .orElse("Luminol"), // Folia // Luminol
+             SharedConstants.getCurrentVersion().getId(),
+             SharedConstants.getCurrentVersion().getName(),
+             getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER)
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 index e9b6ca3aa25e140467ae866d572483050ea3fa0e..9699d7dcca5cf67f50ad05c0e875de424a4e00c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
--- a/patches/server/0003-Empty-config-file-base.patch
+++ b/patches/server/0003-Empty-config-file-base.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Empty config file base


 diff --git a/build.gradle.kts b/build.gradle.kts
-index fee54ed7abfc93f8fd911aea6831988e3699f762..be27f07025d92b1dd6cef08b6959990f9c98ec0d 100644
+index f9919b9da90317bd615d7e57607df73ebcc1d077..ab07c307bea0d3b79a6239bdcca9714e1ddf3b28 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -18,6 +18,7 @@ dependencies {
-         exclude("io.papermc.paper", "paper-api")
-     }
-     // Folia end
-+    implementation("com.electronwill.night-config:toml:3.6.6") //Luminol - Night config
+@@ -14,6 +14,7 @@ val alsoShade: Configuration by configurations.creating
+ 
+ dependencies {
+     implementation(project(":luminol-api")) // Folia // Luminol
+    implementation("com.electronwill.night-config:toml:3.6.6") // Luminol - Night config
     // Paper start
     implementation("org.jline:jline-terminal-jansi:3.21.0")
     implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -414,7 +414,7 @@ index 0000000000000000000000000000000000000000..2b4e64796bf01b0a5fcb306850cd6083
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 05bc06fcf508e74c717a7f71a2c7ed7c568e846a..e032f454fe8b274ed70f750ada4b3f375fda33da 100644
+index bd333ffb44798069e180cad67c07d86425253024..bbd3b57b83b71ae9840124909f3864c36254f02c 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -222,6 +222,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
--- a/patches/server/0004-Add-config-for-server-mod-name.patch
+++ b/patches/server/0004-Add-config-for-server-mod-name.patch
@@ -47,15 +47,15 @@ index 0000000000000000000000000000000000000000..94e7c8910e3623163528a844fd7a08b3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f5ea50264613e7f739bbcf53c3be0d0305fd337e..be87d0d8d5db0e10fb006d61389af79d7f03a7b7 100644
+index 4c9c227c1395744128f347e9303f8a13667a4aa3..45f96e545a1a9883c9925d49f5eb69968313a0e9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2020,7 +2020,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2019,7 +2019,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
     @DontObfuscate
     public String getServerModName() {
-        return "Luminol"; // Paper // Folia - Folia //Luminol - Luminol
-+        return me.earthme.luminol.config.modules.misc.ServerModNameConfig.fakeVanilla ? "vanilla" : me.earthme.luminol.config.modules.misc.ServerModNameConfig.serverModName; // Paper // Folia - Folia //Luminol - Luminol //Luminol - Add config for this
+-        return io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
+        return me.earthme.luminol.config.modules.misc.ServerModNameConfig.fakeVanilla ? "vanilla" : me.earthme.luminol.config.modules.misc.ServerModNameConfig.serverModName; // Paper // Luminol - Add config for this
     }
 
     public SystemReport fillSystemReport(SystemReport details) {
--- a/patches/server/0009-Add-a-simple-tpsbar.patch
+++ b/patches/server/0009-Add-a-simple-tpsbar.patch
@@ -347,10 +347,10 @@ index 0000000000000000000000000000000000000000..3f1478dde900d671c4bfa43df80f6295
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index e032f454fe8b274ed70f750ada4b3f375fda33da..af3eedca870fdf01e9ff82e6b6595ef9b3a9a0a8 100644
+index bbd3b57b83b71ae9840124909f3864c36254f02c..09bde51d3da062c5788151c15c448eaf2a02ea1b 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -851,6 +851,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -850,6 +850,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
 
     @Override
     public void stopServer() {
@@ -359,7 +359,7 @@ index e032f454fe8b274ed70f750ada4b3f375fda33da..af3eedca870fdf01e9ff82e6b6595ef9
         //Util.shutdownExecutors(); // Paper - moved into super
         SkullBlockEntity.clear();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index da87c4825c67e62ae238877f1fb3220f4c57f553..11b5155820d38a42e62f68fe0f70fe4daf80f5d1 100644
+index 95b72e49469554983e07205b0bd462eec6c9fd86..db32beabfa7ba17b1c46d36fa1dc27bc20e06feb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -302,6 +302,7 @@ public class ServerPlayer extends Player {
@@ -371,10 +371,10 @@ index da87c4825c67e62ae238877f1fb3220f4c57f553..11b5155820d38a42e62f68fe0f70fe4d
     public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances getViewDistances() {
         return this.viewDistances.get();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 92f08b13da2e13cf375d8794e54f7292140545d7..14dca1757d518814890d9866182b50e7e22ebf58 100644
+index 96201b5b458d8e0cbebf586062fac1ec2d81fdd0..ed4bdf27c38d881fd3896a736652686ff9107f16 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2372,6 +2372,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2369,6 +2369,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                 handle.expToDrop = data.getInt("expToDrop");
                 handle.keepLevel = data.getBoolean("keepLevel");
             }
@@ -384,7 +384,7 @@ index 92f08b13da2e13cf375d8794e54f7292140545d7..14dca1757d518814890d9866182b50e7
         }
     }
 
-@@ -2393,6 +2396,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2390,6 +2393,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         data.putLong("lastPlayed", System.currentTimeMillis());
         data.putString("lastKnownName", handle.getScoreboardName());
 
--- a/patches/server/0011-Add-config-for-offline-mode-warning.patch
+++ b/patches/server/0011-Add-config-for-offline-mode-warning.patch
@@ -31,10 +31,10 @@ index 0000000000000000000000000000000000000000..502b93c7bda9e8577a1901a8777b7cf9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index af3eedca870fdf01e9ff82e6b6595ef9b3a9a0a8..fd00ae1315bafeb24247943e5c84b107a783eea3 100644
+index 09bde51d3da062c5788151c15c448eaf2a02ea1b..6f86f25efbd4e6e79476c1563dc8f4c114c10695 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -295,7 +295,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -294,7 +294,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
         String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord";
         String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/";
         // Paper end - Add Velocity IP Forwarding Support
--- a/patches/server/0013-Add-a-simple-watchdog-for-tick-regions.patch
+++ b/patches/server/0013-Add-a-simple-watchdog-for-tick-regions.patch
@@ -243,10 +243,10 @@ index 0000000000000000000000000000000000000000..6b4368cdf9762ad981345fef0f26cd00
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index be87d0d8d5db0e10fb006d61389af79d7f03a7b7..b4b7f58d6780277c0dfaee22136885fa32e67761 100644
+index 45f96e545a1a9883c9925d49f5eb69968313a0e9..97016c309d0a0fc13d733269f7dfb81ca0d8c574 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1227,6 +1227,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1226,6 +1226,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
             this.statusIcon = (ServerStatus.Favicon) this.loadStatusIcon().orElse(null); // CraftBukkit - decompile error
             this.status = this.buildServerStatus();
 
--- a/patches/server/0047-Sparkly-Paper-Optimize-canSee-checks.patch
+++ b/patches/server/0047-Sparkly-Paper-Optimize-canSee-checks.patch
@@ -18,7 +18,7 @@ index c547d51eebd965f2be7ac45bc0981626c0515ef1..b7d91b7e8eb31f838cf540246f2d9b9c
                 }
                 // CraftBukkit end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 14dca1757d518814890d9866182b50e7e22ebf58..e427a583f750b302b69f0ce366fdde758e6576f7 100644
+index ed4bdf27c38d881fd3896a736652686ff9107f16..eb5ec3637aedb643801f369e43d39ef987546ce0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -198,7 +198,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -45,6 +45,6 @@ index 14dca1757d518814890d9866182b50e7e22ebf58..e427a583f750b302b69f0ce366fdde75
 +    }
 +    // SparklyPaper end
 +
-     public boolean canSee(UUID uuid) {
+     public boolean canSeePlayer(UUID uuid) {
         org.bukkit.entity.Entity entity = this.getServer().getPlayer(uuid);
-         if (entity == null) {
+ 
--- a/patches/server/0049-Purpur-use-alternative-keep-alive.patch
+++ b/patches/server/0049-Purpur-use-alternative-keep-alive.patch
@@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..43bbc2c30bdd3872a0179e0070403c3e
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index e25918c403ddcca87dd64d36b06f7466e2c99bd8..1664e2bd606bc38ce1fa8ac18cffe2a51944fadb 100644
+index f907dbb55369395058091dd75ae435d2025d94dd..20720424f5e63d07c885759b8b5104311aa6c7c8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
@@ -73,6 +73,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -77,8 +77,8 @@ index e25918c403ddcca87dd64d36b06f7466e2c99bd8..1664e2bd606bc38ce1fa8ac18cffe2a5
 +            }
 +        } else {
 +
-         if (!this.isSingleplayerOwner() && elapsedTime >= KEEPALIVE_LIMIT) { // Paper - check keepalive limit, don't fire if already disconnected
-             if (this.keepAlivePending && !this.processedDisconnect) { // Paper
+         if (!this.isSingleplayerOwner() && elapsedTime >= 15000L) { // Paper - use vanilla's 15000L between keep alive packets
+             if (this.keepAlivePending && !this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // Paper - check keepalive limit, don't fire if already disconnected
                 this.disconnect(ServerCommonPacketListenerImpl.TIMEOUT_DISCONNECTION_MESSAGE, org.bukkit.event.player.PlayerKickEvent.Cause.TIMEOUT); // Paper - kick event cause
@@ -275,6 +300,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
             }
--- a/patches/server/0051-KioCG-Chunk-API.patch
+++ b/patches/server/0051-KioCG-Chunk-API.patch
@@ -102,10 +102,10 @@ index 0000000000000000000000000000000000000000..53b4397997bc9b9b9d88e48304b37a25
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b4b7f58d6780277c0dfaee22136885fa32e67761..5c3dd60a4921f6cba5061118794124318fa17c5b 100644
+index 97016c309d0a0fc13d733269f7dfb81ca0d8c574..e169a9d4c2e633fdba3fe425e2f3f766d2200af5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1700,6 +1700,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1699,6 +1699,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         }
         // Folia end - region threading
 
@@ -123,7 +123,7 @@ index b4b7f58d6780277c0dfaee22136885fa32e67761..5c3dd60a4921f6cba506111879412431
         // Folia - region threading
         if (region == null) this.tickRateManager.tick(); // Folia - region threading
         this.tickChildren(shouldKeepTicking, region); // Folia - region threading
-@@ -1709,6 +1720,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1708,6 +1719,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         }
 
         // Folia - region threading
@@ -183,7 +183,7 @@ index 12c46e7a3f6a8675921d95dee97ece4a83252282..573cca66b905c5decb0e59c58cfa861d
         } else {
             passenger.stopRiding();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f87c7a77b8d5748c08488470bf60ea84ab95a819..d356d08f00620780b31cf717ade6c86a23ea0ab9 100644
+index 24f4370b35d2cc50340de36d81b6c6d9aa250e4c..c04058a95dc4990cd8034b381f95affcdc77dd93 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -351,6 +351,25 @@ public class ServerPlayer extends Player {
@@ -427,10 +427,10 @@ index 82b4bd669c57b18fb0b443bcd94495023cd5a528..abd845a124dbe0b9a1868ce378a0b7c7
 +    // KioCG end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e427a583f750b302b69f0ce366fdde758e6576f7..5c0dd79c3e9a76d8dc29134dcc41641d1b09e359 100644
+index eb5ec3637aedb643801f369e43d39ef987546ce0..ae53333f8ebffea8874259495026484b003d1ad9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3547,4 +3547,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3544,4 +3544,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
     public void setSendViewDistance(final int viewDistance) {
         this.getHandle().setSendViewDistance(viewDistance);
     }