Repo-Mirror/PlazmaBukkitMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (Purpur)

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

Purpur Changes:
PurpurMC/Purpur@890a9d7 inline Component import
This commit is contained in:
github-actions[bot]
2023-03-12 05:54:43 +00:00
parent f6bc22d7c2
commit 59bc56b30e
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.upstream-data
View File

@@ -1,2 +1,2 @@
purpurCommit = 235d5075a1eb9d733acbd88e19724b0662f6d7c1
purpurCommit = 890a9d7e4bbfec740da80b0b16f8bedcef31d351
pufferfishCommit = 52307ae220ad5a9a01ac4e273b921f3cbb097de5

2
patches/api/0001-Pufferfish-API-Changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Sun, 12 Mar 2023 05:31:17 +0000
Date: Sun, 12 Mar 2023 05:50:00 +0000
Subject: [PATCH] Pufferfish API Changes
Original: Kevin Raneri <kevin.raneri@gmail.com>

8
patches/api/0002-Purpur-API-Changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Sun, 12 Mar 2023 05:33:21 +0000
Date: Sun, 12 Mar 2023 05:51:48 +0000
Subject: [PATCH] Purpur API Changes
Original: PurpurMC
@@ -1155,7 +1155,7 @@ index bc84b892cae5fe7019a3ad481e9da79956efa1fe..48eb5b00c460cccde29d327cef1d63fc
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index fd890d0a3a2c92ad821ade7711191bdb0e3e3624..b9a924058f99c24db499dbb97373514d1f2ea174 100644
index fd890d0a3a2c92ad821ade7711191bdb0e3e3624..9c03265a9e932b3c9b5f0f7ffb4c9e9094f813ec 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2969,4 +2969,139 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1286,7 +1286,7 @@ index fd890d0a3a2c92ad821ade7711191bdb0e3e3624..b9a924058f99c24db499dbb97373514d
+ *
+ * @param message The death message to show the player
+ */
+ void sendDeathScreen(@NotNull Component message);
+ void sendDeathScreen(@NotNull net.kyori.adventure.text.Component message);
+
+ /**
+ * Sends a player the death screen with a specified death message,
@@ -1295,7 +1295,7 @@ index fd890d0a3a2c92ad821ade7711191bdb0e3e3624..b9a924058f99c24db499dbb97373514d
+ * @param message The death message to show the player
+ * @param killer The entity that killed the player
+ */
+ void sendDeathScreen(@NotNull Component message, @Nullable Entity killer);
+ void sendDeathScreen(@NotNull net.kyori.adventure.text.Component message, @Nullable Entity killer);
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/Snowman.java b/src/main/java/org/bukkit/entity/Snowman.java

2
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Sun, 12 Mar 2023 05:31:17 +0000
Date: Sun, 12 Mar 2023 05:50:00 +0000
Subject: [PATCH] Pufferfish Server Changes
Original: Kevin Raneri <kevin.raneri@gmail.com>

2
patches/server/0002-Purpur-Server-Changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Sun, 12 Mar 2023 05:33:21 +0000
Date: Sun, 12 Mar 2023 05:51:48 +0000
Subject: [PATCH] Purpur Server Changes
Original: PurpurMC