mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-22 02:47:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e51401e Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8347) PaperMC/Paper@51183af Fix console completer/highlighter having invalid source stack (#8346)
This commit is contained in:
@@ -84,7 +84,7 @@ index 7c09182f465b66979e1981222d20fa4f574680d5..629024e5c3f480bd50ae2df9dadb72f0
|
||||
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
|
||||
// Paper end
|
||||
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
||||
index b6f5d2aa4c6edb61421a553211ce71592d8c767a..9d68706d23da00700a89b533e9efefa328196064 100644
|
||||
index 29a2ba6b84c01280f8c7f32e6a78e3dd6c53cb07..544f7ff70486c31e9caddf574265a42c07af3166 100644
|
||||
--- a/src/main/java/net/minecraft/world/level/Level.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
||||
@@ -174,6 +174,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
||||
@@ -152,10 +152,10 @@ index 0ab7d6b9fa8c1eca9b2e3b2548c37b444e1576dc..742c65fe400977ad7087f6756b6a8061
|
||||
public void restart() {
|
||||
org.spigotmc.RestartCommand.restart();
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
index 56a784e943cb5d8b15b41e3e66545ebf166c221c..64489713611840abb069957dcdb495c60c990059 100644
|
||||
index f30621be24c6c3a4f173436fce1ad1c13507c84f..e859f1078a42de196a69818a34a8b2c24958c717 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@@ -164,6 +164,14 @@ public class Main {
|
||||
@@ -166,6 +166,14 @@ public class Main {
|
||||
.describedAs("Jar file");
|
||||
// Paper end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user