ObsidianMC/Obsidian
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rebase

Browse source
This commit is contained in:
Mariell Hoversholm 2021-03-17 10:20:38 +01:00
parent cf4dc464a8
commit 700e9e6a56
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Spigot-Server-Patches/0010-Adventure.patch
View file

@ -106,7 +106,7 @@ index 0000000000000000000000000000000000000000..dd018bb835e1b9fb2496404e1e5b1038
+}
diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
new file mode 100644
index 0000000000000000000000000000000000000000..aa509a1f382991e0f5683b75b0af4094f84d2844
index 0000000000000000000000000000000000000000..ee377d5bd8646733968f4085f60150f8ff6a4a5c
--- /dev/null
+++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
@@ -0,0 +1,211 @@
@ -321,8 +321,6 @@ index 0000000000000000000000000000000000000000..aa509a1f382991e0f5683b75b0af4094
+
+ private static boolean anyListeners(final HandlerList handlers) {
+ return handlers.getRegisteredListeners().length > 0;
+ }
+}
diff --git a/src/main/java/io/papermc/paper/adventure/DisplayNames.java b/src/main/java/io/papermc/paper/adventure/DisplayNames.java
new file mode 100644
index 0000000000000000000000000000000000000000..b1d9d6276eb577ed3c66df1f89b3266d2c48eaf2

4
Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
View file

@ -26,7 +26,7 @@ index db2dddd12f54e6d15916c4cee623676541de37fb..1942f5224aaebb18adb591d6f70a419c
+ }
}
diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
index d92a454adc9773883563eb0efff9c6445b89c0d4..712ca6b3857c6e5cae25a71228365508e514a0f4 100644
index ee377d5bd8646733968f4085f60150f8ff6a4a5c..f68b8c921cc07764ce78547b78689e8b5b68320c 100644
--- a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
+++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
@@ -16,7 +16,11 @@ import net.kyori.adventure.text.format.TextDecoration;
@ -41,7 +41,7 @@ index d92a454adc9773883563eb0efff9c6445b89c0d4..712ca6b3857c6e5cae25a71228365508
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.craftbukkit.util.LazyPlayerSet;
import org.bukkit.craftbukkit.util.Waitable;
@@ -104,10 +108,22 @@ public final class ChatProcessor {
@@ -177,10 +181,22 @@ public final class ChatProcessor {
}
private static String legacyDisplayName(final CraftPlayer player) {

2
scripts/decompile.sh
View file

@ -73,7 +73,7 @@ if [ ! -d "$classdir" ]; then
mkdir -p "$classdir"
cd "$classdir"
set +e
jar xf "$decompiledir/$minecraftversion-mapped.jar" net/minecraft
jar xf "$decompiledir/$minecraftversion-mapped.jar" net/minecraft com/mojang/math
if [ "$?" != "0" ]; then
cd "$basedir"
echo "Failed to extract NMS classes."