Remove leftover line from spigots tick limiters

Looking over the code, this appears to be one "high risk but hopefully unlikely that plugins are causing this to break", this line is however redundant leftovers from spigots tick limiter patch, which should be doing nothing as-is.
2025-01-01 17:01:56 +01:00 · 2019-05-15 22:53:13 +01:00 · 2019-05-15 22:53:13 +01:00 · 6a951ff79a
commit 6a951ff79a
parent 0e614d3efa
21 changed files with 61 additions and 60 deletions
--- a/Spigot-Server-Patches/Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/Add-exception-reporting-event.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event

 diff --git a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
 new file mode 100644
-index 0000000000..f699ce18ca
+index 000000000..f699ce18c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
@@ -0,0 +0,0 @@
@ -49,7 +49,7 @@ index 0000000000..f699ce18ca
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index cb56d067b9..67cd4af4f5 100644
+index cb56d067b..67cd4af4f 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -0,0 +0,0 @@
@ -88,7 +88,7 @@ index cb56d067b9..67cd4af4f5 100644
         }
     }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index c2ecc034e8..1ed7c7e2c9 100644
+index c2ecc034e..1ed7c7e2c 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -0,0 +0,0 @@ import java.util.concurrent.CompletableFuture;
@ -119,7 +119,7 @@ index c2ecc034e8..1ed7c7e2c9 100644
 
     }
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index 09ef8729d9..bf67dbf54a 100644
+index 09ef8729d..bf67dbf54 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
@@ -0,0 +0,0 @@
@ -146,7 +146,7 @@ index 09ef8729d9..bf67dbf54a 100644
                        }
                         // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index ab151a14d0..0f1c74dd33 100644
+index ab151a14d..0f1c74dd3 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
@@ -0,0 +0,0 @@
@ -173,7 +173,7 @@ index ab151a14d0..0f1c74dd33 100644
 
     }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index c5ca896919..e507a996f1 100644
+index c5ca89691..e507a996f 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
@@ -0,0 +0,0 @@
@ -192,7 +192,7 @@ index c5ca896919..e507a996f1 100644
         }
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 6720a9648e..2aa0db5c22 100644
+index 6720a9648..2aa0db5c2 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -0,0 +0,0 @@ import org.apache.logging.log4j.LogManager;
@ -220,7 +220,7 @@ index 6720a9648e..2aa0db5c22 100644
                             }
 
 diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
-index 58122b18eb..0ac1fb53a4 100644
+index 58122b18e..0ac1fb53a 100644
 --- a/src/main/java/net/minecraft/server/VillageSiege.java
 +++ b/src/main/java/net/minecraft/server/VillageSiege.java
@@ -0,0 +0,0 @@
@ -240,7 +240,7 @@ index 58122b18eb..0ac1fb53a4 100644
             }
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 09cf98ccdd..6e7c0c9da4 100644
+index e6539846b..3714017cc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@
@ -277,7 +277,7 @@ index 09cf98ccdd..6e7c0c9da4 100644
                         this.tileEntityListTick.remove(tileTickPosition--);
                         continue;
 diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java
-index 478bf49976..8d51af2867 100644
+index 478bf4997..8d51af286 100644
 --- a/src/main/java/net/minecraft/server/WorldPersistentData.java
 +++ b/src/main/java/net/minecraft/server/WorldPersistentData.java
@@ -0,0 +0,0 @@ public class WorldPersistentData {
@ -289,7 +289,7 @@ index 478bf49976..8d51af2867 100644
             throw throwable1;
         } finally {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index d75cc42e11..0e9d5fe3a7 100644
+index d75cc42e1..0e9d5fe3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -0,0 +0,0 @@ import java.util.function.Consumer;
--- a/Spigot-Server-Patches/Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
+++ b/Spigot-Server-Patches/Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
@ -10,7 +10,7 @@ to the object directly on the Entity/TileEntity object we can directly grab.
 Use that local value instead to reduce lookups in many hot places.

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d87b08a49e..c7712d2e71 100644
+index 24d169eee..bf563df53 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
--- a/Spigot-Server-Patches/Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/Chunk-registration-fixes.patch
@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
 Keep them consistent

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 336e6aeef6..282d6ae84c 100644
+index ef4564045..ad1dcf52e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
--- a/Spigot-Server-Patches/Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/Configurable-Keep-Spawn-Loaded-range-per-world.patch
@ -63,7 +63,7 @@ index ee45d3705..01c5d3c57 100644
         }
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 34b5ca3a7..8a445a1fa 100644
+index 98f98c35e..dbb00434f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
--- a/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch
@ -20,7 +20,7 @@ This also makes the Chunk GC System useless, by auto scheduling unload as soon a
 a spare chunk is added to the server thats outside of view distance.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bcc2ecaa3a..c70771614d 100644
