From 222bdcf9f5a38566d3cbf886e6ddfddc8b6ffec1 Mon Sep 17 00:00:00 2001
From: MrPowerGamerBR <git@mrpowergamerbr.com>
Date: Fri, 24 Nov 2023 20:25:38 -0300
Subject: [PATCH] Remove unused stuff

---
 patches/server/0016-Optimize-tickBlockEntities.patch | 11 -----------
 patches/server/0018-Parallel-world-ticking.patch     | 12 ++++++------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/patches/server/0016-Optimize-tickBlockEntities.patch b/patches/server/0016-Optimize-tickBlockEntities.patch
index 094bd78..f2b26b1 100644
--- a/patches/server/0016-Optimize-tickBlockEntities.patch
+++ b/patches/server/0016-Optimize-tickBlockEntities.patch
@@ -101,17 +101,6 @@ index b9e0822638a3979bd43392efdb595153e6f34675..5a35b9f1fd9c8d4c96b3d29ae3dcd139
          this.timings.tileEntityTick.stopTiming(); // Spigot
          this.tickingBlockEntities = false;
          co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper
-@@ -1306,6 +1336,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         this.spigotConfig.currentPrimedTnt = 0; // Spigot
-     }
- 
-+    // SparklyPaper start
-+    private final record BlockEntityRemovalSection(int startsAt, int endsAt) {}
-+    // SparklyPaper end
-+
-     public <T extends Entity> void guardEntityTick(Consumer<T> tickConsumer, T entity) {
-         try {
-             tickConsumer.accept(entity);
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TickingBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TickingBlockEntity.java
 index 28e3b73507b988f7234cbf29c4024c88180d0aef..68d96dd3e288346d8df49b52fa035e8154057065 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TickingBlockEntity.java
diff --git a/patches/server/0018-Parallel-world-ticking.patch b/patches/server/0018-Parallel-world-ticking.patch
index 70c091d..a613581 100644
--- a/patches/server/0018-Parallel-world-ticking.patch
+++ b/patches/server/0018-Parallel-world-ticking.patch
@@ -1322,7 +1322,7 @@ index 45243249a561440512ef2a620c60b02e159c80e2..849b9b4336d2ac99324dacf6ad8a2e34
                              continue;
                          }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 5a35b9f1fd9c8d4c96b3d29ae3dcd13919a5bc0f..f83bdd92046bc1256143c891d9aa477ac3cb09ff 100644
+index df9de7f1907efd4e30eb9ab3a683761ccb4b2204..259361113561194d61d4873dd4994f5be9283425 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -15,6 +15,8 @@ import java.util.function.Consumer;
@@ -1360,7 +1360,7 @@ index 5a35b9f1fd9c8d4c96b3d29ae3dcd13919a5bc0f..f83bdd92046bc1256143c891d9aa477a
                  }
                  // Paper end - execute chunk tasks during tick
                  } // SparklyPaper end
-@@ -1343,7 +1346,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1339,7 +1342,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public <T extends Entity> void guardEntityTick(Consumer<T> tickConsumer, T entity) {
          try {
              tickConsumer.accept(entity);
@@ -1369,7 +1369,7 @@ index 5a35b9f1fd9c8d4c96b3d29ae3dcd13919a5bc0f..f83bdd92046bc1256143c891d9aa477a
          } catch (Throwable throwable) {
              if (throwable instanceof ThreadDeath) throw throwable; // Paper
              // Paper start - Prevent tile entity and entity crashes
-@@ -1443,6 +1446,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1439,6 +1442,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Nullable
      public BlockEntity getBlockEntity(BlockPos blockposition, boolean validate) {
@@ -1377,7 +1377,7 @@ index 5a35b9f1fd9c8d4c96b3d29ae3dcd13919a5bc0f..f83bdd92046bc1256143c891d9aa477a
          // Paper start - Optimize capturedTileEntities lookup
          net.minecraft.world.level.block.entity.BlockEntity blockEntity;
          if (!this.capturedTileEntities.isEmpty() && (blockEntity = this.capturedTileEntities.get(blockposition)) != null) {
-@@ -1450,10 +1454,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1446,10 +1450,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          }
          // Paper end
          // CraftBukkit end
@@ -1390,7 +1390,7 @@ index 5a35b9f1fd9c8d4c96b3d29ae3dcd13919a5bc0f..f83bdd92046bc1256143c891d9aa477a
          BlockPos blockposition = blockEntity.getBlockPos();
  
          if (!this.isOutsideBuildHeight(blockposition)) {
-@@ -1539,6 +1544,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1535,6 +1540,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Override
      public List<Entity> getEntities(@Nullable Entity except, AABB box, Predicate<? super Entity> predicate) {
@@ -1398,7 +1398,7 @@ index 5a35b9f1fd9c8d4c96b3d29ae3dcd13919a5bc0f..f83bdd92046bc1256143c891d9aa477a
          this.getProfiler().incrementCounter("getEntities");
          List<Entity> list = Lists.newArrayList();
          ((ServerLevel)this).getEntityLookup().getEntities(except, box, list, predicate); // Paper - optimise this call
-@@ -1803,8 +1809,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1799,8 +1805,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
      public final BlockPos.MutableBlockPos getRandomBlockPosition(int x, int y, int z, int l, BlockPos.MutableBlockPos out) {
          // Paper end