From 76a75fc35ad59bf0eab753a8c0f149376368cfaa Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Sun, 13 Jun 2021 01:45:29 -0700
Subject: [PATCH] fix compile

---
 .../server/0296-Add-PlayerConnectionCloseEvent.patch | 11 ++++++++++-
 ...-check-ConvertSigns-boolean-every-sign-save.patch | 12 +++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/patches/server/0296-Add-PlayerConnectionCloseEvent.patch b/patches/server/0296-Add-PlayerConnectionCloseEvent.patch
index 602d72fd6..ef06807c6 100644
--- a/patches/server/0296-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/server/0296-Add-PlayerConnectionCloseEvent.patch
@@ -65,7 +65,7 @@ index 8bbf13a7aea1142b3154a1c76837a98aa5ed431d..9f0537799a3cae43fb120056b8fe805a
  
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index a196ab2510a1c302ef1c946400c1a7c07619994a..abbd1926107b49f9b7c8097419ba19baf6f6b7d3 100644
+index a196ab2510a1c302ef1c946400c1a7c07619994a..46432534fddbbf78e3bf46385b9638d2f92c951f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -56,10 +56,10 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
@@ -81,3 +81,12 @@ index a196ab2510a1c302ef1c946400c1a7c07619994a..abbd1926107b49f9b7c8097419ba19ba
      private final String serverId;
      @Nullable
      private ServerPlayer delayedAcceptPlayer;
+@@ -441,7 +441,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+         return new GameProfile(uuid, profile.getName());
+     }
+ 
+-    private static enum State {
++    public static enum State { // Paper - make public
+ 
+         HELLO, KEY, AUTHENTICATING, NEGOTIATING, READY_TO_ACCEPT, DELAY_ACCEPT, ACCEPTED;
+ 
diff --git a/patches/server/0305-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0305-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index 4ca929147..5032a2a1f 100644
--- a/patches/server/0305-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/patches/server/0305-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
@@ -7,15 +7,17 @@ property lookups arent super cheap. they synchronize, validate
 and check security managers.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index 589fbdd5c86655244aa92a42e5f45747b5c5026e..bc0e5df6c7e4a5784c3194c716dd2bb033aea9e5 100644
+index 589fbdd5c86655244aa92a42e5f45747b5c5026e..9b5d11ece006d7aa893360a84ba652c666517ac1 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-@@ -1,4 +1,5 @@
- package net.minecraft.world.level.block.entity;
+@@ -26,6 +26,7 @@ import net.minecraft.world.phys.Vec2;
+ import net.minecraft.world.phys.Vec3;
+ 
+ public class SignBlockEntity extends BlockEntity implements CommandSource { // CraftBukkit - implements
 +    private static final boolean CONVERT_LEGACY_SIGNS = Boolean.getBoolean("convertLegacySigns"); // Paper
  
- import com.mojang.brigadier.exceptions.CommandSyntaxException;
- import java.util.UUID;
+     public static final int LINES = 4;
+     private static final String[] RAW_TEXT_FIELD_NAMES = new String[]{"Text1", "Text2", "Text3", "Text4"};
 @@ -66,7 +67,7 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
          }