Skip to content

Commit

Permalink
Updated Upstream (Purpur)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@07b13f2 Updated Upstream (Paper)
  • Loading branch information
github-actions[bot] committed Sep 15, 2023
1 parent 5bf8a81 commit ecbebeb
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .upstream-data
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
purpurCommit = 7927f53553abfa8c4d4bc4d5eb29dda44144f3dc
pufferfishCommit = e32a780bcab6821e3804846a63a9153fdeee44f4
purpurCommit = 07b13f287c8c63e5b2f23c32c52e5d8012ff2eb7
pufferfishCommit = 0020a8bd30741675ac348af30cc50d19d3566cff
2 changes: 1 addition & 1 deletion patches/api/0001-Pufferfish-API-Changes.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <[email protected]>
Date: Wed, 13 Sep 2023 23:16:16 +0000
Date: Fri, 15 Sep 2023 16:37:43 +0000
Subject: [PATCH] Pufferfish API Changes

Original: Kevin Raneri <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion patches/api/0002-Purpur-API-Changes.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <[email protected]>
Date: Wed, 13 Sep 2023 23:17:56 +0000
Date: Fri, 15 Sep 2023 16:39:50 +0000
Subject: [PATCH] Purpur API Changes

Original: PurpurMC
Expand Down
2 changes: 1 addition & 1 deletion patches/server/0001-Pufferfish-Server-Changes.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <[email protected]>
Date: Wed, 13 Sep 2023 23:16:16 +0000
Date: Fri, 15 Sep 2023 16:37:43 +0000
Subject: [PATCH] Pufferfish Server Changes

Original: Kevin Raneri <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0002-Purpur-Server-Changes.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <[email protected]>
Date: Wed, 13 Sep 2023 23:17:56 +0000
Date: Fri, 15 Sep 2023 16:39:49 +0000
Subject: [PATCH] Purpur Server Changes

Original: PurpurMC
Expand Down Expand Up @@ -955,7 +955,7 @@ index 9b0049dfeaec9b688bf276f2ac2b18943b5696b2..d7563904232353cbf3b9255cedfb7592
return true;
}
diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
index cf20f0983fc25b26cf92b9d3a28746b1909fc56b..89c1b69ddeb420c2fbda5f588e7c9a467a76089d 100644
index 52cb6476604c98465f81ff9e8d8344d7536a8868..13144ea01bc27db95a13b267d39529b012a4c9c4 100644
--- a/src/main/java/net/minecraft/network/Connection.java
+++ b/src/main/java/net/minecraft/network/Connection.java
@@ -579,11 +579,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
Expand Down

0 comments on commit ecbebeb

Please sign in to comment.