+index bcc2ecaa3..c70771614 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -0,0 +0,0 @@ public class PaperWorldConfig {
@ -43,7 +43,7 @@ index bcc2ecaa3a..c70771614d 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index c74176daa5..bdf922db50 100644
+index c74176daa..bdf922db5 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
@ -55,7 +55,7 @@ index c74176daa5..bdf922db50 100644
     public final int locZ;
     private boolean l;
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index 8b3738c8f7..2021c0d02e 100644
+index 8b3738c8f..2021c0d02 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
@@ -0,0 +0,0 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@ -75,7 +75,7 @@ index 8b3738c8f7..2021c0d02e 100644
         // CraftBukkit end
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index c54df45837..d0bf0f72da 100644
+index c54df4583..d0bf0f72d 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
@ -99,7 +99,7 @@ index c54df45837..d0bf0f72da 100644
             this.chunkScheduler.a(booleansupplier);
         }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index e47aae2f8b..b9d90c4fb8 100644
+index e47aae2f8..b9d90c4fb 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
@@ -0,0 +0,0 @@ public class PlayerChunk {
@ -153,7 +153,7 @@ index e47aae2f8b..b9d90c4fb8 100644
         }
     }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 2064576501..ab4f3b7223 100644
+index 206457650..ab4f3b722 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -0,0 +0,0 @@ public class PlayerChunkMap {
@ -172,7 +172,7 @@ index 2064576501..ab4f3b7223 100644
 
     }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 32ee298648..dcff6c8d8a 100644
