Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +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:
9a7ca3db Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-03-26 11:07:53 -05:00
parent d4e8659c65
commit 8e455eb2cf
11 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/api/0002-Tuinity-API-Patches.patch
View File

@@ -1,4 +1,4 @@
From e20cb2d48ea29c7f5330233ade4aa7a5ef2b156b Mon Sep 17 00:00:00 2001
From ee2e3f5670923c7e90dd298163822152ec56296e Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 14 Dec 2018 21:52:29 -0800
Subject: [PATCH] Tuinity API Patches
@@ -71,10 +71,10 @@ index 80f9abdca..55ec8d2d0 100644
* Sends the component to the player
*
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index af0637f76..a3ed3154a 100644
index db18f70ec..be92b1a3e 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3165,6 +3165,34 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3166,6 +3166,34 @@ public interface World extends PluginMessageRecipient, Metadatable {
int getViewDistance();
// Spigot end

12
patches/api/0021-Add-moon-phase-API.patch
View File

@@ -1,4 +1,4 @@
From 0a5979ad09792249e6c4b56860bbcf45cb5b9634 Mon Sep 17 00:00:00 2001
From 66e13328cfc3db8a10f81e958e8d760754215fd4 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 1 Feb 2020 22:22:07 -0600
Subject: [PATCH] Add moon phase API
@@ -11,7 +11,7 @@ Subject: [PATCH] Add moon phase API
diff --git a/src/main/java/net/pl3x/purpur/MoonPhase.java b/src/main/java/net/pl3x/purpur/MoonPhase.java
new file mode 100644
index 00000000..f5ad98c6
index 000000000..f5ad98c62
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/MoonPhase.java
@@ -0,0 +1,36 @@
@@ -52,10 +52,10 @@ index 00000000..f5ad98c6
+ }
+}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index a3ed3154..01d7204b 100644
index be92b1a3e..97441dcae 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3243,6 +3243,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3244,6 +3244,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public List<Raid> getRaids();
@@ -70,8 +70,8 @@ index a3ed3154..01d7204b 100644
+ // Purpur end
+
/**
* Represents various map environment types that a world may be
*/
* Get the {@link DragonBattle} associated with this world.
*
--
2.24.0

6
patches/api/0026-Add-getPlacementBlockData-to-World.patch
View File

@@ -1,4 +1,4 @@
From 0080a35f149be736b9d274e7272d24842da4e985 Mon Sep 17 00:00:00 2001
From 0a22c90004e121545e4e96662f7ce11a53a5059d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 00:34:36 -0500
Subject: [PATCH] Add getPlacementBlockData to World
@@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World
1 file changed, 10 insertions(+)
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 01d7204b..be430fb0 100644
index 97441dcae..5bf0e2252 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3251,6 +3251,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3252,6 +3252,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
@NotNull
net.pl3x.purpur.MoonPhase getMoonPhase();