diff --git a/.upstream-data b/.upstream-data index ff7e20b..f4b4645 100644 --- a/.upstream-data +++ b/.upstream-data @@ -1,2 +1,2 @@ -purpurCommit = 21411de358a87c98df1dd214b0ec0c4b6ad81b58 -pufferfishCommit = 1a55e9140b2477a081b394bd27d56d691b90fc2c +purpurCommit = 54656e975527d263415f7905873e0709d3e2576a +pufferfishCommit = 19a70d2ca38093d36f233cb3b590f4d28b85c078 diff --git a/gradle.properties b/gradle.properties index 171d256..954f8b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.plazmamc.plazma version = 1.19.4-R0.1-SNAPSHOT -paperCommit = 4f9575eed827007f31ce17da471820fe8bc14573 +paperCommit = 1d4c7806ffd09cc9ff3372793a60418ee6a869f0 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0001-Pufferfish-API-Changes.patch b/patches/api/0001-Pufferfish-API-Changes.patch index 0d36481..8398b4d 100644 --- a/patches/api/0001-Pufferfish-API-Changes.patch +++ b/patches/api/0001-Pufferfish-API-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Mon, 1 May 2023 08:34:00 +0000 +Date: Mon, 8 May 2023 05:49:31 +0000 Subject: [PATCH] Pufferfish API Changes Original: Kevin Raneri diff --git a/patches/api/0002-Purpur-API-Changes.patch b/patches/api/0002-Purpur-API-Changes.patch index 7354614..b613738 100644 --- a/patches/api/0002-Purpur-API-Changes.patch +++ b/patches/api/0002-Purpur-API-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Mon, 1 May 2023 08:35:32 +0000 +Date: Mon, 8 May 2023 05:58:24 +0000 Subject: [PATCH] Purpur API Changes Original: PurpurMC @@ -1156,7 +1156,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 ee446bfb3e6c4b1d4428c00d6406bf9455c68ad5..43cef54d355c8a1b6a8cd6be89a6a805e9f88566 100644 +index 7500abc8108c5c4d23ce6031a7413138044d73a2..ac3d71cda9871ef87501fe25f05b4d238a3571ea 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -3035,4 +3035,139 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM