Skip to content

Commit 3a32cd0

Browse files
authoredOct 13, 2024
[skip ci] Do not attempt to relocate the removed ancient artifact (hpfxd#245)
1 parent 7264c54 commit 3a32cd0

2 files changed

+11
-3
lines changed
 

‎patches/server/0040-Use-TerminalConsoleAppender-for-console-improvements.patch

+9-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This patch contains heavy inspiration from:
2222
https://github.com/PaperMC/Paper/blob/master/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch
2323

2424
diff --git a/build.gradle.kts b/build.gradle.kts
25-
index d130985a63c1074de418ce40a7035811a19e3115..4a1bd0cf33d98c8cd3e09c8ba92af080b2bd0324 100644
25+
index d130985a63c1074de418ce40a7035811a19e3115..f66de2ff7d7d73a69d9d780a9fddfd9d300b79c2 100644
2626
--- a/build.gradle.kts
2727
+++ b/build.gradle.kts
2828
@@ -21,8 +21,10 @@ dependencies {
@@ -63,6 +63,14 @@ index d130985a63c1074de418ce40a7035811a19e3115..4a1bd0cf33d98c8cd3e09c8ba92af080
6363
// PandaSpigot start - Configuration
6464
arrayOf(
6565
"com.amihaiemil.eoyaml",
66+
@@ -70,7 +77,6 @@ tasks {
67+
val cbLibsPkg = "org.bukkit.craftbukkit.libs"
68+
69+
relocate("joptsimple", "$cbLibsPkg.joptsimple")
70+
- relocate("jline", "$cbLibsPkg.jline")
71+
relocate("org.ibex", "$cbLibsPkg.org.ibex")
72+
relocate("org.gjt", "$cbLibsPkg.org.gjt")
73+
6674
diff --git a/src/main/java/com/hpfxd/pandaspigot/console/PandaConsole.java b/src/main/java/com/hpfxd/pandaspigot/console/PandaConsole.java
6775
new file mode 100644
6876
index 0000000000000000000000000000000000000000..25a515b681bbbb70946f2ec73647a6f184f81b3c

‎patches/server/0087-Avoid-Looking-up-same-chunk-twice-in-EAR.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Avoid Looking up same chunk twice in EAR
55

66

77
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
8-
index d3767d2a8963e72253fd05b4d177acd7415158bb..a82eab21e38bbd24760bd072ecd154a025883b79 100644
8+
index d3767d2a8963e72253fd05b4d177acd7415158bb..90b7238567952a7ee365f9c1fef3d9a5e10e7a80 100644
99
--- a/src/main/java/org/spigotmc/ActivationRange.java
1010
+++ b/src/main/java/org/spigotmc/ActivationRange.java
1111
@@ -128,9 +128,12 @@ public class ActivationRange
@@ -18,7 +18,7 @@ index d3767d2a8963e72253fd05b4d177acd7415158bb..a82eab21e38bbd24760bd072ecd154a0
1818
+ if ( chunk != null )
1919
{
2020
- activateChunkEntities( world.getChunkAt( i1, j1 ) );
21-
+ activateChunkEntities( chunk );
21+
+ activateChunkEntities( chunk );
2222
+ // PandaSpigot end
2323
}
2424
}

0 commit comments

Comments
 (0)
Please sign in to comment.