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/0002-Tuinity-API-Patches.patch
View File

@@ -1,4 +1,4 @@
From ac2da46e3db5951ece720838726cf5b0d8ceb7f2 Mon Sep 17 00:00:00 2001
From 9c22c9759cf1460418eecb1224cc0bec509de0fa 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Tuinity API Patches
3 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 58a1f7d07..19d003fa8 100644
index 58a1f7d0..19d003fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,8 +18,8 @@
@@ -36,10 +36,10 @@ index 58a1f7d07..19d003fa8 100644
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 5047be15f..d9df7509a 100644
index af0637f7..a3ed3154 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3067,6 +3067,34 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3165,6 +3165,34 @@ public interface World extends PluginMessageRecipient, Metadatable {
int getViewDistance();
// Spigot end
@@ -75,7 +75,7 @@ index 5047be15f..d9df7509a 100644
public class Spigot {
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 877ea4f32..5367975ac 100644
index 877ea4f3..5367975a 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1969,6 +1969,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM