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

Updated Upstream (Paper)

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

Paper Changes:
5d05da257 Use original user input instead of legacy event result for AbstractChatEvent#originalMessage (#5770)
f89be1281 [CI-SKIP] Fixup patch header
acbb69e67 Restore vanilla water animal limit
This commit is contained in:
BillyGalbreath
2021-06-02 20:35:14 -05:00
parent 19ed1444e2
commit b36c3d7ede
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: ea381dde32...5d05da2579

12
patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch
View File

@@ -420,10 +420,10 @@ index 5bb677ce585b856b3d3e589e29786a29619c56a7..613f00fa387dcc5af3191e550dea9d4d
private final LongAdder cachedSize = new LongAdder();
diff --git a/src/main/java/io/papermc/paper/event/player/AsyncChatEvent.java b/src/main/java/io/papermc/paper/event/player/AsyncChatEvent.java
index d85006591808b61518545c9f5b0b5915c19e0a9d..363dc1e3157fb94671e07fbdc0f0f7357e308589 100644
index ee7ec316a2f814ec759e0a3e5dfe5efbee782b22..1bf28ec988aad12ede93fa508075811601c82d60 100644
--- a/src/main/java/io/papermc/paper/event/player/AsyncChatEvent.java
+++ b/src/main/java/io/papermc/paper/event/player/AsyncChatEvent.java
@@ -37,6 +37,11 @@ public final class AsyncChatEvent extends AbstractChatEvent {
@@ -53,6 +53,11 @@ public final class AsyncChatEvent extends AbstractChatEvent {
}
/**
@@ -432,14 +432,14 @@ index d85006591808b61518545c9f5b0b5915c19e0a9d..363dc1e3157fb94671e07fbdc0f0f735
+ * @param recipients Recipients
+ * @param formatter Formatter
+ * @param message Message
* @deprecated for removal with 1.17, use {@link #AsyncChatEvent(boolean, Player, Set, ChatRenderer, Component)}
* @deprecated for removal with 1.17, use {@link #AsyncChatEvent(boolean, Player, Set, ChatRenderer, Component, Component)}
*/
@Deprecated
diff --git a/src/main/java/io/papermc/paper/event/player/ChatEvent.java b/src/main/java/io/papermc/paper/event/player/ChatEvent.java
index 6219aabaf40ab89f8e08c256d1255bf5522db4d3..b94e9ff470203f46b27f461db6ca741a933e3411 100644
index c6bcf0dc3f77c631aa7eeb9b1e88b5bbfe445fc6..c1c6d45b10cac170e2a9b6ec7dc273d12f21163a 100644
--- a/src/main/java/io/papermc/paper/event/player/ChatEvent.java
+++ b/src/main/java/io/papermc/paper/event/player/ChatEvent.java
@@ -41,6 +41,10 @@ public final class ChatEvent extends AbstractChatEvent {
@@ -50,6 +50,10 @@ public final class ChatEvent extends AbstractChatEvent {
}
/**
@@ -447,7 +447,7 @@ index 6219aabaf40ab89f8e08c256d1255bf5522db4d3..b94e9ff470203f46b27f461db6ca741a
+ * @param recipients Recipients
+ * @param formatter Formatter
+ * @param message Message
* @deprecated for removal with 1.17, use {@link #ChatEvent(Player, Set, ChatRenderer, Component)}
* @deprecated for removal with 1.17, use {@link #ChatEvent(Player, Set, ChatRenderer, Component, Component)}
*/
@Deprecated
diff --git a/src/main/java/io/papermc/paper/inventory/ItemRarity.java b/src/main/java/io/papermc/paper/inventory/ItemRarity.java