diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index 0b98d1dfed..2c38653add 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,77 +1,85 @@ -From c65b3c8564cbf825621c13279504c5e98625fd0c Mon Sep 17 00:00:00 2001 +From b1cbf1d3af0002934ea7540bc89649113d2c087b Mon Sep 17 00:00:00 2001 From: Zach Brown -Date: Sat, 7 Mar 2015 19:16:09 -0600 +Date: Thu, 19 Mar 2015 19:41:15 -0500 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 1c4f56e..4f7f9cf 100644 +index 1c8d4ea..1d54d36 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ - 4.0.0 -- org.spigotmc -- spigot -+ org.github.paperspigot -+ paperspigot - jar - 1.8.3-R0.1-SNAPSHOT -- Spigot -- http://www.spigotmc.org -+ PaperSpigot -+ https://hub.spigotmc.org/stash/projects/PAPER/ - - - UTF-8 -@@ -21,8 +21,8 @@ - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.spigotmc -- spigot-parent +- spigot + org.github.paperspigot -+ paperspigot-parent - dev-SNAPSHOT - ../pom.xml - ++ paperspigot + jar + 1.8.3-R0.1-SNAPSHOT +- Spigot +- http://www.spigotmc.org ++ >PaperSpigot ++ https://hub.spigotmc.org/stash/projects/PAPER/ + + + UTF-8 +@@ -21,8 +21,8 @@ + + + +- org.spigotmc +- spigot-parent ++ org.github.paperspigot ++ paperspigot-parent + dev-SNAPSHOT + ../pom.xml + @@ -34,8 +34,8 @@ - 3.0.3 - - -- org.spigotmc -- spigot-api -+ org.github.paperspigot -+ paperspigot-api - ${project.version} - jar - compile -@@ -113,12 +113,12 @@ - - - -- ex-spigot -+ ex-paperspigot - -- git-Spigot- -+ git-PaperSpigot- - - ../ -- spigot.desc -+ paperspigot.desc - - compile - -@@ -149,7 +149,7 @@ - - org.bukkit.craftbukkit.Main - CraftBukkit -- ${spigot.desc}${craftbukkit.desc} -+ ${paperspigot.desc}${craftbukkit.desc} - Bukkit Team - Bukkit - ${api.version} + 3.0.3 + + +- org.spigotmc +- spigot-api ++ org.github.paperspigot ++ paperspigot-api + ${project.version} + jar + compile +@@ -108,11 +108,11 @@ + 0.2 + + +- ex-spigot ++ ex-paperspigot + +- git-Spigot-%s ++ git-PaperSpigot-%s + ../ +- spigot.desc ++ paperspigot.desc + + initialize + +@@ -132,7 +132,7 @@ + + + +- ++ + + org.apache.maven.plugins + maven-jar-plugin +@@ -142,7 +142,7 @@ + + org.bukkit.craftbukkit.Main + CraftBukkit +- ${spigot.desc}${craftbukkit.desc} ++ ${paperspigot.desc}${craftbukkit.desc} + Bukkit Team + Bukkit + ${api.version} diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java index 9304637..3a4b142 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java diff --git a/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch b/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch index 1d57c25f34..a3d3af5117 100644 --- a/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch +++ b/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch @@ -1,4 +1,4 @@ -From 88e448b2b100242b023b6ce42553515333007cc5 Mon Sep 17 00:00:00 2001 +From 844314dc850a96a99ad53ba82f6023d28b0ce6bc Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 12 Jul 2014 19:32:01 -0500 Subject: [PATCH] PaperSpigot config files @@ -20,10 +20,10 @@ index 86ff385..b80ffe5 100644 DedicatedServer.LOGGER.info("Generating keypair"); this.a(MinecraftEncryption.b()); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 3c89c0d..eb1efce 100644 +index ff73bfb..8b08c84 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -158,6 +158,8 @@ public abstract class World implements IBlockAccess { +@@ -161,6 +161,8 @@ public abstract class World implements IBlockAccess { public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot @@ -32,7 +32,7 @@ index 3c89c0d..eb1efce 100644 public final SpigotTimings.WorldTimingsHandler timings; // Spigot public CraftWorld getWorld() { -@@ -174,6 +176,7 @@ public abstract class World implements IBlockAccess { +@@ -177,6 +179,7 @@ public abstract class World implements IBlockAccess { protected World(IDataManager idatamanager, WorldData worlddata, WorldProvider worldprovider, MethodProfiler methodprofiler, boolean flag, ChunkGenerator gen, org.bukkit.World.Environment env) { this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot diff --git a/Spigot-Server-Patches/0004-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0004-Vanished-players-don-t-have-rights.patch index e76c0c3974..20724a3827 100644 --- a/Spigot-Server-Patches/0004-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0004-Vanished-players-don-t-have-rights.patch @@ -1,4 +1,4 @@ -From 8ae819d36ca20264aec0d137ea473e856b5ca8e3 Mon Sep 17 00:00:00 2001 +From 9ed212f5608c2d5592c138d4adf2299440892e92 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 7 Mar 2015 19:50:01 -0600 Subject: [PATCH] Vanished players don't have rights @@ -56,10 +56,10 @@ index 451a0bb..24601c7 100644 IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index eb1efce..79f3a35 100644 +index 8b08c84..9c98645 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1668,6 +1668,13 @@ public abstract class World implements IBlockAccess { +@@ -1671,6 +1671,13 @@ public abstract class World implements IBlockAccess { for (int i = 0; i < list.size(); ++i) { Entity entity1 = (Entity) list.get(i); diff --git a/Spigot-Server-Patches/0011-Fix-redstone-lag-issues.patch b/Spigot-Server-Patches/0011-Fix-redstone-lag-issues.patch index 69b3ee9021..802662780b 100644 --- a/Spigot-Server-Patches/0011-Fix-redstone-lag-issues.patch +++ b/Spigot-Server-Patches/0011-Fix-redstone-lag-issues.patch @@ -1,14 +1,14 @@ -From 906384a591c53969ada81e81facac32fe5678b44 Mon Sep 17 00:00:00 2001 +From 4c87da5a76d6f6d9a35167a7a3a087355402e23c Mon Sep 17 00:00:00 2001 From: Iceee Date: Sat, 7 Mar 2015 20:49:31 -0600 Subject: [PATCH] Fix redstone lag issues diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 1090707..fce4e46 100644 +index a599869..e27d770 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -604,6 +604,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -610,6 +610,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { if (i != this.L.size()) { throw new IllegalStateException("TickNextTick list out of synch"); } else { @@ -17,7 +17,7 @@ index 1090707..fce4e46 100644 if (i > 1000) { // CraftBukkit start - If the server has too much to process over time, try to alleviate that if (i > 20 * 1000) { -@@ -612,7 +614,11 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -618,7 +620,11 @@ public class WorldServer extends World implements IAsyncTaskHandler { i = 1000; } // CraftBukkit end diff --git a/Spigot-Server-Patches/0018-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0018-Allow-for-toggling-of-spawn-chunks.patch index 262033ba24..b91cd6cc5b 100644 --- a/Spigot-Server-Patches/0018-Allow-for-toggling-of-spawn-chunks.patch +++ b/Spigot-Server-Patches/0018-Allow-for-toggling-of-spawn-chunks.patch @@ -1,14 +1,14 @@ -From fe58a8833b9879118f5995e1c7b096927d95b4ac Mon Sep 17 00:00:00 2001 +From e2a98f102da3b5823b45e9d17d179f766d905721 Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Sat, 7 Mar 2015 21:50:40 -0600 Subject: [PATCH] Allow for toggling of spawn chunks diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 79f3a35..5de359f 100644 +index 9c98645..383178f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -227,6 +227,7 @@ public abstract class World implements IBlockAccess { +@@ -230,6 +230,7 @@ public abstract class World implements IBlockAccess { }); this.getServer().addWorld(this.world); // CraftBukkit end diff --git a/Spigot-Server-Patches/0021-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0021-Player-affects-spawning-API.patch index 97b12b9175..0839d12bfb 100644 --- a/Spigot-Server-Patches/0021-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0021-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From 454e8437a7c5f9488bbf5eb9da051d93e437815c Mon Sep 17 00:00:00 2001 +From 06ac3e7a3f45b556f5e23131f432620560ed13f4 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 7 Mar 2015 22:52:21 -0600 Subject: [PATCH] Player affects spawning API @@ -65,10 +65,10 @@ index aeb0a44..7df5b84 100644 biomebase_biomemeta = worldserver.a(enumcreaturetype, blockposition2); if (biomebase_biomemeta == null) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 5de359f..d409544 100644 +index 383178f..1f9da7a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -3116,4 +3116,50 @@ public abstract class World implements IBlockAccess { +@@ -3135,4 +3135,50 @@ public abstract class World implements IBlockAccess { return k >= -short0 && k <= short0 && l >= -short0 && l <= short0 && this.keepSpawnInMemory; // CraftBukkit - Added 'this.keepSpawnInMemory' } @@ -120,7 +120,7 @@ index 5de359f..d409544 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8091b4e..571e066 100644 +index 06e014c..5d5f987 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1443,6 +1443,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0024-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0024-Remove-invalid-mob-spawner-tile-entities.patch index e08df86749..47d0194b88 100644 --- a/Spigot-Server-Patches/0024-Remove-invalid-mob-spawner-tile-entities.patch +++ b/Spigot-Server-Patches/0024-Remove-invalid-mob-spawner-tile-entities.patch @@ -1,14 +1,14 @@ -From 5b559214f1d5f55103d9e166d05e8e19abe6c3f7 Mon Sep 17 00:00:00 2001 +From 390efb6681ac43fcc4cafc409a4f92b541e7a351 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Sun, 8 Mar 2015 01:06:14 -0600 Subject: [PATCH] Remove invalid mob spawner tile entities diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 5794345..76b0e65 100644 +index 2141126..ac8b1ba 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -776,6 +776,11 @@ public class Chunk { +@@ -786,6 +786,11 @@ public class Chunk { tileentity.D(); this.tileEntities.put(blockposition, tileentity); // CraftBukkit start diff --git a/Spigot-Server-Patches/0025-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0025-Optimize-TileEntity-Ticking.patch index 0ac21aacec..fe271d09d7 100644 --- a/Spigot-Server-Patches/0025-Optimize-TileEntity-Ticking.patch +++ b/Spigot-Server-Patches/0025-Optimize-TileEntity-Ticking.patch @@ -1,4 +1,4 @@ -From 1426b1cb32376ab29d1e094b8cd0ee4235ded98a Mon Sep 17 00:00:00 2001 +From 567fda34866e5f559f4649798c8db63358d5e8cb Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 8 Mar 2015 01:56:22 -0600 Subject: [PATCH] Optimize TileEntity Ticking @@ -74,10 +74,10 @@ index f75e2de..7119612 100644 if (this.e instanceof BlockDaylightDetector) { ((BlockDaylightDetector) this.e).f(this.world, this.position); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index d409544..1edf395 100644 +index 1f9da7a..1761ea7 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -62,7 +62,7 @@ public abstract class World implements IBlockAccess { +@@ -65,7 +65,7 @@ public abstract class World implements IBlockAccess { // Spigot end protected final List g = Lists.newArrayList(); public final List h = Lists.newArrayList(); @@ -86,7 +86,7 @@ index d409544..1edf395 100644 private final List b = Lists.newArrayList(); private final List c = Lists.newArrayList(); public final List players = Lists.newArrayList(); -@@ -135,8 +135,10 @@ public abstract class World implements IBlockAccess { +@@ -138,8 +138,10 @@ public abstract class World implements IBlockAccess { public static boolean haveWeSilencedAPhysicsCrash; public static String blockLocation; private org.spigotmc.TickLimiter entityLimiter; @@ -99,7 +99,7 @@ index d409544..1edf395 100644 public static long chunkToKey(int x, int z) { -@@ -230,7 +232,7 @@ public abstract class World implements IBlockAccess { +@@ -233,7 +235,7 @@ public abstract class World implements IBlockAccess { this.keepSpawnInMemory = this.paperSpigotConfig.keepSpawnInMemory; // PaperSpigot timings = new SpigotTimings.WorldTimingsHandler(this); // Spigot - code below can generate new world and access timings this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime); @@ -108,7 +108,7 @@ index d409544..1edf395 100644 } public World b() { -@@ -1464,6 +1466,12 @@ public abstract class World implements IBlockAccess { +@@ -1467,6 +1469,12 @@ public abstract class World implements IBlockAccess { } // CraftBukkit end @@ -121,7 +121,7 @@ index d409544..1edf395 100644 // Spigot start int tilesThisCycle = 0; for (tileLimiter.initTick(); -@@ -1471,10 +1479,12 @@ public abstract class World implements IBlockAccess { +@@ -1474,10 +1482,12 @@ public abstract class World implements IBlockAccess { tileTickPosition++, tilesThisCycle++) { tileTickPosition = (tileTickPosition < tileEntityList.size()) ? tileTickPosition : 0; TileEntity tileentity = (TileEntity) this.tileEntityList.get(tileTickPosition); @@ -135,7 +135,7 @@ index d409544..1edf395 100644 continue; } // Spigot end -@@ -1502,7 +1512,7 @@ public abstract class World implements IBlockAccess { +@@ -1505,7 +1515,7 @@ public abstract class World implements IBlockAccess { } if (tileentity.x()) { diff --git a/Spigot-Server-Patches/0027-Remove-certain-entities-that-fly-through-unloaded-ch.patch b/Spigot-Server-Patches/0027-Remove-certain-entities-that-fly-through-unloaded-ch.patch index b8d6a922ed..41c0ea3871 100644 --- a/Spigot-Server-Patches/0027-Remove-certain-entities-that-fly-through-unloaded-ch.patch +++ b/Spigot-Server-Patches/0027-Remove-certain-entities-that-fly-through-unloaded-ch.patch @@ -1,4 +1,4 @@ -From 0311567c78327f3310ceb0f645cf31037949c6da Mon Sep 17 00:00:00 2001 +From bce1f0246609ac7585ce26ba615ae0c6ba64c53b Mon Sep 17 00:00:00 2001 From: Iceee Date: Sun, 8 Mar 2015 03:34:15 -0500 Subject: [PATCH] Remove certain entities that fly through unloaded chunks @@ -70,10 +70,10 @@ index 2d22327..50423eb 100644 this.motY *= 0.9800000190734863D; this.motZ *= 0.9800000190734863D; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1edf395..aecc834 100644 +index 1761ea7..564f9a7 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1171,6 +1171,7 @@ public abstract class World implements IBlockAccess { +@@ -1174,6 +1174,7 @@ public abstract class World implements IBlockAccess { { if ( !this.isChunkLoaded( chunkx, chunkz, true ) ) { @@ -81,7 +81,7 @@ index 1edf395..aecc834 100644 continue; } int cz = chunkz << 4; -@@ -1600,6 +1601,14 @@ public abstract class World implements IBlockAccess { +@@ -1603,6 +1604,14 @@ public abstract class World implements IBlockAccess { if (!org.spigotmc.ActivationRange.checkIfActive(entity)) { entity.ticksLived++; entity.inactiveTick(); diff --git a/Spigot-Server-Patches/0035-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch b/Spigot-Server-Patches/0035-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch index 79447be2dc..8a0d3a09d9 100644 --- a/Spigot-Server-Patches/0035-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch +++ b/Spigot-Server-Patches/0035-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch @@ -1,14 +1,14 @@ -From 1370eab3d6f63ae56c9c02765f5f0c216a847716 Mon Sep 17 00:00:00 2001 +From 2f1eb19113992c67333285f2af81f6198897b3eb Mon Sep 17 00:00:00 2001 From: Byteflux Date: Sun, 30 Nov 2014 18:58:07 -0600 Subject: [PATCH] Allow specified ItemStacks to retain their invalid data diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index de60437..bace99c 100644 +index 9a7c7cb..7b18476 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java -@@ -17,6 +17,8 @@ import org.bukkit.entity.Player; +@@ -18,6 +18,8 @@ import org.bukkit.entity.Player; import org.bukkit.event.world.StructureGrowEvent; // CraftBukkit end @@ -17,7 +17,7 @@ index de60437..bace99c 100644 public final class ItemStack { public static final DecimalFormat a = new DecimalFormat("#.###"); -@@ -306,9 +308,13 @@ public final class ItemStack { +@@ -312,9 +314,13 @@ public final class ItemStack { } // Is this a block? diff --git a/Spigot-Server-Patches/0036-Add-TNT-source-location-API.patch b/Spigot-Server-Patches/0036-Add-TNT-source-location-API.patch index c12102028b..341c2266be 100644 --- a/Spigot-Server-Patches/0036-Add-TNT-source-location-API.patch +++ b/Spigot-Server-Patches/0036-Add-TNT-source-location-API.patch @@ -1,4 +1,4 @@ -From b92f67d7de492bf639da984d09d1067fa53575b8 Mon Sep 17 00:00:00 2001 +From cbb32a3e84c597db603360864d67295ec7dd2728 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 8 Mar 2015 04:23:41 -0500 Subject: [PATCH] Add TNT source location API @@ -98,10 +98,10 @@ index 50423eb..1daba4e 100644 public EntityLiving getSource() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index d8401c4..6ee6889 100644 +index 4c55e68..5a2ad44 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1096,7 +1096,8 @@ public class CraftWorld implements World { +@@ -1100,7 +1100,8 @@ public class CraftWorld implements World { throw new IllegalArgumentException("Cannot spawn hanging entity for " + clazz.getName() + " at " + location); } } else if (TNTPrimed.class.isAssignableFrom(clazz)) { diff --git a/Spigot-Server-Patches/0037-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0037-Prevent-tile-entity-and-entity-crashes.patch index 128c9c04cb..f7595fefde 100644 --- a/Spigot-Server-Patches/0037-Prevent-tile-entity-and-entity-crashes.patch +++ b/Spigot-Server-Patches/0037-Prevent-tile-entity-and-entity-crashes.patch @@ -1,4 +1,4 @@ -From d63b9fa7def1ca0607249795e4c3bd7ae77f440f Mon Sep 17 00:00:00 2001 +From 4f48af740265cfcab39c9d8c8a013ee0e3ba101a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 8 Mar 2015 04:37:23 -0500 Subject: [PATCH] Prevent tile entity and entity crashes @@ -23,10 +23,10 @@ index 2118c08..bd8278a 100644 public String a() throws Exception { int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock()); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index aecc834..e32bd3b 100644 +index 564f9a7..4a71d0d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1429,10 +1429,13 @@ public abstract class World implements IBlockAccess { +@@ -1432,10 +1432,13 @@ public abstract class World implements IBlockAccess { this.g(entity); SpigotTimings.tickEntityTimer.stopTiming(); // Spigot } catch (Throwable throwable1) { @@ -44,7 +44,7 @@ index aecc834..e32bd3b 100644 } } -@@ -1498,11 +1501,13 @@ public abstract class World implements IBlockAccess { +@@ -1501,11 +1504,13 @@ public abstract class World implements IBlockAccess { tileentity.tickTimer.startTiming(); // Spigot ((IUpdatePlayerListBox) tileentity).c(); } catch (Throwable throwable2) {