From 8331f1bba8403a46c7efa309b34da45960f3bf42 Mon Sep 17 00:00:00 2001
From: Ben Kerllenevich <ben@omega24.dev>
Date: Thu, 22 Jun 2023 16:16:41 -0400
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c613877 Fix incorrect crafting result amount for fireworks (#9322)
PaperMC/Paper@b169678 ratelimited packet is logged to console on kick (#9292)
---
 gradle.properties                              | 2 +-
 patches/server/0246-Max-joins-per-second.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index f2e8ec7db..d1a7d59ff 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.20.1-R0.1-SNAPSHOT
 
 mcVersion = 1.20.1
-paperCommit = 3756f5bbf566fde4aa619bf8d4215f68567621d3
+paperCommit = b1696788d61ddc338bd2e61fac3b43ff60c432e1
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0246-Max-joins-per-second.patch b/patches/server/0246-Max-joins-per-second.patch
index 4d88e8d3d..0da568e03 100644
--- a/patches/server/0246-Max-joins-per-second.patch
+++ b/patches/server/0246-Max-joins-per-second.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Max joins per second
 When this option is set to true the `max-joins-per-tick` setting in paper.yml will be used per second instead of per tick
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 1b634b303105a0f8424e1e40b7c39f9938232d95..b5cba37b65558c7cb0e82136a1822c0f88143053 100644
+index cf20f0983fc25b26cf92b9d3a28746b1909fc56b..89c1b69ddeb420c2fbda5f588e7c9a467a76089d 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -576,11 +576,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -579,11 +579,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
      private static final int MAX_PER_TICK = io.papermc.paper.configuration.GlobalConfiguration.get().misc.maxJoinsPerTick; // Paper
      private static int joinAttemptsThisTick; // Paper
      private static int currTick; // Paper