Skip to content

Commit

Permalink
Updated Upstream (Gale/Purpur/dependencies)
Browse files Browse the repository at this point in the history
  • Loading branch information
Dreeam-qwq committed Nov 25, 2023
1 parent 4278129 commit af307b0
Show file tree
Hide file tree
Showing 14 changed files with 157 additions and 149 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
java
`maven-publish`
id("com.github.johnrengelman.shadow") version "8.1.1" apply false
id("io.papermc.paperweight.patcher") version "1.5.10-SNAPSHOT"
id("io.papermc.paperweight.patcher") version "1.5.11-SNAPSHOT"
}

val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
group = org.dreeam.leaf
version = 1.20.2-R0.1-SNAPSHOT

galeCommit = f54e07e42395f4a87725ffad4967bf46d62b0d24
galeCommit = bb7c13fdcf3ead1b3a81ca19314085f1921c4f88

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
4 changes: 2 additions & 2 deletions patches/api/0001-Leaf-config-files.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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 9ff34994f2a4dcf0b10262aacc912d7d283c121e..a5938b0a960121bd77a13e4c8fc8a053bea481c5 100644
index 0f15d0f049e3bd7461c5ebd22686e638f9bfe653..74317f10d7f7b31eac50b4fcff5b3cc96c12bce1 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2174,6 +2174,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2243,6 +2243,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

// Paper end

Expand Down
6 changes: 3 additions & 3 deletions patches/api/0002-Pufferfish-Sentry.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ Original license: GPL v3
Original project: https://github.com/pufferfish-gg/Pufferfish

diff --git a/build.gradle.kts b/build.gradle.kts
index d5d99ee9dca23783f5b70b96790143e689a49ae4..d6966b751c4ec3cae6f778f56ebb7ab52373959f 100644
index 6be021dcdef8283db51baa25e74570473afb9063..11ffb490c10ccea6e1d5fefa607466c981a48154 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -46,6 +46,7 @@ dependencies {
@@ -47,6 +47,7 @@ dependencies {
apiAndDocs("net.kyori:adventure-text-logger-slf4j")
api("org.apache.logging.log4j:log4j-api:$log4jVersion")
api("org.slf4j:slf4j-api:$slf4jVersion")
+ api("io.sentry:sentry:7.0.0-rc.1") // Pufferfish
+ api("io.sentry:sentry:7.0.0-rc.2") // Pufferfish

implementation("org.ow2.asm:asm:9.4")
implementation("org.ow2.asm:asm-commons:9.4")
Expand Down
36 changes: 18 additions & 18 deletions patches/api/0003-Purpur-API-Changes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes
Original license: MIT
Original project: https://github.com/PurpurMC/Purpur

Commit: ea2835bfe1e1625a02f7c7d26c06fe34a6674be1
Commit: 4b1a082c94ebc090bbc74b9230e4f43075090a29

Patches below are removed in this patch:
Pufferfish-API-Changes.patch
Expand Down Expand Up @@ -57,10 +57,10 @@ index a736d7bcdc5861a01b66ba36158db1c716339346..22fc165fd9c95f0f3ae1be7a0857e48c

@Override
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index c0d0604e8d5d1ebf3a3d665a55a02ea12416465f..29f2fcfad0f563c3bd500b2ca7d84f453df23798 100644
index 48808edcea2271d564390c637160881645f30489..8e6efa0dd4bc9ee4d20f6ef591f091e8e70faec0 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2823,4 +2823,127 @@ public final class Bukkit {
@@ -2899,4 +2899,127 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
Expand Down Expand Up @@ -279,10 +279,10 @@ index 918a045165cdcde264bc24082b7afebb407271de..687d11619379aead7f665d4a5f8f8bcc
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index da6e36a16e609272b60fc41ff69a6fa3c34926c0..eba4e7ebe3530fd8cb3ecbe72f703932df8721c9 100644
index 8c4ba0028f5c350a2906add58d9bf3d127a16f58..8ef4fa47e6721f5154316e81c2173cc4a42f4901 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -11050,4 +11050,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
@@ -11054,4 +11054,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
public boolean isEnabledByFeature(@NotNull World world) {
return Bukkit.getDataPackManager().isEnabledByFeature(this, world);
}
Expand Down Expand Up @@ -443,10 +443,10 @@ index bce07d84cafca677bb6fad78c21b82097f06430c..4ef0fa4f1ef72bb784674671473c6a32
+ // Purpur end - OfflinePlayer API
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index a5938b0a960121bd77a13e4c8fc8a053bea481c5..c55819f56b4a3850496feef6900c1ec8a0bb1a9d 100644
index 74317f10d7f7b31eac50b4fcff5b3cc96c12bce1..6282d9fe1bdf0add7bbd2eaa8916d345fe923a8b 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2174,6 +2174,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2243,6 +2243,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

// Paper end

Expand All @@ -465,7 +465,7 @@ index a5938b0a960121bd77a13e4c8fc8a053bea481c5..c55819f56b4a3850496feef6900c1ec8
// Leaf start
@NotNull
public org.bukkit.configuration.file.YamlConfiguration getLeafConfig()
@@ -2491,4 +2503,111 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2560,4 +2572,111 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
long getLastTickOversleepTime();
// Gale end - YAPFA - last tick time - API

Expand Down Expand Up @@ -578,7 +578,7 @@ index a5938b0a960121bd77a13e4c8fc8a053bea481c5..c55819f56b4a3850496feef6900c1ec8
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 17d404d6d1a5b46b58d612fca38f17e71adee92e..b012cc979e38ef1ef1ec61e71a887b91eb3de223 100644
index 5eb3521f5f91b0684b4beebf4f7ba2c795b41c42..cf63054e1b597b2bb13164722dd9a829ba7069ba 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -4160,6 +4160,86 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
Expand Down Expand Up @@ -956,10 +956,10 @@ index 58017fce436cdbda255f7172fbdadb726d4b113c..05600fc8bf2a61aca8094029bc4c208a
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 19e58e62ae442ef9be02ca7fa2f55e370a54afa4..994e026d68fcda9a4c34a8b161a06623f4437dff 100644
index a599ed2795ba1baf2cbb465d1c7145580c27e1ea..298acbfb93663e40e627f6a47d51fd87a1551feb 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1192,4 +1192,41 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1243,4 +1243,41 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
void setBodyYaw(float bodyYaw);
// Paper end
Expand Down Expand Up @@ -1027,10 +1027,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 da30f805556086c557bfd125c43f6ae791a8bdbd..d19e67b4a828727da0b8dcb8973c1deb09c28ade 100644
index d7bbc3d4fbb049b8656b4f0970ced8b955cf56bd..69357a7e78ce8813eac0babdd869edf6804f5c50 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3322,4 +3322,123 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3319,4 +3319,123 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end
Expand Down Expand Up @@ -1298,13 +1298,13 @@ index c60be4fd24c7fdf65251dd6169e5e1ac3b588d95..569deccd2f1cf21da9b5906433ac493c
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
index 1c4e0c7356047163a38f5ac4dd544129d0b36271..15bab5a00ebfde750b827569e407a5663d94411f 100644
index 0217f98a74140bbae454d467de27c12b6060ca75..444b021691ea90ee3c87f4e47d4e8c48ef404a8f 100644
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
@@ -299,4 +299,15 @@ public interface ItemFactory {
@Deprecated
net.md_5.bungee.api.chat.hover.content.Content hoverContentOf(@NotNull org.bukkit.entity.Entity entity, @NotNull net.md_5.bungee.api.chat.BaseComponent[] customName);
// Paper end - bungee hover events
@@ -355,4 +355,15 @@ public interface ItemFactory {
*/
@NotNull ItemStack enchantWithLevels(@NotNull ItemStack itemStack, @org.jetbrains.annotations.Range(from = 1, to = 30) int levels, boolean allowTreasure, @NotNull java.util.Random random);
// Paper end - enchantWithLevels API
+
+ // Purpur start
+ /**
Expand Down
36 changes: 20 additions & 16 deletions patches/api/0005-Bump-Dependencies.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,25 @@ Subject: [PATCH] Bump Dependencies


diff --git a/build.gradle.kts b/build.gradle.kts
index d6966b751c4ec3cae6f778f56ebb7ab52373959f..3d00401d4eac8461155916af09eb63242bd88e9a 100644
index 11ffb490c10ccea6e1d5fefa607466c981a48154..b459a90ee4fe84566bc862a61dfbb6a5b9aaedc0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,8 +11,8 @@ java {
val annotationsVersion = "24.0.1"
@@ -9,11 +9,11 @@ java {
withJavadocJar()
}

-val annotationsVersion = "24.0.1"
+val annotationsVersion = "24.1.0" // Leaf - Bump Dependencies
val bungeeCordChatVersion = "1.20-R0.1"
val adventureVersion = "4.14.0"
-val slf4jVersion = "1.8.0-beta4"
-val log4jVersion = "2.17.1"
+val slf4jVersion = "2.0.9" // Leaf - Bump Dependencies
+val log4jVersion = "2.21.1" // Leaf - Bump Dependencies
+val log4jVersion = "2.22.0" // Leaf - Bump Dependencies
val apiAndDocs: Configuration by configurations.creating {
attributes {
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
@@ -27,7 +27,7 @@ configurations.api {
@@ -28,7 +28,7 @@ configurations.api {

dependencies {
// api dependencies are listed transitively to API consumers
Expand All @@ -28,7 +32,7 @@ index d6966b751c4ec3cae6f778f56ebb7ab52373959f..3d00401d4eac8461155916af09eb6324
api("com.google.code.gson:gson:2.10.1")
api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") // Paper
api("org.yaml:snakeyaml:2.2")
@@ -36,7 +36,7 @@ dependencies {
@@ -37,7 +37,7 @@ dependencies {
api("com.googlecode.json-simple:json-simple:1.1.1") {
isTransitive = false // includes junit
}
Expand All @@ -37,9 +41,9 @@ index d6966b751c4ec3cae6f778f56ebb7ab52373959f..3d00401d4eac8461155916af09eb6324
apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
apiAndDocs("net.kyori:adventure-api")
apiAndDocs("net.kyori:adventure-text-minimessage")
@@ -48,30 +48,32 @@ dependencies {
@@ -49,30 +49,32 @@ dependencies {
api("org.slf4j:slf4j-api:$slf4jVersion")
api("io.sentry:sentry:7.0.0-rc.1") // Pufferfish
api("io.sentry:sentry:7.0.0-rc.2") // Pufferfish

- implementation("org.ow2.asm:asm:9.4")
- implementation("org.ow2.asm:asm-commons:9.4")
Expand All @@ -53,8 +57,8 @@ index d6966b751c4ec3cae6f778f56ebb7ab52373959f..3d00401d4eac8461155916af09eb6324
- compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
- compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper
+ api("org.apache.maven:maven-resolver-provider:3.9.5")
+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.16")
+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.16")
+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.17")
+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.17")
+ compileOnly("com.google.code.findbugs:jsr305:3.0.2") // Paper

val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations...
Expand All @@ -70,7 +74,7 @@ index d6966b751c4ec3cae6f778f56ebb7ab52373959f..3d00401d4eac8461155916af09eb6324

- testImplementation("org.apache.commons:commons-lang3:3.12.0")
- testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
+ testImplementation("org.apache.commons:commons-lang3:3.13.0")
+ testImplementation("org.apache.commons:commons-lang3:3.14.0")
+ testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
testImplementation("org.hamcrest:hamcrest:2.2")
- testImplementation("org.mockito:mockito-core:5.5.0")
Expand All @@ -80,8 +84,8 @@ index d6966b751c4ec3cae6f778f56ebb7ab52373959f..3d00401d4eac8461155916af09eb6324
+ // Leaf end
}

configure<PublishingExtension> {
@@ -123,7 +125,7 @@ tasks.withType<Javadoc> {
// Paper start
@@ -140,7 +142,7 @@ tasks.withType<Javadoc> {
options.use()
options.isDocFilesSubDirs = true
options.links(
Expand All @@ -90,16 +94,16 @@ index d6966b751c4ec3cae6f778f56ebb7ab52373959f..3d00401d4eac8461155916af09eb6324
"https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
"https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
// "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // Paper - don't link to bungee chat
@@ -141,7 +143,7 @@ tasks.withType<Javadoc> {
@@ -158,7 +160,7 @@ tasks.withType<Javadoc> {
"https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
"https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/",
// Paper end
- "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3", // Paper
+ "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.9.16", // Paper // Leaf - Bump Dependencies
+ "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.9.17", // Paper // Leaf - Bump Dependencies
)
options.tags("apiNote:a:API Note:")

@@ -184,6 +186,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
@@ -201,6 +203,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
jarToScan.set(tasks.jar.flatMap { it.archiveFile })
classpath.from(configurations.compileClasspath)
}
Expand Down
4 changes: 2 additions & 2 deletions patches/api/0007-KeYi-Player-Skull-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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 d19e67b4a828727da0b8dcb8973c1deb09c28ade..a1e823e36d4448f724cea187de146d8f7199acf3 100644
index 69357a7e78ce8813eac0babdd869edf6804f5c50..f25043d5fa29c8c6b540bc5ab59efcb070820892 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;
Expand All @@ -23,7 +23,7 @@ index d19e67b4a828727da0b8dcb8973c1deb09c28ade..a1e823e36d4448f724cea187de146d8f
import org.bukkit.DyeColor;
import org.bukkit.Effect;
import org.bukkit.GameMode;
@@ -3441,4 +3444,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3438,4 +3441,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
sendDeathScreen(message);
}
// Purpur end
Expand Down
4 changes: 2 additions & 2 deletions patches/api/0008-Slice-Smooth-Teleports.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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 a1e823e36d4448f724cea187de146d8f7199acf3..6c34bacb8f60b0e066191b5a33c4c2664d4678a9 100644
index f25043d5fa29c8c6b540bc5ab59efcb070820892..54ff90d22cbaf44e9f6db2a6466934ef9f2ffbf3 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3184,6 +3184,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3181,6 +3181,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
String getClientBrandName();
// Paper end

Expand Down
10 changes: 5 additions & 5 deletions patches/server/0001-Rebrand.patch
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ 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 909e00c433fc869104dbe4a633c82f92304880d0..889886a949df9eb49a26c6fec9a32ddfbf938847 100644
index 1fb4befc9fd770e2dcc31e9f32965f4510ecc316..a93db76e432d485690d996d821bf8ec68c599b48 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -898,7 +898,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
Expand All @@ -89,10 +89,10 @@ index 909e00c433fc869104dbe4a633c82f92304880d0..889886a949df9eb49a26c6fec9a32ddf
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 2cead4143ab152dc96f04b065134d2e46b979ca5..e195fd0a489985eebf432f350d7e84afece1529d 100644
index 8658179e08172a85a4b762fcedf071d24ff8365e..dce9eb210fe92f44745a316d1969251554673af2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -270,7 +270,7 @@ import javax.annotation.Nullable; // Paper
@@ -272,7 +272,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper

public final class CraftServer implements Server {
Expand All @@ -102,7 +102,7 @@ index 2cead4143ab152dc96f04b065134d2e46b979ca5..e195fd0a489985eebf432f350d7e84af
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index 3dd7ee2e099199550b885947d33d8b27901ac373..65566adec52a51df05c5ce9c1e673f3c4885ac5e 100644
index fda56c3970e7fa1e9e282eee4323b23a6f80d316..b07be33bf62a0d4f0a0f44ac6bfbb023086a6b0d 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -501,7 +501,7 @@ public class CraftScheduler implements BukkitScheduler {
Expand Down Expand Up @@ -154,7 +154,7 @@ index 3d674eca7d20202d8f811c5c3e3946a12046028a..9f96c6a23372f496a5c71fda8c688d73

}
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
index b66caf636cbb4b6a56584ad710600ad2c3fb17d2..cf6067f3dd8b9e1d46cf3c39b75171c4d048ae26 100644
index b50a626f85c19880789b1c9e7bbc3998323c2488..649175690a3d2ac120876ab4518ad783ae0a5e18 100644
--- a/src/main/java/org/spigotmc/WatchdogThread.java
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
@@ -160,15 +160,15 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
Expand Down
Loading

0 comments on commit af307b0

Please sign in to comment.