Skip to content

Commit e4f5e1c

Browse files
committed
Bump netty
1 parent 90050ff commit e4f5e1c

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

patches/server/0003-Build-system-changes.patch

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes
55

66

77
diff --git a/build.gradle.kts b/build.gradle.kts
8-
index 3451ca066dc093879d540b6c297f8814f40c15f2..3f43a130ee7e7bd5c5178a108f3e7f23337cc83f 100644
8+
index d10ff4a52c22033e2adb2a4e7f2cee98a13ea6c5..e4e9df9283c1a0fd7fff38a5d9b6a51f15e06b7a 100644
99
--- a/build.gradle.kts
1010
+++ b/build.gradle.kts
1111
@@ -9,10 +9,9 @@ plugins {
@@ -21,15 +21,24 @@ index 3451ca066dc093879d540b6c297f8814f40c15f2..3f43a130ee7e7bd5c5178a108f3e7f23
2121
implementation("commons-lang:commons-lang:2.6")
2222
runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
2323
runtimeOnly("mysql:mysql-connector-java:8.0.29")
24-
@@ -34,6 +33,7 @@ tasks.jar {
24+
@@ -23,6 +22,8 @@ dependencies {
25+
26+
testImplementation("junit:junit:4.13.2")
27+
testImplementation("org.hamcrest:hamcrest-library:1.3")
28+
+
29+
+ implementation("io.netty:netty-all:4.1.77.Final"); // Paper - Bump netty
30+
}
31+
32+
val craftbukkitPackageVersion = "1_19_R1" // Paper
33+
@@ -34,6 +35,7 @@ tasks.jar {
2534
val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
2635
val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
2736
val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
2837
+ val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
2938
attributes(
3039
"Main-Class" to "org.bukkit.craftbukkit.Main",
3140
"Implementation-Title" to "CraftBukkit",
32-
@@ -42,6 +42,9 @@ tasks.jar {
41+
@@ -42,6 +44,9 @@ tasks.jar {
3342
"Specification-Title" to "Bukkit",
3443
"Specification-Version" to project.version,
3544
"Specification-Vendor" to "Bukkit Team",

patches/server/0408-Deobfuscate-stacktraces-in-log-messages-crash-report.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
66

77

88
diff --git a/build.gradle.kts b/build.gradle.kts
9-
index 47005e625ba323b93855934b447566246509eabf..513a6b6ac76d984ad7b02dc9ce78b106f0323895 100644
9+
index 708915dfc740360752e7e93b185f469481fdf6e5..6def770d18acc25b9bda1917688039448b36309d 100644
1010
--- a/build.gradle.kts
1111
+++ b/build.gradle.kts
1212
@@ -1,4 +1,6 @@
@@ -31,7 +31,7 @@ index 47005e625ba323b93855934b447566246509eabf..513a6b6ac76d984ad7b02dc9ce78b106
3131
runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
3232
runtimeOnly("mysql:mysql-connector-java:8.0.29")
3333
runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
34-
@@ -91,6 +95,45 @@ tasks.shadowJar {
34+
@@ -93,6 +97,45 @@ tasks.shadowJar {
3535
}
3636
}
3737

patches/server/0409-Implement-Mob-Goal-API.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API
55

66

77
diff --git a/build.gradle.kts b/build.gradle.kts
8-
index 513a6b6ac76d984ad7b02dc9ce78b106f0323895..fab25a3e505a9f978ef91b2d7316a7c2b41d08d3 100644
8+
index 6def770d18acc25b9bda1917688039448b36309d..fa5c1be5e225ba5736ec0ef3f588f79eecce0c73 100644
99
--- a/build.gradle.kts
1010
+++ b/build.gradle.kts
1111
@@ -37,6 +37,7 @@ dependencies {
@@ -15,7 +15,7 @@ index 513a6b6ac76d984ad7b02dc9ce78b106f0323895..fab25a3e505a9f978ef91b2d7316a7c2
1515
+ testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
1616
testImplementation("junit:junit:4.13.2")
1717
testImplementation("org.hamcrest:hamcrest-library:1.3")
18-
}
18+
1919
diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
2020
new file mode 100644
2121
index 0000000000000000000000000000000000000000..c9901f8c7f3af57cb2e0bec315caa97adcb6f5ea

0 commit comments

Comments
 (0)