Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
ad708dd3 Add option to allow iron golems to spawn in air (Closes #1965, Closes #1851)
b16fd5c3 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-03-10 19:30:18 -05:00
parent a9305232b2
commit f2e328d295
53 changed files with 486 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/api/0011-Bring-back-server-name.patch
View File

@@ -1,4 +1,4 @@
From ab2f131fdd232bd09bedb76172d48ca5f6458435 Mon Sep 17 00:00:00 2001
From 33ce16852b951902d8a9685c5a65837796e94ebf 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, 16 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 8fbda2aee..a2cf8e29b 100644
index 6935cf27..abf7caf0 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1622,6 +1622,15 @@ public final class Bukkit {
@@ -1666,6 +1666,15 @@ public final class Bukkit {
}
// Purpur start
@@ -29,10 +29,10 @@ index 8fbda2aee..a2cf8e29b 100644
* Get a sample of the servers last tick times (in nanos)
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 75bf097ed..89100f3f5 100644
index df1765b5..39d933aa 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1432,6 +1432,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1472,6 +1472,13 @@ public interface Server extends PluginMessageRecipient {
// Paper end
// Purpur start