diff --git a/.upstream-data b/.upstream-data index e4704b1..c3d4d21 100644 --- a/.upstream-data +++ b/.upstream-data @@ -1,2 +1,2 @@ -purpurCommit = 890a9d7e4bbfec740da80b0b16f8bedcef31d351 +purpurCommit = 8c8c18bb2156401882b95a4411462907c1287278 pufferfishCommit = 52307ae220ad5a9a01ac4e273b921f3cbb097de5 diff --git a/patches/api/0001-Pufferfish-API-Changes.patch b/patches/api/0001-Pufferfish-API-Changes.patch index 304d3a6..372524b 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: Sun, 12 Mar 2023 05:50:00 +0000 +Date: Sun, 12 Mar 2023 20:49:53 +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 68149fd..b5e7238 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: Sun, 12 Mar 2023 05:51:48 +0000 +Date: Sun, 12 Mar 2023 20:51:35 +0000 Subject: [PATCH] Purpur API Changes Original: PurpurMC diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch index 3e2780f..2771edd 100644 --- a/patches/server/0001-Pufferfish-Server-Changes.patch +++ b/patches/server/0001-Pufferfish-Server-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Sun, 12 Mar 2023 05:50:00 +0000 +Date: Sun, 12 Mar 2023 20:49:53 +0000 Subject: [PATCH] Pufferfish Server Changes Original: Kevin Raneri @@ -2125,7 +2125,7 @@ index 41ff954010c11d524ffb90abd22c29a1d8d8f5a0..ac7ee31f2bfe5d4139b793a698317db5 private String descriptionId; @Nullable diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 42eb78830855d7282b7f3f1bdbe85e632d489784..413652284e229a51e3eefe47f239e8fa9a09ccb2 100644 +index 902a19def9d902e7bfb476688354a070633a3454..f0acc1fd51a49589c33c089562ac80053b4c1ef9 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -143,7 +143,6 @@ import org.bukkit.event.entity.EntityTeleportEvent; diff --git a/patches/server/0002-Purpur-Server-Changes.patch b/patches/server/0002-Purpur-Server-Changes.patch index db713be..3447aee 100644 --- a/patches/server/0002-Purpur-Server-Changes.patch +++ b/patches/server/0002-Purpur-Server-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Sun, 12 Mar 2023 05:51:48 +0000 +Date: Sun, 12 Mar 2023 20:51:35 +0000 Subject: [PATCH] Purpur Server Changes Original: PurpurMC @@ -4630,7 +4630,7 @@ index c1e9b40a4a0f9cdc650caa88b5ea132e06ee2496..5d6cddc221887be20ef75d688817dfe5 @Override diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 413652284e229a51e3eefe47f239e8fa9a09ccb2..b2e4b5c463ceb19356da18e7fc52d20801b674cd 100644 +index f0acc1fd51a49589c33c089562ac80053b4c1ef9..cc8de71037a1eb5dc08467f9bfb84d5abb40b7df 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -221,9 +221,9 @@ public abstract class LivingEntity extends Entity {