9
0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-28 03:19:22 +00:00

Update Paper

This commit is contained in:
violetc
2022-06-22 08:01:14 +00:00
parent 383d74884e
commit 04f0f9d55e
5 changed files with 16 additions and 16 deletions

View File

@@ -71,7 +71,7 @@ index 7b1843e16745ca8db2244e17490d291401f22679..0ac8bcb0a4b7d1da3d0e016617db7a81
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 32dc0cd20a4dd8fc02be1f7ba3d727db826dbe5d..33e9e84fe6c36e3b4b83aec6274a73e0ee3afdcb 100644
index 77cd45f616e2ff38ad6a648b8b865a99e544f3ec..fa777f327bb2e541ce72d29ec55055232ef7808c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1654,7 +1654,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -84,10 +84,10 @@ index 32dc0cd20a4dd8fc02be1f7ba3d727db826dbe5d..33e9e84fe6c36e3b4b83aec6274a73e0
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f1e5ccfbcd08a73ac3aba9a1cb7b414faef81f9e..2ed922a100bfdf4500aef6b6b0d8c61bba6a4bdc 100644
index 61c2f864bb23e75f6c377f7ccbf2ec44a670348c..63892d8e3f7a36dbe8dd60d4d30a04e5ce4706a0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -243,7 +243,7 @@ import javax.annotation.Nullable; // Paper
@@ -245,7 +245,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
@@ -97,7 +97,7 @@ index f1e5ccfbcd08a73ac3aba9a1cb7b414faef81f9e..2ed922a100bfdf4500aef6b6b0d8c61b
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index fbd604602024522bdd73aa1bde6fe2ccec63e442..af3c2f1c6ab4ee3e5bac42f4842a2af459c042a2 100644
index 1b9e91b20dd9a9375a0a2a6a4d7a0bcdce9e7b1a..ff01f48071cff735b7a2dcc4cf22445b980da82b 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -270,7 +270,7 @@ public class Main {