+index 636d8b820..2aa252fef 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -191,7 +191,7 @@ index 32ee298648..dcff6c8d8a 100644
                         this.methodProfiler.a(() -> {
                             return String.valueOf(TileEntityTypes.a(tileentity.C()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a8c7e7931e..f7883e7085 100644
+index a8c7e7931..f7883e708 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -0,0 +0,0 @@ public class CraftWorld implements World {
@ -204,7 +204,7 @@ index a8c7e7931e..f7883e7085 100644
             }
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index d08ef3fe10..081789a8fe 100644
+index d08ef3fe1..081789a8f 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -0,0 +0,0 @@ public class ActivationRange
--- a/Spigot-Server-Patches/Disable-spigot-tick-limiters.patch
+++ b/Spigot-Server-Patches/Disable-spigot-tick-limiters.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Disable spigot tick limiters


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5788ec6f6..5ff06d247 100644
+index 20990cbfd..3012580e8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -16,13 +16,14 @@ index 5788ec6f6..5ff06d247 100644
 -        for (entityLimiter.initTick();
 -                entitiesThisCycle < entityList.size() && (entitiesThisCycle % 10 != 0 || entityLimiter.shouldContinue());
 -                tickPosition++, entitiesThisCycle++) {
+-            tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
 +        // Paper start - Disable tick limiters
 +        //if (tickPosition < 0) tickPosition = 0;
 +        for (tickPosition = 0; tickPosition < entityList.size(); tickPosition++) {
 +            // Paper end
-             tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
             entity = (Entity) this.entityList.get(this.tickPosition);
             // CraftBukkit end
+             Entity entity1 = entity.getVehicle();
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
         // Spigot start
         // Iterator iterator = this.tileEntityListTick.iterator();
--- a/Spigot-Server-Patches/Don-t-spam-reload-spawn-chunks-in-nether-end.patch
+++ b/Spigot-Server-Patches/Don-t-spam-reload-spawn-chunks-in-nether-end.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Don't spam reload spawn chunks in nether/end


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b595536648..5fc2da0d92 100644
+index cf3e9a6c6..be99425bf 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -17,7 +17,7 @@ index b595536648..5fc2da0d92 100644
         BlockPosition blockposition = this.getSpawn();
         int k = i * 16 + 8 - blockposition.getX();
 diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java
-index 5e87e537e4..3911e4947e 100644
+index 5e87e537e..3911e4947 100644
 --- a/src/main/java/net/minecraft/server/WorldProvider.java
 +++ b/src/main/java/net/minecraft/server/WorldProvider.java
@@ -0,0 +0,0 @@ public abstract class WorldProvider {
--- a/Spigot-Server-Patches/Entity-add-to-world-fixes.patch
+++ b/Spigot-Server-Patches/Entity-add-to-world-fixes.patch
@ -14,7 +14,7 @@ Fix this by differing entity add to world for all entities at the same time
 the original entity is dead, overwrite it as the logic does for unloaod queued entities.

 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 01abe5e376..4502ece4dd 100644
+index 01abe5e37..4502ece4d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -0,0 +0,0 @@ package net.minecraft.server;
@ -53,7 +53,7 @@ index 01abe5e376..4502ece4dd 100644
         }
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3acea908c2..e31e366249 100644
+index 632b2aeb3..7f6a56ff6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -79,7 +79,7 @@ index 3acea908c2..e31e366249 100644
             this.b(entity);
         });
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 293818b196..4cda6cee2b 100644
+index 293818b19..4cda6cee2 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
--- a/Spigot-Server-Patches/Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/Spigot-Server-Patches/Fix-MC-117075-TE-Unload-Lag-Spike.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5e1ab431dc..cdb430ef4f 100644
+index 7c9b4e875..829ab845f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
--- a/Spigot-Server-Patches/Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
@ -18,7 +18,7 @@ This change ensures the chunks are always loaded when entities are
 added to the world, or a valid entity moves between chunks.

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index fb71879ac0..728319968b 100644
+index 586a5a990..8d20f6d05 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
--- a/Spigot-Server-Patches/Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/Ignore-Dead-Entities-in-entityList-iteration.patch
@ -11,7 +11,7 @@ This will ensure that dead entities are skipped from iteration since
 they shouldn't of been in the list in the first place.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index f38179e983..8e1bda4de9 100644
+index f38179e98..8e1bda4de 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
@@ -0,0 +0,0 @@ public class PaperCommand extends Command {
@ -23,7 +23,7 @@ index f38179e983..8e1bda4de9 100644
                     MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                     ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ead5af991c..cf69a4d8a4 100644
+index ead5af991..cf69a4d8a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -35,7 +35,7 @@ index ead5af991c..cf69a4d8a4 100644
     public float length;
     public float J;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1cbe6e17b7..5d60b36678 100644
+index e2068c33f..c32fb50f1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -71,7 +71,7 @@ index 1cbe6e17b7..5d60b36678 100644
             if (entity instanceof EntityInsentient) {
                 EntityInsentient entityinsentient = (EntityInsentient) entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 609b911265..4594bab465 100644
+index 609b91126..4594bab46 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -0,0 +0,0 @@ public class CraftWorld implements World {
--- a/Spigot-Server-Patches/Optimize-Captured-TileEntity-Lookup.patch
+++ b/Spigot-Server-Patches/Optimize-Captured-TileEntity-Lookup.patch
@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0e8025d311..b940f95bdb 100644
+index aa04b9564..f5156a89a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
--- a/Spigot-Server-Patches/Optimize-Light-Recalculations.patch
+++ b/Spigot-Server-Patches/Optimize-Light-Recalculations.patch
@ -7,7 +7,7 @@ Optimizes to not repeatedly look up the same chunk for
 light lookups.

 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 4f64072a7b..966879a894 100644
+index 4f64072a7..966879a89 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
@ -20,7 +20,7 @@ index 4f64072a7b..966879a894 100644
 
             this.x = true;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 97a0fbd55c..fb71879ac0 100644
+index 261567ecc..586a5a990 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
--- a/Spigot-Server-Patches/Optimize-getChunkIfLoaded-type-calls.patch
+++ b/Spigot-Server-Patches/Optimize-getChunkIfLoaded-type-calls.patch
@ -10,7 +10,7 @@ Will improve inlining across many hot methods.
 Improve getBrightness to not do double chunk map lookups.

 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 41926a361b..186cfda7e4 100644
+index 41926a361..186cfda7e 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
@ -23,7 +23,7 @@ index 41926a361b..186cfda7e4 100644
                     neighbor.setNeighborUnloaded(-x, -z);
                     chunk.setNeighborUnloaded(x, z);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 14f419deb8..630ebfb37c 100644
+index 79dea3c85..6d60262c6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -55,7 +55,7 @@ index 14f419deb8..630ebfb37c 100644
             return chunk != null && !chunk.isEmpty();
         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 72eb8ed4f4..7e52859c1d 100644
+index 72eb8ed4f..7e52859c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -0,0 +0,0 @@ public class CraftWorld implements World {
--- a/Spigot-Server-Patches/Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@ -12,7 +12,7 @@ Replace all calls to the new place to the unnecessary forward.
 Optimize getType and getBlockData to manually inline and optimize the calls

 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index 5843ef65af..4c7793f86d 100644
+index 5843ef65a..4c7793f86 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
@@ -0,0 +0,0 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
@ -31,7 +31,7 @@ index 5843ef65af..4c7793f86d 100644
     public BaseBlockPosition(int i, int j, int k) {
         this.a = i;
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 9bb7c9c652..bc364ce371 100644
+index 9bb7c9c65..bc364ce37 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
@@ -0,0 +0,0 @@ public class BlockPosition extends BaseBlockPosition {
@ -52,7 +52,7 @@ index 9bb7c9c652..bc364ce371 100644
         public MutableBlockPosition() {
             this(0, 0, 0);
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 3f9de7e55a..b76c1579ea 100644
+index 3f9de7e55..b76c1579e 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
@ -84,7 +84,7 @@ index 3f9de7e55a..b76c1579ea 100644
             IBlockData iblockdata = null;
 
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 3c5f10ad4d..621ed1fc53 100644
+index 3c5f10ad4..621ed1fc5 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
@@ -0,0 +0,0 @@ public class ChunkSection {
@ -97,7 +97,7 @@ index 3c5f10ad4d..621ed1fc53 100644
     private NibbleArray skyLight;
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index fd45090685..f4e91db7c6 100644
+index 160341d6d..69d2f067b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
--- a/Spigot-Server-Patches/Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/Optimize-redstone-algorithm.patch
@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 61ad2cef7b..a70a64070e 100644
+index 61ad2cef7..a70a64070 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -0,0 +0,0 @@ public class PaperWorldConfig {
@ -39,7 +39,7 @@ index 61ad2cef7b..a70a64070e 100644
 }
 diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 new file mode 100644
-index 0000000000..21d9d6d7ed
+index 000000000..21d9d6d7e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
@@ -0,0 +0,0 @@
@ -954,7 +954,7 @@ index 0000000000..21d9d6d7ed
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
-index 2e30270bb7..72d2617071 100644
+index 2e30270bb..72d261707 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
@@ -0,0 +0,0 @@
@ -1122,7 +1122,7 @@ index 2e30270bb7..72d2617071 100644
                 iblockdata.a(world, blockposition, 0);
                 world.setAir(blockposition);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 027bb64acc..645af17a58 100644
+index 94e189a55..d790fd89f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
--- a/Spigot-Server-Patches/Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Option to prevent armor stands from doing entity lookups


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8c4ff18868..6c4cb61dc5 100644
+index 8c4ff1886..6c4cb61dc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -0,0 +0,0 @@ public class PaperWorldConfig {
@ -21,7 +21,7 @@ index 8c4ff18868..6c4cb61dc5 100644
     private void maxEntityCollision() {
         maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a5f4b9ad94..28fca165cd 100644
+index 7234a92d4..4cb26b842 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
--- a/Spigot-Server-Patches/Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/Remove-unused-World-Tile-Entity-List.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
 Massive hit to performance and it is completely unnecessary.

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5fc2da0d92..04ec2a0399 100644
+index be99425bf..79e8470b6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
--- a/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Vanished players don't have rights


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6598b87eef..539273afbc 100644
+index 6598b87ee..539273afb 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -18,7 +18,7 @@ index 6598b87eef..539273afbc 100644
     protected int k;
     private Entity vehicle;
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index f27d565e1e..49ad201c6e 100644
+index f27d565e1..49ad201c6 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
@@ -0,0 +0,0 @@ public class ItemBlock extends Item {
@ -32,7 +32,7 @@ index f27d565e1e..49ad201c6e 100644
 
         BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 28fca165cd..1929e9d2ae 100644
+index 4cb26b842..da0da1f43 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -74,7 +74,7 @@ index 28fca165cd..1929e9d2ae 100644
         if (voxelshape.isEmpty()) {
             return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 2cfe8afe13..0a3a121cbc 100644
+index 2cfe8afe1..0a3a121cb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -0,0 +0,0 @@ public class CraftEventFactory {
--- a/Spigot-Server-Patches/World-EntityHuman-Lookup-Optimizations.patch
+++ b/Spigot-Server-Patches/World-EntityHuman-Lookup-Optimizations.patch
@ -5,7 +5,7 @@ Subject: [PATCH] World EntityHuman Lookup Optimizations


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5d60b36678..3acea908c2 100644
+index c32fb50f1..632b2aeb3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
--- a/Spigot-Server-Patches/limit-the-range-at-which-we-ll-consider-an-attackabl.patch
+++ b/Spigot-Server-Patches/limit-the-range-at-which-we-ll-consider-an-attackabl.patch
@ -12,7 +12,7 @@ decrease when set, allowing us to skip further checks earlier on
 when looking for an attackable entity

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 645af17a58..7721dfee65 100644
+index d790fd89f..c9a65f7a6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc