From 8bafc17d67c935110204155a95f031fad3b1ef15 Mon Sep 17 00:00:00 2001
From: Mariell Hoversholm <proximyst@proximyst.com>
Date: Fri, 19 Mar 2021 07:50:12 +0100
Subject: [PATCH] apply fixup

I managed to move it, yet forgot to actually fix it up...
---
 ...-support.patch => 0547-Brand-support.patch} |  0
 .../Load-Chunks-for-Login-Asynchronously.patch |  8 ++++++++
 ...oad-chunks-asynchronously-for-players.patch | 18 ------------------
 3 files changed, 8 insertions(+), 18 deletions(-)
 rename Spigot-Server-Patches/{0548-Brand-support.patch => 0547-Brand-support.patch} (100%)
 delete mode 100644 Spigot-Server-Patches/fixup-Load-chunks-asynchronously-for-players.patch

diff --git a/Spigot-Server-Patches/0548-Brand-support.patch b/Spigot-Server-Patches/0547-Brand-support.patch
similarity index 100%
rename from Spigot-Server-Patches/0548-Brand-support.patch
rename to Spigot-Server-Patches/0547-Brand-support.patch
diff --git a/Spigot-Server-Patches/Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/Load-Chunks-for-Login-Asynchronously.patch
index 09115b8b21..138ef46918 100644
--- a/Spigot-Server-Patches/Load-Chunks-for-Login-Asynchronously.patch
+++ b/Spigot-Server-Patches/Load-Chunks-for-Login-Asynchronously.patch
@@ -21,6 +21,14 @@ diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/ma
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
+@@ -0,0 +0,0 @@ import net.minecraft.core.NonNullList;
+ import net.minecraft.core.SectionPosition;
+ import net.minecraft.nbt.DynamicOpsNBT;
+ import net.minecraft.nbt.NBTTagCompound;
++import net.minecraft.network.NetworkManager;
+ import net.minecraft.network.chat.ChatComponentText;
+ import net.minecraft.network.chat.ChatHoverable;
+ import net.minecraft.network.chat.ChatMessage;
 @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      private static final Logger LOGGER = LogManager.getLogger();
diff --git a/Spigot-Server-Patches/fixup-Load-chunks-asynchronously-for-players.patch b/Spigot-Server-Patches/fixup-Load-chunks-asynchronously-for-players.patch
deleted file mode 100644
index b2e9c2b2fa..0000000000
--- a/Spigot-Server-Patches/fixup-Load-chunks-asynchronously-for-players.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mariell Hoversholm <proximyst@proximyst.com>
-Date: Tue, 16 Mar 2021 11:25:11 +0100
-Subject: [PATCH] fixup! Load chunks asynchronously for players.
-
-
-diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -0,0 +0,0 @@ import net.minecraft.core.NonNullList;
- import net.minecraft.core.SectionPosition;
- import net.minecraft.nbt.DynamicOpsNBT;
- import net.minecraft.nbt.NBTTagCompound;
-+import net.minecraft.network.NetworkManager;
- import net.minecraft.network.chat.ChatComponentText;
- import net.minecraft.network.chat.ChatHoverable;
- import net.minecraft.network.chat.ChatMessage;