Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +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/0010-Add-tick-times-API.patch
View File

@@ -1,4 +1,4 @@
From 7237c98d2466a3bbbf909eced8c728aa5242fdcf Mon Sep 17 00:00:00 2001
From 56c9dfec5e48c93e44bf73e8d841c851202320c2 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 30 Jan 2020 00:41:08 -0600
Subject: [PATCH] Add tick times API
@@ -9,10 +9,10 @@ Subject: [PATCH] Add tick times API
2 files changed, 38 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 50415189c..8fbda2aee 100644
index 3a60094a..6935cf27 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1620,4 +1620,25 @@ public final class Bukkit {
@@ -1664,4 +1664,25 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -39,10 +39,10 @@ index 50415189c..8fbda2aee 100644
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 0c45c9af3..75bf097ed 100644
index 0f7e84fb..df1765b5 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1430,4 +1430,21 @@ public interface Server extends PluginMessageRecipient {
@@ -1470,4 +1470,21 @@ public interface Server extends PluginMessageRecipient {
*/
int getCurrentTick();
// Paper end