Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-19 15:09:25 +00:00
Code Issues Releases Activity

Updated Upstream (Gale)

Browse Source
This commit is contained in:
Dreeam
2023-08-25 03:11:14 -04:00
parent 7626a8a505
commit 51aa02c8e3
36 changed files with 271 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -17,7 +17,7 @@ repositories {
}
dependencies {
remapper("net.fabricmc:tiny-remapper:0.8.8:fat")
remapper("net.fabricmc:tiny-remapper:0.8.9:fat")
decompiler("org.vineflower:vineflower:1.9.2")
paperclip("io.papermc:paperclip:3.0.4-SNAPSHOT")
}

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = org.dreeam.leaf
version = 1.20.1-R0.1-SNAPSHOT
galeCommit = f6e1bd84e832f42a0a217e6824cb6b03772262cf
galeCommit = c8e7259cfddc1e69da4f5f3604f8eb3a25ee1cfd
org.gradle.caching = true
org.gradle.parallel = true

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

22
patches/api/0002-Purpur-API-Changes.patch
View File

@@ -53,10 +53,10 @@ index a736d7bcdc5861a01b66ba36158db1c716339346..22fc165fd9c95f0f3ae1be7a0857e48c
@Override
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index cf5cae753357bbe82d280a5c83800be2bb83f299..fc090ec47cf4ea78e2984b60cebbd486aca5d0d7 100644
index c0d0604e8d5d1ebf3a3d665a55a02ea12416465f..29f2fcfad0f563c3bd500b2ca7d84f453df23798 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2781,4 +2781,127 @@ public final class Bukkit {
@@ -2823,4 +2823,127 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -439,10 +439,10 @@ index 9b84cb5abdf3db55cbc7ba19c8cd6955bf4fc5ec..5616d2acfa8180f71ae4123845fc1265
+ // Purpur end - OfflinePlayer API
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 093ba28cc5ab0bf5ef4a9198c1231d160713dbe7..38bcfc1e517e7a4b1edccb5c9eba85c853cfc2fe 100644
index 9ff34994f2a4dcf0b10262aacc912d7d283c121e..bd93eb61669a014054cb1ba71f99d74ba8463622 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2134,6 +2134,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2174,6 +2174,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
// Paper end
@@ -461,7 +461,7 @@ index 093ba28cc5ab0bf5ef4a9198c1231d160713dbe7..38bcfc1e517e7a4b1edccb5c9eba85c8
/**
* Sends the component to the player
*
@@ -2443,4 +2455,111 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2483,4 +2495,111 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
long getLastTickOversleepTime();
// Gale end - YAPFA - last tick time - API
@@ -813,13 +813,13 @@ index 138d2530de2410f4a9424dabd3e5ce0cd1c1dcd2..10a8d64ad2da0be2c14f34c3e7d1957c
// Paper start
/**
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 6b842453589cf148ab32c1507cf374056826316e..af421c1e9ad155e190dc3fe67ed24e96857d9e33 100644
index 762cb07861ca8ff058ce8d57ea6c15df1e588bf3..98de85d1382fe84cdc2e2c9db04bf1b4f157291c 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -965,4 +965,55 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1049,4 +1049,55 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@NotNull io.papermc.paper.threadedregions.scheduler.EntityScheduler getScheduler();
// Paper end - Folia schedulers
@NotNull String getScoreboardEntryName();
// Paper end - entity scoreboard name
+
+ // Purpur start
+ /**
@@ -1036,10 +1036,10 @@ index bc84b892cae5fe7019a3ad481e9da79956efa1fe..48eb5b00c460cccde29d327cef1d63fc
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index da3e990b2e888387736ffda4a6c9165c5d84248e..e6bfe7346d200c569900d3fd96a217d755e0dd0c 100644
index 60df0fd1d3ef021cb6aecd8075a1ae87eac5d9eb..d1025b65d159ad3bf99157570b8b81fdb759ac34 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3253,4 +3253,143 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3283,4 +3283,143 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end

4
patches/api/0003-Leaf-config-files.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Leaf config files
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 38bcfc1e517e7a4b1edccb5c9eba85c853cfc2fe..11c597d20752b7a6d6cc3e6cf762bc086e0cb4a8 100644
index bd93eb61669a014054cb1ba71f99d74ba8463622..c55819f56b4a3850496feef6900c1ec8a0bb1a9d 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2146,6 +2146,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2186,6 +2186,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
}
// Purpur end

23
patches/api/0004-Bump-Dependencies.patch
View File

@@ -5,12 +5,12 @@ Subject: [PATCH] Bump Dependencies
diff --git a/build.gradle.kts b/build.gradle.kts
index 9796d6d0a1b8fba6f694e8c4d9446d0887aed1ee..c0e36947d161033ff66b76c6ddbc6fdb714c4c0f 100644
index c4653ddd2c087d14d7415d55fc8e6faab0b3b8ff..71039c1476b088c77b84838f705498b4c4f981f1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,8 +9,8 @@ java {
}
@@ -11,8 +11,8 @@ java {
val annotationsVersion = "24.0.1"
val bungeeCordChatVersion = "1.20-R0.1"
val adventureVersion = "4.14.0"
-val slf4jVersion = "1.8.0-beta4"
-val log4jVersion = "2.17.1"
@@ -19,17 +19,16 @@ index 9796d6d0a1b8fba6f694e8c4d9446d0887aed1ee..c0e36947d161033ff66b76c6ddbc6fdb
val apiAndDocs: Configuration by configurations.creating {
attributes {
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
@@ -27,16 +27,16 @@ val annotationsVersion = "24.0.1"
@@ -27,16 +27,16 @@ configurations.api {
dependencies {
// api dependencies are listed transitively to API consumers
- api("com.google.guava:guava:31.1-jre")
- api("com.google.code.gson:gson:2.10")
- api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.9") // Paper
- api("org.yaml:snakeyaml:2.0")
+ api("com.google.guava:guava:32.1.2-jre") // Leaf - Bump Dependencies
+ api("com.google.code.gson:gson:2.10.1")
+ api("net.md-5:bungeecord-chat:1.20-R0.1-SNAPSHOT") // Paper // Leaf - Bump Dependencies
+ api("com.google.code.gson:gson:2.10.1") // Leaf - Bump Dependencies
api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") // Paper
- api("org.yaml:snakeyaml:2.0")
+ api("org.yaml:snakeyaml:2.1") // Leaf - Bump Dependencies
api("org.joml:joml:1.10.5")
// Paper start
@@ -85,7 +84,7 @@ index 9796d6d0a1b8fba6f694e8c4d9446d0887aed1ee..c0e36947d161033ff66b76c6ddbc6fdb
}
configure<PublishingExtension> {
@@ -117,8 +120,8 @@ tasks.withType<Javadoc> {
@@ -123,8 +126,8 @@ tasks.withType<Javadoc> {
options.use()
options.isDocFilesSubDirs = true
options.links(
@@ -95,8 +94,8 @@ index 9796d6d0a1b8fba6f694e8c4d9446d0887aed1ee..c0e36947d161033ff66b76c6ddbc6fdb
+ "https://javadoc.io/doc/org.yaml/snakeyaml/2.1/", // Leaf - Bump Dependencies
"https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
// Paper start
//"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", // don't link to bungee chat
@@ -163,6 +166,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
// "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // don't link to bungee chat
@@ -169,6 +172,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
jarToScan.set(tasks.jar.flatMap { it.archiveFile })
classpath.from(configurations.compileClasspath)
}

4
patches/api/0006-KeYi-Player-Skull-API.patch
View File

@@ -7,7 +7,7 @@ Original license: MIT
Original project: https://github.com/KeYiMC/KeYi
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index e6bfe7346d200c569900d3fd96a217d755e0dd0c..d5f3c795fa5f18a7deadd7160b26c074ad5ca2b4 100644
index d1025b65d159ad3bf99157570b8b81fdb759ac34..37668e737e7b507757c70e432a19647db6628b81 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -8,8 +8,11 @@ import java.util.Collection;
@@ -23,7 +23,7 @@ index e6bfe7346d200c569900d3fd96a217d755e0dd0c..d5f3c795fa5f18a7deadd7160b26c074
import org.bukkit.DyeColor;
import org.bukkit.Effect;
import org.bukkit.GameMode;
@@ -3392,4 +3395,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3422,4 +3425,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
sendDeathScreen(message);
}
// Purpur end

4
patches/api/0007-Slice-Smooth-Teleports.patch
View File

@@ -7,10 +7,10 @@ Original license: MIT
Original project: https://github.com/Cryptite/Slice
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index d5f3c795fa5f18a7deadd7160b26c074ad5ca2b4..d1c916caa04472a88a6f7b091045aec1ce8a4db2 100644
index 37668e737e7b507757c70e432a19647db6628b81..8c596943784070915675fd3dc6dcb22c5b2d1a09 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3138,6 +3138,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3168,6 +3168,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
String getClientBrandName();
// Paper end

4
patches/api/0008-Revert-Purpur-Fire-Immunity-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Revert Purpur Fire Immunity API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index af421c1e9ad155e190dc3fe67ed24e96857d9e33..964ec7bd70fcdfcffd51b310cdea84c7c5db6c95 100644
index 98de85d1382fe84cdc2e2c9db04bf1b4f157291c..52867495d0f746ff40e802c4f1018511e58fd03e 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1002,18 +1002,5 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1086,18 +1086,5 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* @return True if in daylight
*/
boolean isInDaylight();

8
patches/server/0001-Rebrand.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
diff --git a/build.gradle.kts b/build.gradle.kts
index a0237112353240d9c8d0dc733f9176fd7e95f007..d794a8e459e21ecf2b77a3b4e5a290211c52a319 100644
index 4466f21a83cb9ddca7309a194afcb8eded92de81..cc9c8cbefbce8cc31effe914227b78272374eae1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ val alsoShade: Configuration by configurations.creating
@@ -73,10 +73,10 @@ index e45e6b44b2a8f2cdae6e0048a812b92126aa17ca..b5f3f213da8a40d5184098af017c8e26
.completer(new ConsoleCommandCompleter(this.server))
.option(LineReader.Option.COMPLETE_IN_WORD, true);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 77dd3605bede2f8d2574961a21560df4631f6277..6246949f1f0eea1b8177ebae61cab11d66f642df 100644
index 2649d01a1fb8633dc47350f0078ea24aee22ebb6..d246a268d22a02e5200fd7da189a1fda6914af1d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -906,7 +906,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -911,7 +911,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
We do not want people to report thread issues to Paper,
but we do want people to report thread issues to Gale.
*/
@@ -86,7 +86,7 @@ index 77dd3605bede2f8d2574961a21560df4631f6277..6246949f1f0eea1b8177ebae61cab11d
while (this.getRunningThread().isAlive()) {
this.getRunningThread().stop();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 094b79e57fe687d5c410477680e822b1cceba0be..a907bfa9347a333282ceb708d720e5b9090a31e0 100644
index 5d3a5bdd8e223ff45320d3a8ac9e57d5d7ff02bf..f44bb05c9478ec9a4d9c512fa1b6fc3a8acd5949 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

26
patches/server/0005-Pufferfish-Optimize-mob-spawning.patch
View File

@@ -20,7 +20,7 @@ and, in my opinion, worth the low risk of minor mob-spawning-related
inconsistencies.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6246949f1f0eea1b8177ebae61cab11d66f642df..3f8f0c991f563a1f4622f4da3e31dc4d33ce40aa 100644
index d246a268d22a02e5200fd7da189a1fda6914af1d..761ae1cf870fedeb6db3328447159595b86d8d72 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -298,6 +298,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -44,7 +44,7 @@ index 64bc644029dc9fa3cb802b58ecd8f197c3c4ad5b..06838ae0d1eb0f0976a6290d35a30297
}
}
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 767f27759c3372b80d65f00195fcb49e8215fdf4..1984b29fc2830a6dcc8e443f241f24987c0d0c9d 100644
index be0210aef3805237adb0142d3eb8b4a76a3270e5..bdaf3a157b9f9d8158d8112b0986c80f73b161a7 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -342,7 +342,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -57,7 +57,7 @@ index 767f27759c3372b80d65f00195fcb49e8215fdf4..1984b29fc2830a6dcc8e443f241f2498
this.playerEntityTrackerTrackMaps = new com.destroystokyo.paper.util.misc.PlayerAreaMap[TRACKING_RANGE_TYPES.length];
this.entityTrackerTrackRanges = new int[TRACKING_RANGE_TYPES.length];
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index 3c9ff57cf8cf7e7bfca234e460ff869165bd40d3..259727ca7956416afa0f425fc203103654673cef 100644
index 075c476cdf02ece97c5e0032726ae1b560825ce1..aa81852cf5afe76bbba6dd7eef774ba5201f89c3 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -75,6 +75,9 @@ public class ServerChunkCache extends ChunkSource {
@@ -70,19 +70,21 @@ index 3c9ff57cf8cf7e7bfca234e460ff869165bd40d3..259727ca7956416afa0f425fc2031036
private static int getChunkCacheKey(int x, int z) {
return x & 3 | ((z & 3) << 2);
@@ -553,18 +556,25 @@ public class ServerChunkCache extends ChunkSource {
@@ -553,6 +556,8 @@ public class ServerChunkCache extends ChunkSource {
int l = this.distanceManager.getNaturalSpawnChunkCount();
// Paper start - per player mob spawning
if ((this.spawnFriendlies || this.spawnEnemies) && this.chunkMap.playerMobDistanceMap != null) { // don't count mobs when animals and monsters are disabled
- // re-set mob counts
- for (ServerPlayer player : this.level.players) {
- Arrays.fill(player.mobCounts, 0);
+ // Pufferfish start - moved down when async processing
+ if (!org.dreeam.leaf.LeafConfig.enableAsyncMobSpawning) {
+ // re-set mob counts
+ for (ServerPlayer player : this.level.players) {
+ Arrays.fill(player.mobCounts, 0);
// re-set mob counts
for (ServerPlayer player : this.level.players) {
// Paper start - per player mob spawning backoff
@@ -565,16 +570,21 @@ public class ServerChunkCache extends ChunkSource {
}
player.mobBackoffCounts[ii] = newBackoff;
}
+ }
// Paper end - per player mob spawning backoff
+ lastSpawnState = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, null, true);
}
- spawnercreature_d = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, null, true);
@@ -102,7 +104,7 @@ index 3c9ff57cf8cf7e7bfca234e460ff869165bd40d3..259727ca7956416afa0f425fc2031036
// Gale start - MultiPaper - skip unnecessary mob spawning computations
} else {
spawnercreature_d = null;
@@ -604,8 +614,8 @@ public class ServerChunkCache extends ChunkSource {
@@ -614,8 +624,8 @@ public class ServerChunkCache extends ChunkSource {
if ((true || this.level.isNaturalSpawningAllowed(chunkcoordintpair)) && this.chunkMap.anyPlayerCloseEnoughForSpawning(holder, chunkcoordintpair, false)) { // Paper - optimise anyPlayerCloseEnoughForSpawning // Paper - the chunk is known ticking
chunk1.incrementInhabitedTime(j);
@@ -113,7 +115,7 @@ index 3c9ff57cf8cf7e7bfca234e460ff869165bd40d3..259727ca7956416afa0f425fc2031036
}
if (true || this.level.shouldTickBlocksAt(chunkcoordintpair.toLong())) { // Paper - the chunk is known ticking
@@ -663,6 +673,29 @@ public class ServerChunkCache extends ChunkSource {
@@ -673,6 +683,29 @@ public class ServerChunkCache extends ChunkSource {
}
// Paper end - controlled flush for entity tracker packets
}

14
patches/server/0006-Pufferfish-Dynamic-Activation-of-Brain.patch
View File

@@ -42,10 +42,10 @@ index 1462f9d4f2cdf4071fb002d602783866a5a3d285..5d6c0f5d2d993ae3a044a1a02716a266
if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
entity.discard();
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 05a7f024848048b7bca227212584e2ccc82200f7..25225cd9d31df9084a5c53c504607978722ee507 100644
index 5872824b58d65208f21379ebd4fca918da323c32..edfb51e5c54d443926d0c051a3732a97dcecbd00 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -435,6 +435,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -436,6 +436,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
// Paper end
@@ -357,12 +357,12 @@ index 5d161351e7517acf57e98203bab8c9f9ab9d4005..47c7b75b721bb2210eded56a7590612f
private static void network() {
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 50cd68e40c67b83af4e8008ce93782a060658dd4..9186aa5baf313f45b4befe6f062566b6698f6702 100644
index 392c57d0365cc4371f58637ebac11e2b7492bf97..de4ea65a2bead3f20b205df28656d43636ba16df 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -39,6 +39,9 @@ import net.minecraft.world.entity.schedule.Activity;
import net.minecraft.world.level.Level;
@@ -40,6 +40,9 @@ import net.minecraft.world.level.Level;
import net.minecraft.world.phys.AABB;
import org.galemc.gale.configuration.GaleGlobalConfiguration;
import org.galemc.gale.configuration.GaleWorldConfiguration;
+// Pufferfish start
+import net.minecraft.world.phys.Vec3;
@@ -370,7 +370,7 @@ index 50cd68e40c67b83af4e8008ce93782a060658dd4..9186aa5baf313f45b4befe6f062566b6
public class ActivationRange
{
@@ -231,6 +234,25 @@ public class ActivationRange
@@ -232,6 +235,25 @@ public class ActivationRange
for (int i = 0; i < entities.size(); i++) {
Entity entity = entities.get(i);
ActivationRange.activateEntity(entity);
@@ -396,7 +396,7 @@ index 50cd68e40c67b83af4e8008ce93782a060658dd4..9186aa5baf313f45b4befe6f062566b6
}
// Paper end
}
@@ -247,12 +269,12 @@ public class ActivationRange
@@ -248,12 +270,12 @@ public class ActivationRange
if ( MinecraftServer.currentTick > entity.activatedTick )
{
if ( entity.defaultActivationState )

4
patches/server/0008-Pufferfish-Entity-TTL.patch
View File

@@ -7,10 +7,10 @@ Original license: GPL v3
Original project: https://github.com/pufferfish-gg/Pufferfish
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 25225cd9d31df9084a5c53c504607978722ee507..1d3977fe43c75c955160bf8d9775182e20be7dcb 100644
index edfb51e5c54d443926d0c051a3732a97dcecbd00..31d248b0a3ec735edff3aeb5e00fd009940013da 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -826,6 +826,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -828,6 +828,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public void tick() {

370
patches/server/0010-Purpur-Server-Changes.patch
View File

File diff suppressed because it is too large Load Diff

6
patches/server/0011-Purpur-Configurable-server-mod-name.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur: Configurable server mod name
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1a6b8b764a762821e5b7b2342658df7bc09323c3..8f6dced165b6b35579f6efe4396864ae40a5a361 100644
index 056d5541b2bc563e479ef3c8f63f41fdea7bc23a..65f6160b9c6d79f8b9511bec953ecd0d3c04b7d8 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1679,7 +1679,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1684,7 +1684,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -34,7 +34,7 @@ index 9299d2fe1cda71b6881fd8bd65d3d74b1189a196..80a196442edbc6b4eb44bb6a40510087
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index b974b59d421cf97bc9547ea75fe4643d89639bc1..0f771b628481ce98e3a6c248ce771894e4d9c1e6 100644
index fc2d05b44cfe1db4bddb6073caeb729a6aec7034..cca5d9efc37ff4881645aeeaa08ae02ea1fbb97d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -229,11 +229,6 @@ public class PurpurConfig {

9
patches/server/0012-Bump-Dependencies.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
diff --git a/build.gradle.kts b/build.gradle.kts
index 44c9a53c347c88ed92ab1b516a5e04f7bdac6e7e..3f6eac098c7c22ecf08ae1bab5391a9c0cafe3e6 100644
index 15ac7e418105f9c6780b28055edfba888156ed42..c32433bcacd57a4c90051e64541e7830c3fde27a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
@@ -88,10 +88,11 @@ index 44c9a53c347c88ed92ab1b516a5e04f7bdac6e7e..3f6eac098c7c22ecf08ae1bab5391a9c
}
val craftbukkitPackageVersion = "1_20_R1" // Paper
@@ -241,3 +247,6 @@ tasks.registerRunTask("runDev") {
description = "Spin up a non-relocated Mojang-mapped test server"
classpath(sourceSets.main.map { it.runtimeClasspath })
@@ -260,3 +266,7 @@ sourceSets {
}
}
// Gale end - package license into jar
+
+repositories {
+ mavenCentral()
+}

4
patches/server/0015-Remove-UseItemOnPacket-Too-Far-Check.patch
View File

@@ -7,10 +7,10 @@ This Check is added in 1.17.x -> 1.18.x update by Mojang.
By removing this check, it enable hackers to use some modules of hack clients.
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 59eaa377ca7201d2c634ef30f588969b36f4d6e3..281a2eeed84b8d4c1db808edf0d40d5e1971c742 100644
index b959abd801fa2d0646375a388f1d9053fff88f29..823ad91c82d96477655d9f895483a3dd07f30e84 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2089,7 +2089,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2101,7 +2101,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
Vec3 vec3d2 = vec3d.subtract(vec3d1);
double d0 = 1.0000001D;

6
patches/server/0017-KeYi-Player-Skull-API.patch
View File

@@ -7,7 +7,7 @@ Original license: MIT
Original project: https://github.com/KeYiMC/KeYi
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index cdbbdb3f5a8b43811c564d1444a2b102add3ba72..01df6c21ea460fd0be1188088767dcb534db37ae 100644
index 018cf3cd424ac85e8d84179bc05ab241f0a00827..3b769a430b736ea77d331e7bfea9c33b59868509 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -29,6 +29,11 @@ import java.util.Optional;
@@ -22,7 +22,7 @@ index cdbbdb3f5a8b43811c564d1444a2b102add3ba72..01df6c21ea460fd0be1188088767dcb5
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.annotation.Nullable;
@@ -164,6 +169,7 @@ import org.bukkit.event.player.PlayerUnregisterChannelEvent;
@@ -163,6 +168,7 @@ import org.bukkit.event.player.PlayerUnregisterChannelEvent;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.InventoryView.Property;
import org.bukkit.inventory.ItemStack;
@@ -30,7 +30,7 @@ index cdbbdb3f5a8b43811c564d1444a2b102add3ba72..01df6c21ea460fd0be1188088767dcb5
import org.bukkit.map.MapCursor;
import org.bukkit.map.MapView;
import org.bukkit.metadata.MetadataValue;
@@ -3329,4 +3335,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3377,4 +3383,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundPlayerCombatKillPacket(getEntityId(), io.papermc.paper.adventure.PaperAdventure.asVanilla(message)));
}
// Purpur end

4
patches/server/0021-Carpet-Fixes-Use-optimized-RecipeManager.patch
View File

@@ -11,7 +11,7 @@ This is a fully vanilla optimization. Improves: [Blast]Furnace/Campfire/Smoker/S
This was mostly made for the auto crafting table, since the performance boost is much more visible while using that mod
diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
index ab6dc3449a1d3b7acf1d7bf5ac1c24224cc252c7..15db40b1bcf56e0eecb9b4a709aa0e4c1e8c9b75 100644
index 9ffb6999171f602f0b113dac40e0130410cad870..3efac27f360b45e53a11374cf9a051f9eee8ddf3 100644
--- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
+++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
@@ -11,8 +11,8 @@ import com.google.gson.JsonParseException;
@@ -24,7 +24,7 @@ index ab6dc3449a1d3b7acf1d7bf5ac1c24224cc252c7..15db40b1bcf56e0eecb9b4a709aa0e4c
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
@@ -131,7 +131,7 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
@@ -134,7 +134,7 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
}
public <C extends Container, T extends Recipe<C>> List<T> getAllRecipesFor(RecipeType<T> type) {

10
patches/server/0023-Slice-Smooth-Teleports.patch
View File

@@ -7,10 +7,10 @@ Original license: MIT
Original project: https://github.com/Cryptite/Slice
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 7eb08a51474fa0ead38c57ee7b486a68f47251ab..9bac4b009ae35f86b1a3fa0215620eb695d12752 100644
index ac12549e49f824aded913eb131117b750ea3db1b..49310193515273c1388dea7b651314bf7791d36a 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -283,6 +283,7 @@ public class ServerPlayer extends Player {
@@ -284,6 +284,7 @@ public class ServerPlayer extends Player {
private boolean ramBar = false; // Purpur
private boolean tpsBar = false; // Purpur
private boolean compassBar = false; // Purpur
@@ -19,10 +19,10 @@ index 7eb08a51474fa0ead38c57ee7b486a68f47251ab..9bac4b009ae35f86b1a3fa0215620eb6
private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 155e5f5df5ba2d908f86d46fcff255469ba84597..0a927f938089e2d5dde9b3ab07e554d38014d118 100644
index 3f60073c5ced65abf67f6fe175f9032c7bf49cfa..ba45ab1a76c9f98b134d0bd9798fa9a9830dbdac 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -945,12 +945,12 @@ public abstract class PlayerList {
@@ -953,12 +953,12 @@ public abstract class PlayerList {
int i = flag ? 1 : 0;
// CraftBukkit start
LevelData worlddata = worldserver1.getLevelData();
@@ -38,7 +38,7 @@ index 155e5f5df5ba2d908f86d46fcff255469ba84597..0a927f938089e2d5dde9b3ab07e554d3
// entityplayer1.connection.teleport(entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot());
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 01df6c21ea460fd0be1188088767dcb534db37ae..b9e3eadb481b07d339e92d1a9f6d7f0c91095f6a 100644
index 3b769a430b736ea77d331e7bfea9c33b59868509..7675c36f0f31301964cdd35860c1295f6d827d18 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1258,6 +1258,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

54
patches/server/0024-PaperPR-Optimize-VarInts.patch
View File

@@ -1,54 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: astei <andrew@steinborn.me>
Date: Sat, 1 Oct 2022 09:56:47 +0200
Subject: [PATCH] PaperPR: Optimize VarInts
Original license: GPLv3
Original project: https://github.com/PaperMC/Velocity
Paper pull request: https://github.com/PaperMC/Paper/pull/8418
diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
index 1f4b64a5f812376c499c98cb4be62469bd0b7dbe..1f4320d8243cc64b86892c23c601d14101d5a7ad 100644
--- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
+++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
@@ -105,6 +105,18 @@ public class FriendlyByteBuf extends ByteBuf {
}
public static int getVarIntSize(int value) {
+ //Paper start - Optimize VarInts
+ return VARINT_EXACT_BYTE_LENGTHS[Integer.numberOfLeadingZeros(value)]; // Paper - Optimize VarInts
+ }
+ private static final int[] VARINT_EXACT_BYTE_LENGTHS = new int[33];
+ static {
+ for (int i = 0; i <= 32; ++i) {
+ VARINT_EXACT_BYTE_LENGTHS[i] = (int) Math.ceil((31d - (i - 1)) / 7d);
+ }
+ VARINT_EXACT_BYTE_LENGTHS[32] = 1; // Special case for the number 0.
+ }
+ public static int getVarIntSize_(int value) {
+ //Paper end - Optimize VarInts
for (int j = 1; j < 5; ++j) {
if ((value & -1 << j * 7) == 0) {
return j;
@@ -615,6 +627,21 @@ public class FriendlyByteBuf extends ByteBuf {
}
public FriendlyByteBuf writeVarInt(int value) {
+ // Paper start - Optimize VarInts
+ // Peel the one and two byte count cases explicitly as they are the most common VarInt sizes
+ // that the proxy will write, to improve inlining.
+ if ((value & (0xFFFFFFFF << 7)) == 0) {
+ writeByte(value);
+ } else if ((value & (0xFFFFFFFF << 14)) == 0) {
+ int w = (value & 0x7F | 0x80) << 8 | (value >>> 7);
+ writeShort(w);
+ } else {
+ writeVarInt_(value);
+ }
+ return this;
+ }
+ public FriendlyByteBuf writeVarInt_(int value) {
+ // Paper end - Optimize VarInts
while ((value & -128) != 0) {
this.writeByte(value & 127 | 128);
value >>>= 7;

0
patches/server/0025-Parchment-Make-FixLight-use-action-bar.patch → patches/server/0024-Parchment-Make-FixLight-use-action-bar.patch
View File

12
patches/server/0026-Leaves-Server-Utils.patch → patches/server/0025-Leaves-Server-Utils.patch
View File

@@ -7,18 +7,18 @@ Original license: GPLv3
Original project: https://github.com/LeavesMC/Leaves
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 2763c93cc32b4b0954cb34c67cbeccd2258cd07c..0ef4711e37abee590abbfc249c9c6ffbf01265ce 100644
index 9038588608baec2e02c88a727662c903adcf5da6..eeb611aab2887fce1e5a15831da625d5766e0fc4 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -419,6 +419,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
@@ -420,6 +420,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public boolean collidingWithWorldBorder; // Paper
public boolean fixedPose = false; // Paper
public @Nullable Boolean immuneToFire = null; // Purpur - Fire immune API
+ private CompoundTag leavesData = new CompoundTag(); // Leaves - Leaves ex data
public void setOrigin(@javax.annotation.Nonnull Location location) {
this.origin = location.toVector();
@@ -2535,6 +2536,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2537,6 +2538,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
nbt.putBoolean("Purpur.FireImmune", immuneToFire);
}
// Purpur end
@@ -26,7 +26,7 @@ index 2763c93cc32b4b0954cb34c67cbeccd2258cd07c..0ef4711e37abee590abbfc249c9c6ffb
return nbt;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
@@ -2708,6 +2710,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2710,6 +2712,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
immuneToFire = nbt.getBoolean("Purpur.FireImmune");
}
// Purpur end
@@ -38,7 +38,7 @@ index 2763c93cc32b4b0954cb34c67cbeccd2258cd07c..0ef4711e37abee590abbfc249c9c6ffb
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
@@ -5042,4 +5049,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -5032,4 +5039,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return false;
}
// Purpur end

8
patches/server/0027-Leaves-Jade-Protocol.patch → patches/server/0026-Leaves-Jade-Protocol.patch
View File

@@ -9,7 +9,7 @@ Original project: https://github.com/LeavesMC/Leaves
This patch is Powered by Jade(https://github.com/Snownee/Jade)
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 281a2eeed84b8d4c1db808edf0d40d5e1971c742..379218906cb02702d3a723c0ab42e768409ecacd 100644
index 823ad91c82d96477655d9f895483a3dd07f30e84..577bcfdb715c116146c6e182073864b71b693385 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -250,6 +250,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -20,7 +20,7 @@ index 281a2eeed84b8d4c1db808edf0d40d5e1971c742..379218906cb02702d3a723c0ab42e768
// CraftBukkit end
public class ServerGamePacketListenerImpl implements ServerPlayerConnection, TickablePacketListener, ServerGamePacketListener {
@@ -3762,6 +3763,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3775,6 +3776,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
// Paper end
this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), packet.identifier.toString(), data);
@@ -31,7 +31,7 @@ index 281a2eeed84b8d4c1db808edf0d40d5e1971c742..379218906cb02702d3a723c0ab42e768
ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 0a927f938089e2d5dde9b3ab07e554d38014d118..847db9e18f0eebece00d49076ee8fababcd0c700 100644
index ba45ab1a76c9f98b134d0bd9798fa9a9830dbdac..848baa457daaf3ffbbcad46b1a7fe69eae347fea 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -358,6 +358,8 @@ public abstract class PlayerList {
@@ -57,7 +57,7 @@ index e91b4d63d42276f8a498cab7c439c785730f3f6f..a2d7c5008c6d6716d9530e00de0db027
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index cc34d64ae522f69d1d4cbd0be75c50e12e9371f1..98b31a9e7e5bad4cfa1f21afd6eb77dc3ea346ec 100644
index 40ce72ac4ca4f262ad77cf5ba47b8f2c8d9055d2..de1d2c270dc454b959694af03bb85b6e6616e336 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -484,6 +484,7 @@ public final class CraftServer implements Server {

10
patches/server/0028-Leaves-Appleskin-Protocol.patch → patches/server/0027-Leaves-Appleskin-Protocol.patch
View File

@@ -7,10 +7,10 @@ Original license: GPLv3
Original project: https://github.com/LeavesMC/Leaves
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 8f6dced165b6b35579f6efe4396864ae40a5a361..916362c7cdef8415b416d21b17d44b713f6e3160 100644
index 65f6160b9c6d79f8b9511bec953ecd0d3c04b7d8..70573e0319060aeb6e9d33f4ba96053c15be8377 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1587,6 +1587,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1592,6 +1592,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
GameTestTicker.SINGLETON.tick();
}
@@ -20,7 +20,7 @@ index 8f6dced165b6b35579f6efe4396864ae40a5a361..916362c7cdef8415b416d21b17d44b71
for (int i = 0; i < this.tickables.size(); ++i) {
((Runnable) this.tickables.get(i)).run();
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 847db9e18f0eebece00d49076ee8fababcd0c700..16e1bb93dfddb647d3cd11c6b467a16a1b16d5a9 100644
index 848baa457daaf3ffbbcad46b1a7fe69eae347fea..0928c96afd0c4eb7ab14705e7e4d5ac9f16f35c7 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -359,6 +359,7 @@ public abstract class PlayerList {
@@ -31,7 +31,7 @@ index 847db9e18f0eebece00d49076ee8fababcd0c700..16e1bb93dfddb647d3cd11c6b467a16a
final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
@@ -609,6 +610,7 @@ public abstract class PlayerList {
@@ -617,6 +618,7 @@ public abstract class PlayerList {
return this.remove(entityplayer, net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : PaperAdventure.asAdventure(entityplayer.getDisplayName())));
}
public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
@@ -40,7 +40,7 @@ index 847db9e18f0eebece00d49076ee8fababcd0c700..16e1bb93dfddb647d3cd11c6b467a16a
org.purpurmc.purpur.task.BossBarTask.removeFromAll(entityplayer.getBukkitEntity()); // Purpur
ServerLevel worldserver = entityplayer.serverLevel();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 98b31a9e7e5bad4cfa1f21afd6eb77dc3ea346ec..5b6c57a0ab0beb0f69ac8f53493ccfab04874cd0 100644
index de1d2c270dc454b959694af03bb85b6e6616e336..804a784cae66cdc876b94c94373478438d75fd5b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1083,6 +1083,13 @@ public final class CraftServer implements Server {

4
patches/server/0029-Leaves-Xaero-Map-Protocol.patch → patches/server/0028-Leaves-Xaero-Map-Protocol.patch
View File

@@ -7,10 +7,10 @@ Original license: GPLv3
Original project: https://github.com/LeavesMC/Leaves
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 16e1bb93dfddb647d3cd11c6b467a16a1b16d5a9..e1fac61e493282945bcd28e7a8c3a82647ce2c18 100644
index 0928c96afd0c4eb7ab14705e7e4d5ac9f16f35c7..cb77f0cb7628ecf75c42707a19bb2fc9d7395b53 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1356,6 +1356,7 @@ public abstract class PlayerList {
@@ -1364,6 +1364,7 @@ public abstract class PlayerList {
player.connection.send(new ClientboundInitializeBorderPacket(worldborder));
player.connection.send(new ClientboundSetTimePacket(world.getGameTime(), world.getDayTime(), world.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)));
player.connection.send(new ClientboundSetDefaultSpawnPositionPacket(world.getSharedSpawnPos(), world.getSharedSpawnAngle()));

0
patches/server/0030-Fix-Make-log4j-compatible-with-future-release.patch → patches/server/0029-Fix-Make-log4j-compatible-with-future-release.patch
View File

0
patches/server/0031-Fix-compile-error.patch → patches/server/0030-Fix-compile-error.patch
View File

0
patches/server/0032-sync-with-Gale-s-Optimize-villager-data-storage.patc.patch → patches/server/0031-sync-with-Gale-s-Optimize-villager-data-storage.patc.patch
View File

22
patches/server/0033-Revert-Purpur-Fire-Immunity-API.patch → patches/server/0032-Revert-Purpur-Fire-Immunity-API.patch
View File

@@ -5,18 +5,18 @@ Subject: [PATCH] Revert Purpur Fire Immunity API
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 0ef4711e37abee590abbfc249c9c6ffbf01265ce..3dc15fca6927e35275f1d6453a60d41d6c7c9d03 100644
index eeb611aab2887fce1e5a15831da625d5766e0fc4..3cb1fedcf7302ee1bb024e2a2c010e489f9f5bc7 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -418,7 +418,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
private UUID originWorld;
@@ -419,7 +419,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
public boolean collidingWithWorldBorder; // Paper
public boolean fixedPose = false; // Paper
- public @Nullable Boolean immuneToFire = null; // Purpur - Fire immune API
private CompoundTag leavesData = new CompoundTag(); // Leaves - Leaves ex data
public void setOrigin(@javax.annotation.Nonnull Location location) {
@@ -1853,7 +1852,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1855,7 +1854,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean fireImmune() {
@@ -25,7 +25,7 @@ index 0ef4711e37abee590abbfc249c9c6ffbf01265ce..3dc15fca6927e35275f1d6453a60d41d
}
public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
@@ -2531,11 +2530,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2533,11 +2532,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
nbt.putBoolean("Paper.FreezeLock", true);
}
// Paper end
@@ -37,7 +37,7 @@ index 0ef4711e37abee590abbfc249c9c6ffbf01265ce..3dc15fca6927e35275f1d6453a60d41d
nbt.put("Leaves.Data", leavesData); // Leaves - leaves ex data
return nbt;
} catch (Throwable throwable) {
@@ -2705,11 +2699,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2707,11 +2701,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
freezeLocked = nbt.getBoolean("Paper.FreezeLock");
}
// Paper end
@@ -50,11 +50,11 @@ index 0ef4711e37abee590abbfc249c9c6ffbf01265ce..3dc15fca6927e35275f1d6453a60d41d
if (nbt.contains("Leaves.Data")) {
leavesData = nbt.getCompound("Leaves.Data");
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index edd9fb7154d1082b3fe6d7b6e470f4f4c5459e4b..1445f52031104baf81e2b5373a400a588535b29d 100644
index 8973c8a3bad120e55269bf1b7b810284ad0fe14c..feeca8d318fa0b7b22e728baa3bf3269d42bf0a6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -218,16 +218,6 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
this.entity = entity;
@@ -224,16 +224,6 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
this.entityType = (type != null) ? type : EntityType.UNKNOWN;
}
- @Override
@@ -71,10 +71,10 @@ index edd9fb7154d1082b3fe6d7b6e470f4f4c5459e4b..1445f52031104baf81e2b5373a400a58
public boolean isInDaylight() {
return getHandle().isSunBurnTick();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
index ea15690da167ec5e653da6f5afb55b33c45d1622..09001578b88658c44d0661d340a0ee0f1ded6911 100644
index 4ffb4046b63cbc140c76721f51c9a7a09e81844d..8fcee0e426cd598ddfd7e12df4382d57d2016780 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
@@ -182,14 +182,9 @@ public class CraftItem extends CraftEntity implements Item {
@@ -176,14 +176,9 @@ public class CraftItem extends CraftEntity implements Item {
return item.immuneToExplosion;
}

0
patches/server/0034-Petal-Reduce-sensor-work.patch → patches/server/0033-Petal-Reduce-sensor-work.patch
View File

0
patches/server/0035-Petal-Async-Pathfinding.patch → patches/server/0034-Petal-Async-Pathfinding.patch
View File

16
patches/server/0036-Petal-Multithreaded-Tracker.patch → patches/server/0035-Petal-Multithreaded-Tracker.patch
View File

@@ -231,10 +231,10 @@ index 66721a27cc9a373a12dffb72c4a403473377eff6..2bade6af443a39cd0f680fa6bdb22b13
public FullChunkStatus status;
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 194526c6e3ae338f163b02d7a8a34316db3bd3b3..6fc90433a87ff682e76fe37618dd9460518a8387 100644
index f192057ee342b9f09cc4ead1e605e1677b944ecd..9ff4472edf7ca079c9f3fe4afb8cbe242d7d280d 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -1242,8 +1242,35 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1261,8 +1261,35 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
entity.tracker = null; // Paper - We're no longer tracked
}
@@ -270,7 +270,7 @@ index 194526c6e3ae338f163b02d7a8a34316db3bd3b3..6fc90433a87ff682e76fe37618dd9460
this.level.timings.tracker1.startTiming();
try {
for (TrackedEntity tracker : this.entityMap.values()) {
@@ -1421,11 +1448,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1440,11 +1467,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
public class TrackedEntity {
@@ -285,7 +285,7 @@ index 194526c6e3ae338f163b02d7a8a34316db3bd3b3..6fc90433a87ff682e76fe37618dd9460
public TrackedEntity(Entity entity, int i, int j, boolean flag) {
this.serverEntity = new ServerEntity(ChunkMap.this.level, entity, j, flag, this::broadcast, this.seenBy); // CraftBukkit
@@ -1437,7 +1464,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1456,7 +1483,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
// Paper start - use distance map to optimise tracker
com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> lastTrackerCandidates;
@@ -294,7 +294,7 @@ index 194526c6e3ae338f163b02d7a8a34316db3bd3b3..6fc90433a87ff682e76fe37618dd9460
com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> oldTrackerCandidates = this.lastTrackerCandidates;
this.lastTrackerCandidates = newTrackerCandidates;
@@ -1479,14 +1506,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1498,14 +1525,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
}
public void broadcast(Packet<?> packet) {
@@ -312,7 +312,7 @@ index 194526c6e3ae338f163b02d7a8a34316db3bd3b3..6fc90433a87ff682e76fe37618dd9460
}
public void broadcastAndSend(Packet<?> packet) {
@@ -1498,18 +1522,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1517,18 +1541,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
}
public void broadcastRemoved() {
@@ -335,7 +335,7 @@ index 194526c6e3ae338f163b02d7a8a34316db3bd3b3..6fc90433a87ff682e76fe37618dd9460
if (this.seenBy.remove(player.connection)) {
this.serverEntity.removePairing(player);
}
@@ -1517,7 +1538,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1536,7 +1557,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
}
public void updatePlayer(ServerPlayer player) {
@@ -358,7 +358,7 @@ index ca42c2642a729b90d22b968af7258f3aee72e14b..c4d6d5be09c788bbc062c50d8547538e
public boolean visible = true;
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
index 7eed6e8f586055b87717a5c4ee39c640a03b883e..cc644fcc08c6ab881c4cf86d8fb4a1b7a91e7b74 100644
index 00e522a7db9ddfd0602e8423b2793f0bbd727b35..dc37a6cf4f64a950acc1743b71fbc3a425a557b1 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -277,7 +277,11 @@ public class ServerEntity {

0
patches/server/0037-Petal-Sync-event-calls-on-async-threads.patch → patches/server/0036-Petal-Sync-event-calls-on-async-threads.patch
View File

8
patches/server/0038-Fix-tracker-NPE.patch → patches/server/0037-Fix-tracker-NPE.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix tracker NPE
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 6fc90433a87ff682e76fe37618dd9460518a8387..755950c3797ccb3670f7cd12c941c226082ad010 100644
index 9ff4472edf7ca079c9f3fe4afb8cbe242d7d280d..fac039d8aac50ad989e1180735dcc1d9badab5c0 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -115,8 +115,6 @@ import org.bukkit.craftbukkit.generator.CustomChunkGenerator;
@@ -26,7 +26,7 @@ index 6fc90433a87ff682e76fe37618dd9460518a8387..755950c3797ccb3670f7cd12c941c226
// Paper - rewrite chunk system
// Paper start - optimise checkDespawn
@@ -1452,7 +1450,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1471,7 +1469,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
public final Entity entity; // Mirai -> public
private final int range;
SectionPos lastSectionPos;
@@ -36,7 +36,7 @@ index 6fc90433a87ff682e76fe37618dd9460518a8387..755950c3797ccb3670f7cd12c941c226
public TrackedEntity(Entity entity, int i, int j, boolean flag) {
this.serverEntity = new ServerEntity(ChunkMap.this.level, entity, j, flag, this::broadcast, this.seenBy); // CraftBukkit
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index 259727ca7956416afa0f425fc203103654673cef..6a5009b1935b11e4dd5a3dfb083df159d47da450 100644
index aa81852cf5afe76bbba6dd7eef774ba5201f89c3..7379cbb9ccfc235370d6ddd222785be71a7ee398 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -10,6 +10,7 @@ import java.util.Arrays;
@@ -55,7 +55,7 @@ index 259727ca7956416afa0f425fc203103654673cef..6a5009b1935b11e4dd5a3dfb083df159
public class ServerChunkCache extends ChunkSource {
@@ -642,7 +642,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -652,7 +652,7 @@ public class ServerChunkCache extends ChunkSource {
// Paper start - use set of chunks requiring updates, rather than iterating every single one loaded
this.level.timings.broadcastChunkUpdates.startTiming(); // Paper - timing
if (!this.chunkMap.needsChangeBroadcasting.isEmpty()) {

0
patches/server/0039-Cache-minecart-vehicle-collide-results.patch → patches/server/0038-Cache-minecart-vehicle-collide-results.patch
View File