From 983b5e16803b54536387b12926e29ee9230d9456 Mon Sep 17 00:00:00 2001
From: Josh Roy <10731363+JRoy@users.noreply.github.com>
Date: Mon, 14 Jun 2021 06:47:04 -0700
Subject: [PATCH] need to look at this later, fails rn

---
 ...t-translation-keys-for-blocks-entitie.patch |  2 +-
 ...null-chunk-sections-for-block-updates.patch | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 patches/server/Don-t-mark-null-chunk-sections-for-block-updates.patch

diff --git a/patches/api/Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/patches/api/Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
index 32e767fb64..b2800e9f32 100644
--- a/patches/api/Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
+++ b/patches/api/Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
@@ -1,4 +1,4 @@
-From 0000000000000000000000>>>>>>> replacement000000000000000000 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MeFisto94 <MeFisto94@users.noreply.github.com>
 Date: Tue, 11 Aug 2020 19:17:46 +0200
 Subject: [PATCH] Add a way to get translation keys for blocks, entities and
diff --git a/patches/server/Don-t-mark-null-chunk-sections-for-block-updates.patch b/patches/server/Don-t-mark-null-chunk-sections-for-block-updates.patch
deleted file mode 100644
index 91cd11a132..0000000000
--- a/patches/server/Don-t-mark-null-chunk-sections-for-block-updates.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mariell Hoversholm <proximyst@proximyst.com>
-Date: Fri, 14 Aug 2020 23:41:19 +0200
-Subject: [PATCH] Don't mark null chunk sections for block updates
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-@@ -0,0 +0,0 @@ public class ChunkHolder {
-                         this.a(world, blockposition, iblockdata);
-                     } else {
-                         LevelChunkSection chunksection = chunk.getSections()[j];
-+                        if (chunksection == null) chunksection = new LevelChunkSection(sectionposition.getY(), chunk, world, true); // Paper - make a new chunk section if none was found
-                         ClientboundSectionBlocksUpdatePacket packetplayoutmultiblockchange = new ClientboundSectionBlocksUpdatePacket(sectionposition, shortset, chunksection, this.resendLight);
- 
-                         this.broadcast(packetplayoutmultiblockchange, false);