Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47: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:
5486b3db Fix javadocs failing jenkins builds (#4189)
1330eb5f Brand support
This commit is contained in:
William Blake Galbreath
2020-08-23 20:39:32 -05:00
parent 79b0a9b0e7
commit 6ee7cbceeb
14 changed files with 51 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0009-AFK-API.patch
View File

@@ -81,10 +81,10 @@ index 000000000..0c8b3e5e4
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index b584f8b15..9dbfe3614 100644
index 991f757a8..472194e7e 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1877,4 +1877,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1887,4 +1887,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end

4
patches/api/0023-Player-invulnerabilities.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 9dbfe3614..1dfe55402 100644
index 472194e7e..ca98852f8 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1897,5 +1897,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1907,5 +1907,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();

32
patches/api/0033-Fix-params-in-javadocs.patch
View File

@@ -1,32 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 23 Aug 2020 16:29:01 -0500
Subject: [PATCH] Fix params in javadocs
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 36bb9d37e..b4e55c173 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -175,7 +175,7 @@ public final class Bukkit {
/**
* Set the maximum amount of players which can login to this server.
*
- * @param the amount of players this server allows
+ * @param maxPlayers the amount of players this server allows
*/
public static void setMaxPlayers(int maxPlayers) {
server.setMaxPlayers(maxPlayers);
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 5b04a7699..70bcd6c3a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -148,7 +148,7 @@ public interface Server extends PluginMessageRecipient {
/**
* Set the maximum amount of players which can login to this server.
*
- * @param the amount of players this server allows
+ * @param maxPlayers the amount of players this server allows
*/
public void setMaxPlayers(int maxPlayers);
// Paper end