mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 01:17:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: 8d036cea Expose the internal current tick 0c715390 [PATCH] bounding box check for hanging entities (#2664) 527073aa Update config version 0d3b35c3 Rename baby zombie movement config option
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From aa4788e6e4adcf6fe0f5cb3c9093fca7d8717eb8 Mon Sep 17 00:00:00 2001
|
||||
From 6b57d8de1bfc0480aaf902eb577f3bbb52a18a7a Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sun, 26 May 2019 15:18:40 -0500
|
||||
Subject: [PATCH] Bring back server name
|
||||
@@ -9,10 +9,10 @@ Subject: [PATCH] Bring back server name
|
||||
2 files changed, 20 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 6db691591..352e13eef 100644
|
||||
index 231bc6e31..21bc13f79 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1601,6 +1601,17 @@ public final class Bukkit {
|
||||
@@ -1605,6 +1605,17 @@ public final class Bukkit {
|
||||
}
|
||||
// Paper end
|
||||
|
||||
@@ -31,12 +31,12 @@ index 6db691591..352e13eef 100644
|
||||
public static Server.Spigot spigot()
|
||||
{
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 27d3b5ad7..5337e3c5a 100644
|
||||
index 314704790..c12e3ba90 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1399,4 +1399,13 @@ public interface Server extends PluginMessageRecipient {
|
||||
@NotNull
|
||||
com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name);
|
||||
@@ -1406,4 +1406,13 @@ public interface Server extends PluginMessageRecipient {
|
||||
*/
|
||||
int getCurrentTick();
|
||||
// Paper end
|
||||
+
|
||||
+ // Purpur start - bring back server name
|
||||
@@ -49,5 +49,5 @@ index 27d3b5ad7..5337e3c5a 100644
|
||||
+ // Purpur end
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
2.24.0.rc1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user