From 17fe7a1b43e2bf409fe761760a943e385c6d0e5f Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 15 May 2019 22:53:13 +0100 Subject: [PATCH 1/2] 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. --- .../0041-Disable-spigot-tick-limiters.patch | 13 +++++---- .../0056-Add-exception-reporting-event.patch | 28 +++++++++---------- ...Location-getType-and-getBlockData-fo.patch | 18 ++++++------ ...le-Keep-Spawn-Loaded-range-per-world.patch | 6 ++-- ...am-reload-spawn-chunks-in-nether-end.patch | 8 +++--- ...Remove-unused-World-Tile-Entity-List.patch | 14 +++++----- ...unk-Unloads-based-on-Player-Movement.patch | 22 +++++++-------- .../0135-Chunk-registration-fixes.patch | 6 ++-- ...97-Fix-MC-117075-TE-Unload-Lag-Spike.patch | 6 ++-- ...ups-for-Entity-TileEntity-Current-Ch.patch | 10 +++---- ...t-armor-stands-from-doing-entity-loo.patch | 8 +++--- ...8-Vanished-players-don-t-have-rights.patch | 12 ++++---- ...ead-Entities-in-entityList-iteration.patch | 14 +++++----- ...rld-EntityHuman-Lookup-Optimizations.patch | 10 +++---- .../0318-Entity-add-to-world-fixes.patch | 10 +++---- ...Optimize-getChunkIfLoaded-type-calls.patch | 10 +++---- .../0363-Optimize-Light-Recalculations.patch | 8 +++--- ...h-entity-loss-due-to-unloaded-chunks.patch | 6 ++-- .../0395-Optimize-redstone-algorithm.patch | 12 ++++---- ...at-which-we-ll-consider-an-attackabl.patch | 6 ++-- ...-Optimize-Captured-TileEntity-Lookup.patch | 6 ++-- 21 files changed, 117 insertions(+), 116 deletions(-) diff --git a/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch index 0761461fbc..a0a34895ac 100644 --- a/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch +++ b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch @@ -1,14 +1,14 @@ -From 66294924c12de6f6629939c1f80582f443480e83 Mon Sep 17 00:00:00 2001 +From bd7b275c123243666ca49a450f3b5e2146f2fedd Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 23:45:17 -0600 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 -@@ -1124,10 +1124,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1124,11 +1124,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc // CraftBukkit start - Use field for loop variable co.aikar.timings.TimingHistory.entityTicks += this.entityList.size(); // Paper int entitiesThisCycle = 0; @@ -16,14 +16,15 @@ 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 -@@ -1191,9 +1191,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc + Entity entity1 = entity.getVehicle(); +@@ -1191,9 +1190,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc // Spigot start // Iterator iterator = this.tileEntityListTick.iterator(); int tilesThisCycle = 0; @@ -35,5 +36,5 @@ index 5788ec6f6..5ff06d247 100644 TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition); // Spigot start -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0056-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0056-Add-exception-reporting-event.patch index 300e6a5749..b0a89d9ea0 100644 --- a/Spigot-Server-Patches/0056-Add-exception-reporting-event.patch +++ b/Spigot-Server-Patches/0056-Add-exception-reporting-event.patch @@ -1,4 +1,4 @@ -From 0f1c8615e262b38dcdde638ce67cf87eaa8175bb Mon Sep 17 00:00:00 2001 +From d617197c2a04fee2ea3d2884bf00f3a2e5cb609c Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 03:15:41 -0600 Subject: [PATCH] Add exception reporting event @@ -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 +1,38 @@ @@ -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 @@ -1,5 +1,6 @@ @@ -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 @@ -13,6 +13,7 @@ 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 @@ -1,5 +1,6 @@ @@ -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 @@ -1,5 +1,6 @@ @@ -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 @@ -1,5 +1,6 @@ @@ -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 @@ -10,6 +10,7 @@ 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 @@ -1,5 +1,7 @@ @@ -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 @@ -1,6 +1,8 @@ @@ -252,7 +252,7 @@ index 09cf98ccdd..6e7c0c9da4 100644 import com.google.common.base.MoreObjects; import com.google.common.collect.Lists; import it.unimi.dsi.fastutil.longs.LongSet; -@@ -1151,8 +1153,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1150,8 +1152,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc } catch (Throwable throwable1) { entity.tickTimer.stopTiming(); // Paper start - Prevent tile entity and entity crashes @@ -264,7 +264,7 @@ index 09cf98ccdd..6e7c0c9da4 100644 entity.dead = true; continue; // Paper end -@@ -1217,8 +1221,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1216,8 +1220,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc this.methodProfiler.exit(); } catch (Throwable throwable2) { // Paper start - Prevent tile entity and entity crashes @@ -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 @@ -138,6 +138,7 @@ 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 @@ -17,6 +17,9 @@ import java.util.function.Consumer; diff --git a/Spigot-Server-Patches/0080-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0080-Optimize-isValidLocation-getType-and-getBlockData-fo.patch index 3f985bdd7d..74a67e5c28 100644 --- a/Spigot-Server-Patches/0080-Optimize-isValidLocation-getType-and-getBlockData-fo.patch +++ b/Spigot-Server-Patches/0080-Optimize-isValidLocation-getType-and-getBlockData-fo.patch @@ -1,4 +1,4 @@ -From e97a654e918381c5b2eb07cf6d632fb55c457fa6 Mon Sep 17 00:00:00 2001 +From c494d0736329d1bb4be277151e34a0bfe64b3341 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 02:07:55 -0600 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling @@ -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 @@ -10,6 +10,14 @@ public class BaseBlockPosition implements Comparable { @@ -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 @@ -300,6 +300,16 @@ 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 @@ -425,12 +425,24 @@ 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 @@ -7,7 +7,7 @@ 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 @@ -257,11 +257,11 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -173,7 +173,7 @@ index fd45090685..f4e91db7c6 100644 return FluidTypes.EMPTY.i(); } else { Chunk chunk = this.getChunkAtWorldCoords(blockposition); -@@ -1767,7 +1767,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1766,7 +1766,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc public Map capturedTileEntities = Maps.newHashMap(); @Nullable public TileEntity getTileEntity(BlockPosition blockposition) { @@ -182,7 +182,7 @@ index fd45090685..f4e91db7c6 100644 return null; } else { // CraftBukkit start -@@ -1808,7 +1808,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1807,7 +1807,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc } public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) { @@ -191,7 +191,7 @@ index fd45090685..f4e91db7c6 100644 if (tileentity != null && !tileentity.x()) { // CraftBukkit start if (captureBlockStates) { -@@ -1869,7 +1869,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1868,7 +1868,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc } public boolean p(BlockPosition blockposition) { diff --git a/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch index bb86e832ef..44340affb8 100644 --- a/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From f4e4fe03783d2f79376e0dfb9254d398d1635a2f Mon Sep 17 00:00:00 2001 +From 00c1a50483d196c47548593f019bdd92e1068652 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 13 Sep 2014 23:14:43 -0400 Subject: [PATCH] Configurable Keep Spawn Loaded range per world @@ -63,10 +63,10 @@ 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 -@@ -2853,8 +2853,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -2852,8 +2852,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc int k = i * 16 + 8 - blockposition.getX(); int l = j * 16 + 8 - blockposition.getZ(); boolean flag = true; diff --git a/Spigot-Server-Patches/0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch index 8d75ee07a0..4d5a6cdacf 100644 --- a/Spigot-Server-Patches/0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch +++ b/Spigot-Server-Patches/0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch @@ -1,14 +1,14 @@ -From e967f3bcc7b0a00d5282d2a2d5976e1e48107238 Mon Sep 17 00:00:00 2001 +From ae41855e7de88db8a2656b3ebe137344425a0bce Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Apr 2016 19:42:22 -0400 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 -@@ -2849,6 +2849,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -2848,6 +2848,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc return this.K; } @@ -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 @@ -69,7 +69,7 @@ public abstract class WorldProvider { diff --git a/Spigot-Server-Patches/0100-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0100-Remove-unused-World-Tile-Entity-List.patch index 2dd3a0811a..0495439c62 100644 --- a/Spigot-Server-Patches/0100-Remove-unused-World-Tile-Entity-List.patch +++ b/Spigot-Server-Patches/0100-Remove-unused-World-Tile-Entity-List.patch @@ -1,4 +1,4 @@ -From 509bc747e1d9431854cb6956c0fc1d1c95e072ed Mon Sep 17 00:00:00 2001 +From 207e691dacdbfaf3763928e98ec9e2824a066ea1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 00:25:28 -0400 Subject: [PATCH] Remove unused World Tile Entity List @@ -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 @@ -71,7 +71,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -18,7 +18,7 @@ index 5fc2da0d92..04ec2a0399 100644 public final List tileEntityListTick = Lists.newArrayList(); private final List c = Lists.newArrayList(); private final Set tileEntityListUnload = com.google.common.collect.Sets.newHashSet(); // Paper -@@ -1269,7 +1269,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1268,7 +1268,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc timings.tileEntityTick.startTiming(); // Spigot if (!this.tileEntityListUnload.isEmpty()) { this.tileEntityListTick.removeAll(this.tileEntityListUnload); @@ -27,7 +27,7 @@ index 5fc2da0d92..04ec2a0399 100644 this.tileEntityListUnload.clear(); } -@@ -1322,7 +1322,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1321,7 +1321,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc if (tileentity.x()) { tilesThisCycle--; this.tileEntityListTick.remove(tileTickPosition--); @@ -36,7 +36,7 @@ index 5fc2da0d92..04ec2a0399 100644 if (this.isLoaded(tileentity.getPosition())) { this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition()); } -@@ -1352,7 +1352,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1351,7 +1351,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc this.notify(tileentity1.getPosition(), iblockdata, iblockdata, 3); // CraftBukkit start // From above, don't screw this up - SPIGOT-1746 @@ -45,7 +45,7 @@ index 5fc2da0d92..04ec2a0399 100644 this.a(tileentity1); } // CraftBukkit end -@@ -1372,9 +1372,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1371,9 +1371,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc protected void p_() {} public boolean a(TileEntity tileentity) { @@ -57,7 +57,7 @@ index 5fc2da0d92..04ec2a0399 100644 this.tileEntityListTick.add(tileentity); } -@@ -1855,7 +1855,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1854,7 +1854,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc } else { if (tileentity != null) { this.c.remove(tileentity); diff --git a/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch index 33d5985c69..e06a71e1ea 100644 --- a/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch +++ b/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch @@ -1,4 +1,4 @@ -From 2fbf2c556d7840198741959940696a14c7e3c26a Mon Sep 17 00:00:00 2001 +From 743d95053dad6291fa08b2cd3a8e35d32bf0eb14 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Jun 2016 23:22:12 -0400 Subject: [PATCH] Delay Chunk Unloads based on Player Movement @@ -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 @@ -310,4 +310,18 @@ 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 @@ -40,6 +40,7 @@ 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 @@ -48,6 +48,15 @@ public class ChunkMap extends Long2ObjectOpenHashMap { @@ -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 @@ -307,6 +307,19 @@ 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 @@ -29,8 +29,23 @@ 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 @@ -452,7 +452,13 @@ public class PlayerChunkMap { @@ -172,10 +172,10 @@ 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 -@@ -1293,7 +1293,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1292,7 +1292,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc if (!tileentity.x() && tileentity.hasWorld()) { BlockPosition blockposition = tileentity.getPosition(); @@ -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 @@ -1772,7 +1772,7 @@ 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 @@ -323,6 +323,11 @@ public class ActivationRange diff --git a/Spigot-Server-Patches/0135-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0135-Chunk-registration-fixes.patch index 2fc6ba3cca..5f2bb64690 100644 --- a/Spigot-Server-Patches/0135-Chunk-registration-fixes.patch +++ b/Spigot-Server-Patches/0135-Chunk-registration-fixes.patch @@ -1,4 +1,4 @@ -From 3b58205c29904e995b9ea750ec5d41de9427897b Mon Sep 17 00:00:00 2001 +From 7a4ba4be907fc92d45e7ca3fc6e8986b5d6837e9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 22:54:28 -0400 Subject: [PATCH] Chunk registration fixes @@ -8,10 +8,10 @@ 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 -@@ -1473,7 +1473,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1472,7 +1472,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc } i = MathHelper.floor(entity.locX / 16.0D); diff --git a/Spigot-Server-Patches/0197-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0197-Fix-MC-117075-TE-Unload-Lag-Spike.patch index 71453083cd..d78dce82f4 100644 --- a/Spigot-Server-Patches/0197-Fix-MC-117075-TE-Unload-Lag-Spike.patch +++ b/Spigot-Server-Patches/0197-Fix-MC-117075-TE-Unload-Lag-Spike.patch @@ -1,14 +1,14 @@ -From 15cd669dcb33567293742d5942ca735b544822d1 Mon Sep 17 00:00:00 2001 +From 11cb88149b598d003438e6e1b8e430640a012185 Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 9 Aug 2017 17:51:22 -0500 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 -@@ -1274,7 +1274,11 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1273,7 +1273,11 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc this.methodProfiler.exitEnter("blockEntities"); timings.tileEntityTick.startTiming(); // Spigot if (!this.tileEntityListUnload.isEmpty()) { diff --git a/Spigot-Server-Patches/0279-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch b/Spigot-Server-Patches/0279-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch index 885f49fd26..f0ca1f81c3 100644 --- a/Spigot-Server-Patches/0279-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch +++ b/Spigot-Server-Patches/0279-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch @@ -1,4 +1,4 @@ -From bc5d4dcd27553b19ebbd6f37ba6281fc26c5f2be Mon Sep 17 00:00:00 2001 +From 2419083c0b4fd0a0f99df2c3c0fbb40cf3530960 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 03:39:51 -0400 Subject: [PATCH] Avoid Chunk Lookups for Entity/TileEntity Current Chunk @@ -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 @@ -1110,9 +1110,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -37,7 +37,7 @@ index d87b08a49e..c7712d2e71 100644 //} // Paper - merge //for (Entity e : this.g) { // Paper - merge -@@ -1262,9 +1260,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1261,9 +1259,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc j = entity.chunkX; int l = entity.chunkZ; @@ -51,7 +51,7 @@ index d87b08a49e..c7712d2e71 100644 guardEntityList = false; // Spigot this.entityList.remove(this.tickPosition--); // CraftBukkit - Use field for loop variable -@@ -1309,7 +1308,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1308,7 +1307,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc BlockPosition blockposition = tileentity.getPosition(); // Paper start - Skip ticking in chunks scheduled for unload @@ -60,7 +60,7 @@ index d87b08a49e..c7712d2e71 100644 boolean shouldTick = chunk != null; if(this.paperConfig.skipEntityTickingInChunksScheduledForUnload) shouldTick = shouldTick && chunk.scheduledForUnload == null; -@@ -1345,8 +1344,11 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1344,8 +1343,11 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc tilesThisCycle--; this.tileEntityListTick.remove(tileTickPosition--); //this.tileEntityList.remove(tileentity); // Paper - remove unused list diff --git a/Spigot-Server-Patches/0297-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0297-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index e3dd2f193c..73047ec185 100644 --- a/Spigot-Server-Patches/0297-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/Spigot-Server-Patches/0297-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -1,11 +1,11 @@ -From 6244aa55134ca674298f84bd72c07d62cc31a54d Mon Sep 17 00:00:00 2001 +From da60a332e0cf990fc91f7aa70d22488ea37b2297 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Mon, 23 Jul 2018 12:57:39 +0200 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 @@ -375,6 +375,11 @@ public class PaperWorldConfig { @@ -21,10 +21,10 @@ 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 -@@ -1539,6 +1539,14 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1538,6 +1538,14 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc } } diff --git a/Spigot-Server-Patches/0298-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0298-Vanished-players-don-t-have-rights.patch index ba8f5fce15..ee93cb4621 100644 --- a/Spigot-Server-Patches/0298-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0298-Vanished-players-don-t-have-rights.patch @@ -1,11 +1,11 @@ -From 8230851068dc6fdb84a1ea3aa2f993f196bfc02c Mon Sep 17 00:00:00 2001 +From c21feadc49b87354d016a8837c2af1b617698f36 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Mon, 23 Jul 2018 14:22:26 +0200 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 @@ -92,7 +92,7 @@ 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 @@ -70,7 +70,8 @@ public class ItemBlock extends Item { @@ -32,10 +32,10 @@ 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 -@@ -1521,6 +1521,37 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1520,6 +1520,37 @@ 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 @@ -1000,6 +1000,14 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0307-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0307-Ignore-Dead-Entities-in-entityList-iteration.patch index e89540120a..e2420f1763 100644 --- a/Spigot-Server-Patches/0307-Ignore-Dead-Entities-in-entityList-iteration.patch +++ b/Spigot-Server-Patches/0307-Ignore-Dead-Entities-in-entityList-iteration.patch @@ -1,4 +1,4 @@ -From 9668175b9daf82f6d0646d0b3a3569a0ff38cfd9 Mon Sep 17 00:00:00 2001 +From d56b8e342642b04ba0e3d1aa97ad38442f621c95 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 28 Jul 2018 12:18:27 -0400 Subject: [PATCH] Ignore Dead Entities in entityList iteration @@ -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 @@ -176,6 +176,7 @@ public class PaperCommand extends Command { @@ -23,7 +23,7 @@ index f38179e983..8e1bda4de9 100644 MutablePair> 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 @@ -121,6 +121,7 @@ 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 @@ -1046,6 +1046,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -54,7 +54,7 @@ index 1cbe6e17b7..5d60b36678 100644 if (!guardEntityList) { // Spigot - It will get removed after the tick if we are ticking // Paper - always remove from current chunk above // CraftBukkit start - Decrement loop variable field if we've already ticked this entity -@@ -2316,6 +2318,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -2315,6 +2317,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc while (iterator.hasNext()) { Entity entity = (Entity) iterator.next(); @@ -62,7 +62,7 @@ index 1cbe6e17b7..5d60b36678 100644 if (oclass.isAssignableFrom(entity.getClass()) && predicate.test((T) entity)) { // CraftBukkit - decompile error list.add((T) entity); // CraftBukkit - decompile error -@@ -2402,6 +2405,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -2401,6 +2404,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc while (iterator.hasNext()) { Entity entity = (Entity) iterator.next(); @@ -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 @@ -634,6 +634,7 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0312-World-EntityHuman-Lookup-Optimizations.patch b/Spigot-Server-Patches/0312-World-EntityHuman-Lookup-Optimizations.patch index 796ed803a9..1705747d0d 100644 --- a/Spigot-Server-Patches/0312-World-EntityHuman-Lookup-Optimizations.patch +++ b/Spigot-Server-Patches/0312-World-EntityHuman-Lookup-Optimizations.patch @@ -1,11 +1,11 @@ -From df9635bc942ea00aedd136fdea9d06027e38b337 Mon Sep 17 00:00:00 2001 +From 5e13b150ff63da8a5292f35e1276759b514a1dde Mon Sep 17 00:00:00 2001 From: willies952002 Date: Mon, 30 Jul 2018 02:42:49 -0400 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 @@ -76,6 +76,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -41,7 +41,7 @@ index 5d60b36678..3acea908c2 100644 this.everyoneSleeping(); } -@@ -2667,6 +2672,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -2666,6 +2671,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @Nullable public EntityHuman a(String s) { @@ -50,7 +50,7 @@ index 5d60b36678..3acea908c2 100644 for (int i = 0; i < this.players.size(); ++i) { EntityHuman entityhuman = (EntityHuman) this.players.get(i); -@@ -2676,10 +2683,15 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -2675,10 +2682,15 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc } return null; @@ -66,7 +66,7 @@ index 5d60b36678..3acea908c2 100644 for (int i = 0; i < this.players.size(); ++i) { EntityHuman entityhuman = (EntityHuman) this.players.get(i); -@@ -2689,6 +2701,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -2688,6 +2700,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc } return null; diff --git a/Spigot-Server-Patches/0318-Entity-add-to-world-fixes.patch b/Spigot-Server-Patches/0318-Entity-add-to-world-fixes.patch index 9b8db42564..a5bc45985f 100644 --- a/Spigot-Server-Patches/0318-Entity-add-to-world-fixes.patch +++ b/Spigot-Server-Patches/0318-Entity-add-to-world-fixes.patch @@ -1,4 +1,4 @@ -From caaa22ced1e3cc9e7c6c79192259a5436f1783e3 Mon Sep 17 00:00:00 2001 +From dba6487c2a1a44c29456f3b29a2c3f611758526b Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 3 Aug 2018 22:47:46 -0400 Subject: [PATCH] Entity add to world fixes @@ -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 @@ -2,6 +2,8 @@ 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 @@ -1037,6 +1037,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -64,7 +64,7 @@ index 3acea908c2..e31e366249 100644 this.entityList.add(entity); this.b(entity); return true; -@@ -2434,9 +2435,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -2433,9 +2434,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc return j; } @@ -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 @@ -967,7 +967,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/Spigot-Server-Patches/0341-Optimize-getChunkIfLoaded-type-calls.patch b/Spigot-Server-Patches/0341-Optimize-getChunkIfLoaded-type-calls.patch index a0b48be77e..4f9890d7a3 100644 --- a/Spigot-Server-Patches/0341-Optimize-getChunkIfLoaded-type-calls.patch +++ b/Spigot-Server-Patches/0341-Optimize-getChunkIfLoaded-type-calls.patch @@ -1,4 +1,4 @@ -From c630ddd10b4711ffcd5318829821fb44f48294df Mon Sep 17 00:00:00 2001 +From 368ac6d9fa82a95c89036c5496a65826897a8995 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 29 Aug 2018 21:59:22 -0400 Subject: [PATCH] Optimize getChunkIfLoaded type calls @@ -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 @@ -379,7 +379,7 @@ 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 @@ -162,7 +162,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -45,7 +45,7 @@ index 14f419deb8..630ebfb37c 100644 } public void a(EnumSkyBlock enumskyblock, BlockPosition blockposition, int i) { -@@ -1959,7 +1960,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1958,7 +1959,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc if (blockposition.isInvalidYLocation()) { // Paper return false; } else { @@ -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 @@ -218,7 +218,7 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0363-Optimize-Light-Recalculations.patch b/Spigot-Server-Patches/0363-Optimize-Light-Recalculations.patch index 6f1019924d..82d8f1785c 100644 --- a/Spigot-Server-Patches/0363-Optimize-Light-Recalculations.patch +++ b/Spigot-Server-Patches/0363-Optimize-Light-Recalculations.patch @@ -1,4 +1,4 @@ -From 68d53d355f81300b2cbd41c12ef16efe87a3d8fb Mon Sep 17 00:00:00 2001 +From 699542a90b5f91b625a0980d76abafd22a0ec5e4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 28 Sep 2018 20:46:29 -0400 Subject: [PATCH] Optimize Light Recalculations @@ -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 @@ -353,7 +353,7 @@ 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 @@ -591,8 +591,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -35,7 +35,7 @@ index 97a0fbd55c..fb71879ac0 100644 } } -@@ -2220,6 +2221,11 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -2219,6 +2220,11 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc public boolean c(EnumSkyBlock enumskyblock, BlockPosition blockposition) { // CraftBukkit start - Use neighbor cache instead of looking up Chunk chunk = this.getChunkIfLoaded(blockposition.getX() >> 4, blockposition.getZ() >> 4); diff --git a/Spigot-Server-Patches/0364-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0364-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch index 7c76dcc94a..62b373d6af 100644 --- a/Spigot-Server-Patches/0364-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch +++ b/Spigot-Server-Patches/0364-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch @@ -1,4 +1,4 @@ -From 54fce61ce9cd7da50f7fa8d635f7364ee724b6d8 Mon Sep 17 00:00:00 2001 +From f024322cc4a13259eb12770728b7e0d20953d836 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 28 Sep 2018 21:49:53 -0400 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks @@ -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 @@ -1081,7 +1081,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -30,7 +30,7 @@ index fb71879ac0..728319968b 100644 // Paper start - Set origin location when the entity is being added to the world if (entity.origin == null) { -@@ -1577,7 +1577,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1576,7 +1576,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc this.getChunkAt(entity.chunkX, entity.chunkZ).a(entity, entity.chunkY); } diff --git a/Spigot-Server-Patches/0395-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0395-Optimize-redstone-algorithm.patch index 08411d286c..93e6da3db7 100644 --- a/Spigot-Server-Patches/0395-Optimize-redstone-algorithm.patch +++ b/Spigot-Server-Patches/0395-Optimize-redstone-algorithm.patch @@ -1,4 +1,4 @@ -From 6e73e08568141499f1c97c1574d249495b32a2cf Mon Sep 17 00:00:00 2001 +From 1a5d05cb2c1a7eda1f6eec4a99175f40f1fbc001 Mon Sep 17 00:00:00 2001 From: theosib Date: Thu, 27 Sep 2018 01:43:35 -0600 Subject: [PATCH] Optimize redstone algorithm @@ -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 @@ -588,4 +588,14 @@ 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 +1,910 @@ @@ -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 @@ -1,5 +1,7 @@ @@ -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 @@ -648,6 +648,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -1133,7 +1133,7 @@ index 027bb64acc..645af17a58 100644 public void a(BlockPosition blockposition, Block block, BlockPosition blockposition1) { if (!this.isClientSide) { IBlockData iblockdata = this.getType(blockposition); -@@ -2593,6 +2594,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -2592,6 +2593,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc return this.getBlockFacePower(blockposition.down(), EnumDirection.DOWN) > 0 ? true : (this.getBlockFacePower(blockposition.up(), EnumDirection.UP) > 0 ? true : (this.getBlockFacePower(blockposition.north(), EnumDirection.NORTH) > 0 ? true : (this.getBlockFacePower(blockposition.south(), EnumDirection.SOUTH) > 0 ? true : (this.getBlockFacePower(blockposition.west(), EnumDirection.WEST) > 0 ? true : this.getBlockFacePower(blockposition.east(), EnumDirection.EAST) > 0)))); } diff --git a/Spigot-Server-Patches/0400-limit-the-range-at-which-we-ll-consider-an-attackabl.patch b/Spigot-Server-Patches/0400-limit-the-range-at-which-we-ll-consider-an-attackabl.patch index e95bd3c8bb..08cb37a60d 100644 --- a/Spigot-Server-Patches/0400-limit-the-range-at-which-we-ll-consider-an-attackabl.patch +++ b/Spigot-Server-Patches/0400-limit-the-range-at-which-we-ll-consider-an-attackabl.patch @@ -1,4 +1,4 @@ -From a55362012ae6439bd007bf980dc0e094b7e9257a Mon Sep 17 00:00:00 2001 +From b8d0b1dc65c1afec931ebcbe8f196c7ecc92fefe Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 13 Nov 2018 14:01:00 +0000 Subject: [PATCH] limit the range at which we'll consider an attackable target @@ -12,10 +12,10 @@ 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 -@@ -2721,8 +2721,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -2720,8 +2720,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc for (int i = 0; i < this.players.size(); ++i) { EntityHuman entityhuman1 = (EntityHuman) this.players.get(i); diff --git a/Spigot-Server-Patches/0435-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0435-Optimize-Captured-TileEntity-Lookup.patch index 180c255bea..7775be729e 100644 --- a/Spigot-Server-Patches/0435-Optimize-Captured-TileEntity-Lookup.patch +++ b/Spigot-Server-Patches/0435-Optimize-Captured-TileEntity-Lookup.patch @@ -1,4 +1,4 @@ -From fd269acdf74f64fba07aebd29ec472cd6f597c70 Mon Sep 17 00:00:00 2001 +From bbf5a5ff04d56b217118ab54e6c2d91bb16ce7bb Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 6 Apr 2019 10:16:48 -0400 Subject: [PATCH] Optimize Captured TileEntity Lookup @@ -10,10 +10,10 @@ 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 -@@ -1935,12 +1935,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -1934,12 +1934,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc return null; } else { // CraftBukkit start From 07762fc610e0d2c116e81278e728a786f70a7cf0 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 26 May 2019 10:40:12 -0700 Subject: [PATCH 2/2] Revert Don-t-recheck-type-after-setting-a-block.patch --- ...t-recheck-type-after-setting-a-block.patch | 33 ------------------- ...> 0365-Fix-Sending-Chunks-to-Client.patch} | 4 +-- ...le-connection-throttle-kick-message.patch} | 2 +- ...Fix-FileIOThread-concurrency-issues.patch} | 2 +- ...> 0368-Hook-into-CB-plugin-rewrites.patch} | 2 +- ...69-Allow-setting-the-vex-s-summoner.patch} | 2 +- ...70-Add-LivingEntity-getTargetEntity.patch} | 2 +- ...I.patch => 0371-Add-sun-related-API.patch} | 4 +-- ...wned-for-Villager-Aggression-Config.patch} | 2 +- ...-Johnny.patch => 0373-Here-s-Johnny.patch} | 2 +- ...Turtle-API.patch => 0374-Turtle-API.patch} | 2 +- ...it-lightning-strike-effect-distance.patch} | 2 +- ...-and-setters-for-EntityItem-owner-a.patch} | 2 +- ...her-worlds-for-shooter-of-projectil.patch} | 2 +- ...Call-player-spectator-target-events.patch} | 2 +- ...-Add-Velocity-IP-Forwarding-Support.patch} | 2 +- ...PI.patch => 0380-Add-more-Witch-API.patch} | 2 +- ...MC-93764.patch => 0381-Fix-MC-93764.patch} | 2 +- ...vent-players-from-moving-into-unloa.patch} | 2 +- ...3-Reset-players-airTicks-on-respawn.patch} | 2 +- ...-area-unicode-characters-from-signs.patch} | 2 +- ...after-profile-lookups-if-not-needed.patch} | 2 +- ...le-thread-count-default-for-bootstr.patch} | 2 +- ...Use-EntityTypes-for-living-entities.patch} | 2 +- ...id-item-for-enchantment-checks-on-b.patch} | 2 +- ...=> 0389-Optimize-World-Time-Updates.patch} | 2 +- ...tore-custom-InventoryHolder-support.patch} | 2 +- ...=> 0391-Use-Vanilla-Minecart-Speeds.patch} | 2 +- ...0392-Fix-SpongeAbsortEvent-handling.patch} | 2 +- ...-allow-digging-into-unloaded-chunks.patch} | 2 +- ...=> 0394-Optimize-redstone-algorithm.patch} | 10 +++--- ...ntity-dismount-during-teleportation.patch} | 2 +- ...mits.patch => 0396-Book-Size-Limits.patch} | 2 +- ...ult-permission-message-configurable.patch} | 2 +- ...I.patch => 0398-Add-more-Zombie-API.patch} | 2 +- ...t-which-we-ll-consider-an-attackabl.patch} | 4 +-- ...revent-rayTrace-from-loading-chunks.patch} | 4 +-- ...-Large-Packets-disconnecting-client.patch} | 2 +- ...world-storage-in-CraftOfflinePlayer.patch} | 2 +- ...0403-Add-PlayerConnectionCloseEvent.patch} | 2 +- ...revent-Enderman-from-loading-chunks.patch} | 2 +- ...replace-OfflinePlayer-getLastPlayed.patch} | 2 +- ...tch => 0406-Fix-PlayerEditBookEvent.patch} | 2 +- ...ehicle-tracking-issue-on-disconnect.patch} | 2 +- ...nRetractEvent-for-all-empty-pistons.patch} | 2 +- ...remove-from-being-called-on-Players.patch} | 2 +- ...10-Allow-Saving-of-Oversized-Chunks.patch} | 2 +- ...ent.patch => 0411-BlockDestroyEvent.patch} | 4 +-- ...m-Shapeless-Custom-Crafting-Recipes.patch} | 2 +- ...h => 0413-Fix-sign-edit-memory-leak.patch} | 2 +- ... 0414-Limit-Client-Sign-length-more.patch} | 2 +- ...onvertSigns-boolean-every-sign-save.patch} | 2 +- ...Signs-in-Chunks-creating-too-large-.patch} | 2 +- ...-Fix-Whitelist-On-Off-inconsistency.patch} | 2 +- ...t-tick-at-start-of-drowning-process.patch} | 2 +- ...ggleEvent-when-whitelist-is-toggled.patch} | 2 +- ...ngth-when-serialising-BungeeCord-te.patch} | 2 +- ...=> 0421-Entity-getEntitySpawnReason.patch} | 4 +-- ...l-Spawned-mobs-towards-natural-spaw.patch} | 2 +- ...ty-Metadata-for-all-tracked-players.patch} | 2 +- ...tch => 0424-Fire-event-on-GS4-query.patch} | 2 +- ...25-Implement-PlayerPostRespawnEvent.patch} | 2 +- ...for-pickupDelay-breaks-picking-up-i.patch} | 2 +- ...ty-trackers-for-worlds-without-play.patch} | 2 +- ...ts.patch => 0428-Server-Tick-Events.patch} | 2 +- ...429-PlayerDeathEvent-getItemsToKeep.patch} | 2 +- ...30-Optimize-Persistent-Data-Loading.patch} | 2 +- ...s-to-fire-only-after-the-server-plu.patch} | 2 +- ...ion-files-more-reliable-to-write-to.patch} | 2 +- ...mize-GameRules-to-use-LinkedHashMap.patch} | 2 +- ...Optimize-Captured-TileEntity-Lookup.patch} | 4 +-- ...API.patch => 0435-Add-Heightmap-API.patch} | 4 +-- ...6-Handle-bad-chunks-more-gracefully.patch} | 2 +- ...=> 0437-Fix-NPE-from-sign-placement.patch} | 2 +- ...> 0438-Mob-Spawner-API-Enhancements.patch} | 2 +- ...-t-NPE-on-dimensionmanager-toString.patch} | 2 +- ...-item-frames-are-modified-MC-123450.patch} | 8 ++--- 77 files changed, 91 insertions(+), 124 deletions(-) delete mode 100644 Spigot-Server-Patches/0365-Don-t-recheck-type-after-setting-a-block.patch rename Spigot-Server-Patches/{0366-Fix-Sending-Chunks-to-Client.patch => 0365-Fix-Sending-Chunks-to-Client.patch} (95%) rename Spigot-Server-Patches/{0367-Configurable-connection-throttle-kick-message.patch => 0366-Configurable-connection-throttle-kick-message.patch} (97%) rename Spigot-Server-Patches/{0368-Fix-FileIOThread-concurrency-issues.patch => 0367-Fix-FileIOThread-concurrency-issues.patch} (96%) rename Spigot-Server-Patches/{0369-Hook-into-CB-plugin-rewrites.patch => 0368-Hook-into-CB-plugin-rewrites.patch} (99%) rename Spigot-Server-Patches/{0370-Allow-setting-the-vex-s-summoner.patch => 0369-Allow-setting-the-vex-s-summoner.patch} (95%) rename Spigot-Server-Patches/{0371-Add-LivingEntity-getTargetEntity.patch => 0370-Add-LivingEntity-getTargetEntity.patch} (99%) rename Spigot-Server-Patches/{0372-Add-sun-related-API.patch => 0371-Add-sun-related-API.patch} (96%) rename Spigot-Server-Patches/{0373-Check-Drowned-for-Villager-Aggression-Config.patch => 0372-Check-Drowned-for-Villager-Aggression-Config.patch} (95%) rename Spigot-Server-Patches/{0374-Here-s-Johnny.patch => 0373-Here-s-Johnny.patch} (96%) rename Spigot-Server-Patches/{0375-Turtle-API.patch => 0374-Turtle-API.patch} (99%) rename Spigot-Server-Patches/{0376-Limit-lightning-strike-effect-distance.patch => 0375-Limit-lightning-strike-effect-distance.patch} (98%) rename Spigot-Server-Patches/{0377-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0376-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (97%) rename Spigot-Server-Patches/{0378-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0377-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (96%) rename Spigot-Server-Patches/{0379-Call-player-spectator-target-events.patch => 0378-Call-player-spectator-target-events.patch} (98%) rename Spigot-Server-Patches/{0380-Add-Velocity-IP-Forwarding-Support.patch => 0379-Add-Velocity-IP-Forwarding-Support.patch} (99%) rename Spigot-Server-Patches/{0381-Add-more-Witch-API.patch => 0380-Add-more-Witch-API.patch} (99%) rename Spigot-Server-Patches/{0382-Fix-MC-93764.patch => 0381-Fix-MC-93764.patch} (91%) rename Spigot-Server-Patches/{0383-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0382-Add-option-to-prevent-players-from-moving-into-unloa.patch} (98%) rename Spigot-Server-Patches/{0384-Reset-players-airTicks-on-respawn.patch => 0383-Reset-players-airTicks-on-respawn.patch} (95%) rename Spigot-Server-Patches/{0385-Strip-private-area-unicode-characters-from-signs.patch => 0384-Strip-private-area-unicode-characters-from-signs.patch} (98%) rename Spigot-Server-Patches/{0386-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0385-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (96%) rename Spigot-Server-Patches/{0387-Use-more-reasonable-thread-count-default-for-bootstr.patch => 0386-Use-more-reasonable-thread-count-default-for-bootstr.patch} (94%) rename Spigot-Server-Patches/{0388-Use-EntityTypes-for-living-entities.patch => 0387-Use-EntityTypes-for-living-entities.patch} (99%) rename Spigot-Server-Patches/{0389-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch => 0388-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch} (96%) rename Spigot-Server-Patches/{0390-Optimize-World-Time-Updates.patch => 0389-Optimize-World-Time-Updates.patch} (97%) rename Spigot-Server-Patches/{0391-Restore-custom-InventoryHolder-support.patch => 0390-Restore-custom-InventoryHolder-support.patch} (96%) rename Spigot-Server-Patches/{0392-Use-Vanilla-Minecart-Speeds.patch => 0391-Use-Vanilla-Minecart-Speeds.patch} (94%) rename Spigot-Server-Patches/{0393-Fix-SpongeAbsortEvent-handling.patch => 0392-Fix-SpongeAbsortEvent-handling.patch} (96%) rename Spigot-Server-Patches/{0394-Don-t-allow-digging-into-unloaded-chunks.patch => 0393-Don-t-allow-digging-into-unloaded-chunks.patch} (94%) rename Spigot-Server-Patches/{0395-Optimize-redstone-algorithm.patch => 0394-Optimize-redstone-algorithm.patch} (99%) rename Spigot-Server-Patches/{0396-force-entity-dismount-during-teleportation.patch => 0395-force-entity-dismount-during-teleportation.patch} (98%) rename Spigot-Server-Patches/{0397-Book-Size-Limits.patch => 0396-Book-Size-Limits.patch} (98%) rename Spigot-Server-Patches/{0398-Make-the-default-permission-message-configurable.patch => 0397-Make-the-default-permission-message-configurable.patch} (97%) rename Spigot-Server-Patches/{0399-Add-more-Zombie-API.patch => 0398-Add-more-Zombie-API.patch} (98%) rename Spigot-Server-Patches/{0400-limit-the-range-at-which-we-ll-consider-an-attackabl.patch => 0399-limit-the-range-at-which-we-ll-consider-an-attackabl.patch} (94%) rename Spigot-Server-Patches/{0401-Prevent-rayTrace-from-loading-chunks.patch => 0400-Prevent-rayTrace-from-loading-chunks.patch} (95%) rename Spigot-Server-Patches/{0402-Handle-Large-Packets-disconnecting-client.patch => 0401-Handle-Large-Packets-disconnecting-client.patch} (98%) rename Spigot-Server-Patches/{0403-Lazy-init-world-storage-in-CraftOfflinePlayer.patch => 0402-Lazy-init-world-storage-in-CraftOfflinePlayer.patch} (97%) rename Spigot-Server-Patches/{0404-Add-PlayerConnectionCloseEvent.patch => 0403-Add-PlayerConnectionCloseEvent.patch} (98%) rename Spigot-Server-Patches/{0405-Prevent-Enderman-from-loading-chunks.patch => 0404-Prevent-Enderman-from-loading-chunks.patch} (97%) rename Spigot-Server-Patches/{0406-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0405-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (99%) rename Spigot-Server-Patches/{0407-Fix-PlayerEditBookEvent.patch => 0406-Fix-PlayerEditBookEvent.patch} (96%) rename Spigot-Server-Patches/{0408-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0407-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (93%) rename Spigot-Server-Patches/{0409-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0408-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (97%) rename Spigot-Server-Patches/{0410-Block-Entity-remove-from-being-called-on-Players.patch => 0409-Block-Entity-remove-from-being-called-on-Players.patch} (95%) rename Spigot-Server-Patches/{0411-Allow-Saving-of-Oversized-Chunks.patch => 0410-Allow-Saving-of-Oversized-Chunks.patch} (99%) rename Spigot-Server-Patches/{0412-BlockDestroyEvent.patch => 0411-BlockDestroyEvent.patch} (95%) rename Spigot-Server-Patches/{0413-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0412-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (98%) rename Spigot-Server-Patches/{0414-Fix-sign-edit-memory-leak.patch => 0413-Fix-sign-edit-memory-leak.patch} (97%) rename Spigot-Server-Patches/{0415-Limit-Client-Sign-length-more.patch => 0414-Limit-Client-Sign-length-more.patch} (97%) rename Spigot-Server-Patches/{0416-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0415-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (95%) rename Spigot-Server-Patches/{0417-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch => 0416-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch} (98%) rename Spigot-Server-Patches/{0418-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0417-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (97%) rename Spigot-Server-Patches/{0419-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0418-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (93%) rename Spigot-Server-Patches/{0420-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0419-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (91%) rename Spigot-Server-Patches/{0421-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0420-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (96%) rename Spigot-Server-Patches/{0422-Entity-getEntitySpawnReason.patch => 0421-Entity-getEntitySpawnReason.patch} (98%) rename Spigot-Server-Patches/{0423-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0422-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (97%) rename Spigot-Server-Patches/{0424-Update-entity-Metadata-for-all-tracked-players.patch => 0423-Update-entity-Metadata-for-all-tracked-players.patch} (94%) rename Spigot-Server-Patches/{0425-Fire-event-on-GS4-query.patch => 0424-Fire-event-on-GS4-query.patch} (99%) rename Spigot-Server-Patches/{0426-Implement-PlayerPostRespawnEvent.patch => 0425-Implement-PlayerPostRespawnEvent.patch} (96%) rename Spigot-Server-Patches/{0427-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0426-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (95%) rename Spigot-Server-Patches/{0428-Don-t-update-entity-trackers-for-worlds-without-play.patch => 0427-Don-t-update-entity-trackers-for-worlds-without-play.patch} (96%) rename Spigot-Server-Patches/{0429-Server-Tick-Events.patch => 0428-Server-Tick-Events.patch} (96%) rename Spigot-Server-Patches/{0430-PlayerDeathEvent-getItemsToKeep.patch => 0429-PlayerDeathEvent-getItemsToKeep.patch} (98%) rename Spigot-Server-Patches/{0431-Optimize-Persistent-Data-Loading.patch => 0430-Optimize-Persistent-Data-Loading.patch} (98%) rename Spigot-Server-Patches/{0432-Allow-login-events-to-fire-only-after-the-server-plu.patch => 0431-Allow-login-events-to-fire-only-after-the-server-plu.patch} (97%) rename Spigot-Server-Patches/{0433-Make-region-files-more-reliable-to-write-to.patch => 0432-Make-region-files-more-reliable-to-write-to.patch} (99%) rename Spigot-Server-Patches/{0434-Optimize-GameRules-to-use-LinkedHashMap.patch => 0433-Optimize-GameRules-to-use-LinkedHashMap.patch} (98%) rename Spigot-Server-Patches/{0435-Optimize-Captured-TileEntity-Lookup.patch => 0434-Optimize-Captured-TileEntity-Lookup.patch} (93%) rename Spigot-Server-Patches/{0436-Add-Heightmap-API.patch => 0435-Add-Heightmap-API.patch} (96%) rename Spigot-Server-Patches/{0437-Handle-bad-chunks-more-gracefully.patch => 0436-Handle-bad-chunks-more-gracefully.patch} (97%) rename Spigot-Server-Patches/{0438-Fix-NPE-from-sign-placement.patch => 0437-Fix-NPE-from-sign-placement.patch} (97%) rename Spigot-Server-Patches/{0439-Mob-Spawner-API-Enhancements.patch => 0438-Mob-Spawner-API-Enhancements.patch} (98%) rename Spigot-Server-Patches/{0440-don-t-NPE-on-dimensionmanager-toString.patch => 0439-don-t-NPE-on-dimensionmanager-toString.patch} (96%) rename Spigot-Server-Patches/{0441-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0440-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (91%) diff --git a/Spigot-Server-Patches/0365-Don-t-recheck-type-after-setting-a-block.patch b/Spigot-Server-Patches/0365-Don-t-recheck-type-after-setting-a-block.patch deleted file mode 100644 index 14f98e46f2..0000000000 --- a/Spigot-Server-Patches/0365-Don-t-recheck-type-after-setting-a-block.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5c7269fbecfab55d9d9aaae09ccd13df67fad70b Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Fri, 28 Sep 2018 22:27:33 -0400 -Subject: [PATCH] Don't recheck type after setting a block - -The server does a "Did my update succeed" check after setting -a blocks data to a chunk. - -However, writes can not fail outside of a hard error or a -a race condition from multiple threads writing, which is -not something that should ever occur on the server. - -So this check is pointless, as if it did occur, the server would -be having data corruption issues anyways. - -This provides a small boost to all setType calls. - -diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 966879a894..0d51c1baeb 100644 ---- a/src/main/java/net/minecraft/server/Chunk.java -+++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -558,7 +558,7 @@ public class Chunk implements IChunkAccess { - this.world.n(blockposition); - } - -- if (chunksection.getType(i, j & 15, k).getBlock() != block) { -+ if (false && chunksection.getType(i, j & 15, k).getBlock() != block) { // Paper - don't need to recheck this - this would only fail due to non main thread writes which are not supported - return null; - } else { - if (flag1) { --- -2.21.0 - diff --git a/Spigot-Server-Patches/0366-Fix-Sending-Chunks-to-Client.patch b/Spigot-Server-Patches/0365-Fix-Sending-Chunks-to-Client.patch similarity index 95% rename from Spigot-Server-Patches/0366-Fix-Sending-Chunks-to-Client.patch rename to Spigot-Server-Patches/0365-Fix-Sending-Chunks-to-Client.patch index 014bdbd6b6..bb16f6a58a 100644 --- a/Spigot-Server-Patches/0366-Fix-Sending-Chunks-to-Client.patch +++ b/Spigot-Server-Patches/0365-Fix-Sending-Chunks-to-Client.patch @@ -1,4 +1,4 @@ -From 07a00d527e871eadaf4a96af5ad367ddcbfa9cc3 Mon Sep 17 00:00:00 2001 +From f3853b510b97905de6c738e186c1cf1df00ddfab Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 29 Sep 2018 01:18:16 -0400 Subject: [PATCH] Fix Sending Chunks to Client @@ -14,7 +14,7 @@ This fix always sends chunks to the client, and simply updates the client anytime post processing is triggered with the new chunk data. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 0d51c1baeb..46804203fe 100644 +index 966879a894..d1556ec338 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -1190,7 +1190,7 @@ public class Chunk implements IChunkAccess { diff --git a/Spigot-Server-Patches/0367-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0366-Configurable-connection-throttle-kick-message.patch similarity index 97% rename from Spigot-Server-Patches/0367-Configurable-connection-throttle-kick-message.patch rename to Spigot-Server-Patches/0366-Configurable-connection-throttle-kick-message.patch index 183f428daf..8d94c4c41c 100644 --- a/Spigot-Server-Patches/0367-Configurable-connection-throttle-kick-message.patch +++ b/Spigot-Server-Patches/0366-Configurable-connection-throttle-kick-message.patch @@ -1,4 +1,4 @@ -From 2b373c407f22a8b2ecfd5fc3a9faa9f94546383c Mon Sep 17 00:00:00 2001 +From b88cd3553c9b79a33a1127c988527111fbe093e5 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 2 Oct 2018 09:57:50 +0100 Subject: [PATCH] Configurable connection throttle kick message diff --git a/Spigot-Server-Patches/0368-Fix-FileIOThread-concurrency-issues.patch b/Spigot-Server-Patches/0367-Fix-FileIOThread-concurrency-issues.patch similarity index 96% rename from Spigot-Server-Patches/0368-Fix-FileIOThread-concurrency-issues.patch rename to Spigot-Server-Patches/0367-Fix-FileIOThread-concurrency-issues.patch index f8d48599a9..28a5753fba 100644 --- a/Spigot-Server-Patches/0368-Fix-FileIOThread-concurrency-issues.patch +++ b/Spigot-Server-Patches/0367-Fix-FileIOThread-concurrency-issues.patch @@ -1,4 +1,4 @@ -From 4e5812633b869d071215da93dc3cffd797de9951 Mon Sep 17 00:00:00 2001 +From 41c07654d8ff10a9504bbbad54c53ecd21b5cab1 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 3 Oct 2018 19:04:53 +0100 Subject: [PATCH] Fix FileIOThread concurrency issues diff --git a/Spigot-Server-Patches/0369-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0368-Hook-into-CB-plugin-rewrites.patch similarity index 99% rename from Spigot-Server-Patches/0369-Hook-into-CB-plugin-rewrites.patch rename to Spigot-Server-Patches/0368-Hook-into-CB-plugin-rewrites.patch index efeca52c5c..2415178710 100644 --- a/Spigot-Server-Patches/0369-Hook-into-CB-plugin-rewrites.patch +++ b/Spigot-Server-Patches/0368-Hook-into-CB-plugin-rewrites.patch @@ -1,4 +1,4 @@ -From 82c714ff2ed5dc92a29901636c8dbf590f4a68ba Mon Sep 17 00:00:00 2001 +From 5467034caa61a9aee8f737fa9d2e146de80f2288 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 3 Oct 2018 20:09:18 -0400 Subject: [PATCH] Hook into CB plugin rewrites diff --git a/Spigot-Server-Patches/0370-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0369-Allow-setting-the-vex-s-summoner.patch similarity index 95% rename from Spigot-Server-Patches/0370-Allow-setting-the-vex-s-summoner.patch rename to Spigot-Server-Patches/0369-Allow-setting-the-vex-s-summoner.patch index 51015c18f8..57172dab3f 100644 --- a/Spigot-Server-Patches/0370-Allow-setting-the-vex-s-summoner.patch +++ b/Spigot-Server-Patches/0369-Allow-setting-the-vex-s-summoner.patch @@ -1,4 +1,4 @@ -From e709b2648076946859a2a2edd80d180b399fd3d1 Mon Sep 17 00:00:00 2001 +From 0da75093a7ef0c63fcd508341364684f4a84e760 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 21:47:44 -0500 Subject: [PATCH] Allow setting the vex's summoner diff --git a/Spigot-Server-Patches/0371-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0370-Add-LivingEntity-getTargetEntity.patch similarity index 99% rename from Spigot-Server-Patches/0371-Add-LivingEntity-getTargetEntity.patch rename to Spigot-Server-Patches/0370-Add-LivingEntity-getTargetEntity.patch index b01524e8dc..c6abde9375 100644 --- a/Spigot-Server-Patches/0371-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-Server-Patches/0370-Add-LivingEntity-getTargetEntity.patch @@ -1,4 +1,4 @@ -From b82067ae505316dca7048faaedeb7f7565406b6e Mon Sep 17 00:00:00 2001 +From cfea22dcd110fdefe8ac62dfdd80ccefaf7eb888 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 22 Sep 2018 00:33:08 -0500 Subject: [PATCH] Add LivingEntity#getTargetEntity diff --git a/Spigot-Server-Patches/0372-Add-sun-related-API.patch b/Spigot-Server-Patches/0371-Add-sun-related-API.patch similarity index 96% rename from Spigot-Server-Patches/0372-Add-sun-related-API.patch rename to Spigot-Server-Patches/0371-Add-sun-related-API.patch index 2c3e89152e..411015c463 100644 --- a/Spigot-Server-Patches/0372-Add-sun-related-API.patch +++ b/Spigot-Server-Patches/0371-Add-sun-related-API.patch @@ -1,4 +1,4 @@ -From ac264d636345bea08b5ed7a1ff74b972471f6245 Mon Sep 17 00:00:00 2001 +From d9e4914ed2ed8b74735c006f6e4bddd6cc6e8d06 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 00:54:21 -0500 Subject: [PATCH] Add sun related API @@ -17,7 +17,7 @@ index 856ddf2a74..d1ec201d8a 100644 if (this.world.L() && !this.world.isClientSide) { float f = this.az(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 728319968b..027bb64acc 100644 +index 8d20f6d05d..94e189a550 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -829,6 +829,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc diff --git a/Spigot-Server-Patches/0373-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0372-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 95% rename from Spigot-Server-Patches/0373-Check-Drowned-for-Villager-Aggression-Config.patch rename to Spigot-Server-Patches/0372-Check-Drowned-for-Villager-Aggression-Config.patch index 59aeaa251d..0817976b40 100644 --- a/Spigot-Server-Patches/0373-Check-Drowned-for-Villager-Aggression-Config.patch +++ b/Spigot-Server-Patches/0372-Check-Drowned-for-Villager-Aggression-Config.patch @@ -1,4 +1,4 @@ -From 27b640541e74e7f1607ad073af6f4b03645d5151 Mon Sep 17 00:00:00 2001 +From d681230da7bca663dcff13d928909756114ad330 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Wed, 10 Oct 2018 21:22:44 -0500 Subject: [PATCH] Check Drowned for Villager Aggression Config diff --git a/Spigot-Server-Patches/0374-Here-s-Johnny.patch b/Spigot-Server-Patches/0373-Here-s-Johnny.patch similarity index 96% rename from Spigot-Server-Patches/0374-Here-s-Johnny.patch rename to Spigot-Server-Patches/0373-Here-s-Johnny.patch index 00a75b96b2..5b15251157 100644 --- a/Spigot-Server-Patches/0374-Here-s-Johnny.patch +++ b/Spigot-Server-Patches/0373-Here-s-Johnny.patch @@ -1,4 +1,4 @@ -From a5499b66282e7f75a127044fd454a2927ff7e4f3 Mon Sep 17 00:00:00 2001 +From e0c3da62c384cc43e3eaccbb71e5f10f808a9a37 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 01:37:22 -0500 Subject: [PATCH] Here's Johnny! diff --git a/Spigot-Server-Patches/0375-Turtle-API.patch b/Spigot-Server-Patches/0374-Turtle-API.patch similarity index 99% rename from Spigot-Server-Patches/0375-Turtle-API.patch rename to Spigot-Server-Patches/0374-Turtle-API.patch index bb038523c6..31cd7346e3 100644 --- a/Spigot-Server-Patches/0375-Turtle-API.patch +++ b/Spigot-Server-Patches/0374-Turtle-API.patch @@ -1,4 +1,4 @@ -From 0145dcdb179116632a79d6734a4829db2ee0c740 Mon Sep 17 00:00:00 2001 +From 2feb48b06690a9ad912b07fb4b0c73f8604e51ac Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 29 Sep 2018 16:08:23 -0500 Subject: [PATCH] Turtle API diff --git a/Spigot-Server-Patches/0376-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0375-Limit-lightning-strike-effect-distance.patch similarity index 98% rename from Spigot-Server-Patches/0376-Limit-lightning-strike-effect-distance.patch rename to Spigot-Server-Patches/0375-Limit-lightning-strike-effect-distance.patch index 6e9d3b7540..d0cb276096 100644 --- a/Spigot-Server-Patches/0376-Limit-lightning-strike-effect-distance.patch +++ b/Spigot-Server-Patches/0375-Limit-lightning-strike-effect-distance.patch @@ -1,4 +1,4 @@ -From baf45e6afa85406637c126b82ac06e48a949e18f Mon Sep 17 00:00:00 2001 +From 5b3ada39b30fd9c4ff2a65c97f96f1cc7eed53f1 Mon Sep 17 00:00:00 2001 From: Trigary Date: Fri, 14 Sep 2018 17:42:08 +0200 Subject: [PATCH] Limit lightning strike effect distance diff --git a/Spigot-Server-Patches/0377-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0376-Implement-getters-and-setters-for-EntityItem-owner-a.patch similarity index 97% rename from Spigot-Server-Patches/0377-Implement-getters-and-setters-for-EntityItem-owner-a.patch rename to Spigot-Server-Patches/0376-Implement-getters-and-setters-for-EntityItem-owner-a.patch index 447ddd8c6b..0118a9c61e 100644 --- a/Spigot-Server-Patches/0377-Implement-getters-and-setters-for-EntityItem-owner-a.patch +++ b/Spigot-Server-Patches/0376-Implement-getters-and-setters-for-EntityItem-owner-a.patch @@ -1,4 +1,4 @@ -From 537a387c3e1511657b618532f2866fbc92e1dd8b Mon Sep 17 00:00:00 2001 +From 16d69bbdf837e4ed64d081f938bb1b5031cba0d4 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 20:54:23 -0500 Subject: [PATCH] Implement getters and setters for EntityItem owner and diff --git a/Spigot-Server-Patches/0378-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0377-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 96% rename from Spigot-Server-Patches/0378-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to Spigot-Server-Patches/0377-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch index eb027d1320..800b1f00a6 100644 --- a/Spigot-Server-Patches/0378-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch +++ b/Spigot-Server-Patches/0377-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch @@ -1,4 +1,4 @@ -From a8c45fca2ef99f438a12b9ca59f9ca0ab03e86d0 Mon Sep 17 00:00:00 2001 +From 899af4c729c7d365a228b5d343040d55c10b4dde Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 17 Oct 2018 19:17:27 -0400 Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles diff --git a/Spigot-Server-Patches/0379-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0378-Call-player-spectator-target-events.patch similarity index 98% rename from Spigot-Server-Patches/0379-Call-player-spectator-target-events.patch rename to Spigot-Server-Patches/0378-Call-player-spectator-target-events.patch index 1016ce0a03..0049221d30 100644 --- a/Spigot-Server-Patches/0379-Call-player-spectator-target-events.patch +++ b/Spigot-Server-Patches/0378-Call-player-spectator-target-events.patch @@ -1,4 +1,4 @@ -From d1b3dc4217aa68d0c522bb1f600ddebb54a191af Mon Sep 17 00:00:00 2001 +From 333447a35bf2b819c847e21518431d7aa69b3157 Mon Sep 17 00:00:00 2001 From: Caleb Bassham Date: Fri, 28 Sep 2018 02:32:19 -0500 Subject: [PATCH] Call player spectator target events diff --git a/Spigot-Server-Patches/0380-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0379-Add-Velocity-IP-Forwarding-Support.patch similarity index 99% rename from Spigot-Server-Patches/0380-Add-Velocity-IP-Forwarding-Support.patch rename to Spigot-Server-Patches/0379-Add-Velocity-IP-Forwarding-Support.patch index f3b4b349d8..aee75b6bcb 100644 --- a/Spigot-Server-Patches/0380-Add-Velocity-IP-Forwarding-Support.patch +++ b/Spigot-Server-Patches/0379-Add-Velocity-IP-Forwarding-Support.patch @@ -1,4 +1,4 @@ -From 5d4e0ebff8236bcee63ca414af432baff1681c40 Mon Sep 17 00:00:00 2001 +From 7391eed7fedeca7fd017eb73112b6c04c6cdf240 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Mon, 8 Oct 2018 14:36:14 -0400 Subject: [PATCH] Add Velocity IP Forwarding Support diff --git a/Spigot-Server-Patches/0381-Add-more-Witch-API.patch b/Spigot-Server-Patches/0380-Add-more-Witch-API.patch similarity index 99% rename from Spigot-Server-Patches/0381-Add-more-Witch-API.patch rename to Spigot-Server-Patches/0380-Add-more-Witch-API.patch index e05cb067a1..ce28b67445 100644 --- a/Spigot-Server-Patches/0381-Add-more-Witch-API.patch +++ b/Spigot-Server-Patches/0380-Add-more-Witch-API.patch @@ -1,4 +1,4 @@ -From 3bbdc053fd65bd8f74f4886348e1833250a3a22b Mon Sep 17 00:00:00 2001 +From 088816d1d3369362e024ac4adb488002dd46f696 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 14:10:46 -0500 Subject: [PATCH] Add more Witch API diff --git a/Spigot-Server-Patches/0382-Fix-MC-93764.patch b/Spigot-Server-Patches/0381-Fix-MC-93764.patch similarity index 91% rename from Spigot-Server-Patches/0382-Fix-MC-93764.patch rename to Spigot-Server-Patches/0381-Fix-MC-93764.patch index cb31e84ca6..24197aa01c 100644 --- a/Spigot-Server-Patches/0382-Fix-MC-93764.patch +++ b/Spigot-Server-Patches/0381-Fix-MC-93764.patch @@ -1,4 +1,4 @@ -From a61ea1bde3ba2fca97d74e75926539f83e504f1a Mon Sep 17 00:00:00 2001 +From 0ff380f9c035db980e14cf94c581171f789540ed Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 19 Oct 2018 19:38:45 -0500 Subject: [PATCH] Fix MC-93764 diff --git a/Spigot-Server-Patches/0383-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0382-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 98% rename from Spigot-Server-Patches/0383-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to Spigot-Server-Patches/0382-Add-option-to-prevent-players-from-moving-into-unloa.patch index 9ac4c1b740..bf92a387de 100644 --- a/Spigot-Server-Patches/0383-Add-option-to-prevent-players-from-moving-into-unloa.patch +++ b/Spigot-Server-Patches/0382-Add-option-to-prevent-players-from-moving-into-unloa.patch @@ -1,4 +1,4 @@ -From 92cb3409be8524f1e5684352cd18fc5737491707 Mon Sep 17 00:00:00 2001 +From c14c36d154b0a213a409f6d00d893980e960af6e Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Mon, 22 Oct 2018 17:34:10 +0200 Subject: [PATCH] Add option to prevent players from moving into unloaded diff --git a/Spigot-Server-Patches/0384-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0383-Reset-players-airTicks-on-respawn.patch similarity index 95% rename from Spigot-Server-Patches/0384-Reset-players-airTicks-on-respawn.patch rename to Spigot-Server-Patches/0383-Reset-players-airTicks-on-respawn.patch index b513b7c2de..92b07a657f 100644 --- a/Spigot-Server-Patches/0384-Reset-players-airTicks-on-respawn.patch +++ b/Spigot-Server-Patches/0383-Reset-players-airTicks-on-respawn.patch @@ -1,4 +1,4 @@ -From 80169c2065257040205b6544a51cdb3975c14bdb Mon Sep 17 00:00:00 2001 +From f9425f4c200d0cbdfa3692e645a9c638d8b57819 Mon Sep 17 00:00:00 2001 From: GreenMeanie Date: Sat, 20 Oct 2018 22:34:02 -0400 Subject: [PATCH] Reset players airTicks on respawn diff --git a/Spigot-Server-Patches/0385-Strip-private-area-unicode-characters-from-signs.patch b/Spigot-Server-Patches/0384-Strip-private-area-unicode-characters-from-signs.patch similarity index 98% rename from Spigot-Server-Patches/0385-Strip-private-area-unicode-characters-from-signs.patch rename to Spigot-Server-Patches/0384-Strip-private-area-unicode-characters-from-signs.patch index 7e694e4f58..73b4fd7908 100644 --- a/Spigot-Server-Patches/0385-Strip-private-area-unicode-characters-from-signs.patch +++ b/Spigot-Server-Patches/0384-Strip-private-area-unicode-characters-from-signs.patch @@ -1,4 +1,4 @@ -From 9cf28103bd677d93deb8ea8a0adf3c095a6e3b73 Mon Sep 17 00:00:00 2001 +From 6281116cdaa5216c32b521eb2e13a0014a512ef8 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 23 Oct 2018 20:53:43 -0400 Subject: [PATCH] Strip private area unicode characters from signs diff --git a/Spigot-Server-Patches/0386-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0385-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 96% rename from Spigot-Server-Patches/0386-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to Spigot-Server-Patches/0385-Don-t-sleep-after-profile-lookups-if-not-needed.patch index 1de9cc7818..61a176296e 100644 --- a/Spigot-Server-Patches/0386-Don-t-sleep-after-profile-lookups-if-not-needed.patch +++ b/Spigot-Server-Patches/0385-Don-t-sleep-after-profile-lookups-if-not-needed.patch @@ -1,4 +1,4 @@ -From 36a9e372200a64be4ebbc59acf474aa3e4ac0eff Mon Sep 17 00:00:00 2001 +From 9f538dcbfc2710074a6209e84491f4cd6b47644d Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 23 Oct 2018 20:25:05 -0400 Subject: [PATCH] Don't sleep after profile lookups if not needed diff --git a/Spigot-Server-Patches/0387-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0386-Use-more-reasonable-thread-count-default-for-bootstr.patch similarity index 94% rename from Spigot-Server-Patches/0387-Use-more-reasonable-thread-count-default-for-bootstr.patch rename to Spigot-Server-Patches/0386-Use-more-reasonable-thread-count-default-for-bootstr.patch index 50b4d30c5f..3528ccbf8b 100644 --- a/Spigot-Server-Patches/0387-Use-more-reasonable-thread-count-default-for-bootstr.patch +++ b/Spigot-Server-Patches/0386-Use-more-reasonable-thread-count-default-for-bootstr.patch @@ -1,4 +1,4 @@ -From 1a60b5dbb30c2608e2af7833c00aa29dbb141e20 Mon Sep 17 00:00:00 2001 +From 995883971569c4d95bb6985dbb357ed3ff5bd7b3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 23 Oct 2018 23:14:38 -0400 Subject: [PATCH] Use more reasonable thread count default for bootstrap diff --git a/Spigot-Server-Patches/0388-Use-EntityTypes-for-living-entities.patch b/Spigot-Server-Patches/0387-Use-EntityTypes-for-living-entities.patch similarity index 99% rename from Spigot-Server-Patches/0388-Use-EntityTypes-for-living-entities.patch rename to Spigot-Server-Patches/0387-Use-EntityTypes-for-living-entities.patch index 1d43a1d96d..8e097694aa 100644 --- a/Spigot-Server-Patches/0388-Use-EntityTypes-for-living-entities.patch +++ b/Spigot-Server-Patches/0387-Use-EntityTypes-for-living-entities.patch @@ -1,4 +1,4 @@ -From a7f8efc50ad709eeb7991d8a460ed6075115175d Mon Sep 17 00:00:00 2001 +From ff6351637d37d25c5b87dc36f5241e8d2f0304f4 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 4 Oct 2018 10:08:02 -0500 Subject: [PATCH] Use EntityTypes for living entities diff --git a/Spigot-Server-Patches/0389-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch b/Spigot-Server-Patches/0388-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch similarity index 96% rename from Spigot-Server-Patches/0389-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch rename to Spigot-Server-Patches/0388-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch index 5bf4fbb30c..2ad0b9b833 100644 --- a/Spigot-Server-Patches/0389-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch +++ b/Spigot-Server-Patches/0388-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch @@ -1,4 +1,4 @@ -From 20db885a920ddae1dc283c0c906b2b226739ae89 Mon Sep 17 00:00:00 2001 +From 72b8d6b567dac8a398b608e0fee3ba0b569b1de2 Mon Sep 17 00:00:00 2001 From: MisterVector Date: Thu, 1 Nov 2018 14:50:05 -0700 Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block diff --git a/Spigot-Server-Patches/0390-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0389-Optimize-World-Time-Updates.patch similarity index 97% rename from Spigot-Server-Patches/0390-Optimize-World-Time-Updates.patch rename to Spigot-Server-Patches/0389-Optimize-World-Time-Updates.patch index c606533e44..b48fc7b1d7 100644 --- a/Spigot-Server-Patches/0390-Optimize-World-Time-Updates.patch +++ b/Spigot-Server-Patches/0389-Optimize-World-Time-Updates.patch @@ -1,4 +1,4 @@ -From 42871ad2d0b7b9bd4d5ecfafc8b03e532384ff11 Mon Sep 17 00:00:00 2001 +From 3de4a29697e5cf3c664a5d345d93992ac54c7887 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 2 Nov 2018 23:11:51 -0400 Subject: [PATCH] Optimize World Time Updates diff --git a/Spigot-Server-Patches/0391-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0390-Restore-custom-InventoryHolder-support.patch similarity index 96% rename from Spigot-Server-Patches/0391-Restore-custom-InventoryHolder-support.patch rename to Spigot-Server-Patches/0390-Restore-custom-InventoryHolder-support.patch index 6b8c552f85..9b432d810f 100644 --- a/Spigot-Server-Patches/0391-Restore-custom-InventoryHolder-support.patch +++ b/Spigot-Server-Patches/0390-Restore-custom-InventoryHolder-support.patch @@ -1,4 +1,4 @@ -From 54bbc25ce96d023b76be2fa5c280bf2d6d8015f3 Mon Sep 17 00:00:00 2001 +From d189afa3b58a384d3e13912a8b601c6b01a04573 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 5 Nov 2018 04:23:51 +0000 Subject: [PATCH] Restore custom InventoryHolder support diff --git a/Spigot-Server-Patches/0392-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0391-Use-Vanilla-Minecart-Speeds.patch similarity index 94% rename from Spigot-Server-Patches/0392-Use-Vanilla-Minecart-Speeds.patch rename to Spigot-Server-Patches/0391-Use-Vanilla-Minecart-Speeds.patch index 1454758673..98f1f1429a 100644 --- a/Spigot-Server-Patches/0392-Use-Vanilla-Minecart-Speeds.patch +++ b/Spigot-Server-Patches/0391-Use-Vanilla-Minecart-Speeds.patch @@ -1,4 +1,4 @@ -From f84c15041538210bd0cde5c8296beb9d207518ce Mon Sep 17 00:00:00 2001 +From 4117def33cefa1ab5d4692c6f0f304b8459d6ae7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 8 Nov 2018 21:33:09 -0500 Subject: [PATCH] Use Vanilla Minecart Speeds diff --git a/Spigot-Server-Patches/0393-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0392-Fix-SpongeAbsortEvent-handling.patch similarity index 96% rename from Spigot-Server-Patches/0393-Fix-SpongeAbsortEvent-handling.patch rename to Spigot-Server-Patches/0392-Fix-SpongeAbsortEvent-handling.patch index 6fd3c58fbf..6630beea38 100644 --- a/Spigot-Server-Patches/0393-Fix-SpongeAbsortEvent-handling.patch +++ b/Spigot-Server-Patches/0392-Fix-SpongeAbsortEvent-handling.patch @@ -1,4 +1,4 @@ -From ce9234ee5d3532f7e454a0033d4420c8cdbd6f6c Mon Sep 17 00:00:00 2001 +From fedcb31ed5771fc6eb082a7f449b4930ab0de492 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 10 Nov 2018 05:15:21 +0000 Subject: [PATCH] Fix SpongeAbsortEvent handling diff --git a/Spigot-Server-Patches/0394-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0393-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 94% rename from Spigot-Server-Patches/0394-Don-t-allow-digging-into-unloaded-chunks.patch rename to Spigot-Server-Patches/0393-Don-t-allow-digging-into-unloaded-chunks.patch index 34d64b3a6a..ccd3ffc383 100644 --- a/Spigot-Server-Patches/0394-Don-t-allow-digging-into-unloaded-chunks.patch +++ b/Spigot-Server-Patches/0393-Don-t-allow-digging-into-unloaded-chunks.patch @@ -1,4 +1,4 @@ -From c9b3d48edee5c67f2d1af7bd247e6ec5b634446f Mon Sep 17 00:00:00 2001 +From 73602cd9a5eec66c5532c852088212ea84583e12 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Nov 2018 21:01:09 +0000 Subject: [PATCH] Don't allow digging into unloaded chunks diff --git a/Spigot-Server-Patches/0395-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0394-Optimize-redstone-algorithm.patch similarity index 99% rename from Spigot-Server-Patches/0395-Optimize-redstone-algorithm.patch rename to Spigot-Server-Patches/0394-Optimize-redstone-algorithm.patch index 93e6da3db7..e9ddd44e51 100644 --- a/Spigot-Server-Patches/0395-Optimize-redstone-algorithm.patch +++ b/Spigot-Server-Patches/0394-Optimize-redstone-algorithm.patch @@ -1,4 +1,4 @@ -From 1a5d05cb2c1a7eda1f6eec4a99175f40f1fbc001 Mon Sep 17 00:00:00 2001 +From 38967270f42cbfe7456f9f4a901b2a8dbf8fc057 Mon Sep 17 00:00:00 2001 From: theosib Date: Thu, 27 Sep 2018 01:43:35 -0600 Subject: [PATCH] Optimize redstone algorithm @@ -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 61ad2cef7..a70a64070 100644 +index 61ad2cef7b..a70a64070e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -588,4 +588,14 @@ public class PaperWorldConfig { @@ -39,7 +39,7 @@ index 61ad2cef7..a70a64070 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 000000000..21d9d6d7e +index 0000000000..21d9d6d7ed --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java @@ -0,0 +1,910 @@ @@ -954,7 +954,7 @@ index 000000000..21d9d6d7e + } +} diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java -index 2e30270bb..72d261707 100644 +index 2e30270bb7..72d2617071 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java @@ -1,5 +1,7 @@ @@ -1122,7 +1122,7 @@ index 2e30270bb..72d261707 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 94e189a55..d790fd89f 100644 +index 94e189a550..d790fd89f7 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -648,6 +648,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc diff --git a/Spigot-Server-Patches/0396-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0395-force-entity-dismount-during-teleportation.patch similarity index 98% rename from Spigot-Server-Patches/0396-force-entity-dismount-during-teleportation.patch rename to Spigot-Server-Patches/0395-force-entity-dismount-during-teleportation.patch index 1f4c47f467..1f393d8f97 100644 --- a/Spigot-Server-Patches/0396-force-entity-dismount-during-teleportation.patch +++ b/Spigot-Server-Patches/0395-force-entity-dismount-during-teleportation.patch @@ -1,4 +1,4 @@ -From e5b4fd7a68006fa22e4d6efea4893026f03e284e Mon Sep 17 00:00:00 2001 +From ef16ed942991bf50d75d77c6889dd62629314e45 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 15 Nov 2018 13:38:37 +0000 Subject: [PATCH] force entity dismount during teleportation diff --git a/Spigot-Server-Patches/0397-Book-Size-Limits.patch b/Spigot-Server-Patches/0396-Book-Size-Limits.patch similarity index 98% rename from Spigot-Server-Patches/0397-Book-Size-Limits.patch rename to Spigot-Server-Patches/0396-Book-Size-Limits.patch index 58ff880c4a..2504273e51 100644 --- a/Spigot-Server-Patches/0397-Book-Size-Limits.patch +++ b/Spigot-Server-Patches/0396-Book-Size-Limits.patch @@ -1,4 +1,4 @@ -From e2d85e74d938a2486d48169b69af45ffb70eb811 Mon Sep 17 00:00:00 2001 +From 2370d39567607fd82fe045f6290baf063e90fef8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Nov 2018 23:08:50 -0500 Subject: [PATCH] Book Size Limits diff --git a/Spigot-Server-Patches/0398-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0397-Make-the-default-permission-message-configurable.patch similarity index 97% rename from Spigot-Server-Patches/0398-Make-the-default-permission-message-configurable.patch rename to Spigot-Server-Patches/0397-Make-the-default-permission-message-configurable.patch index a773d1b250..a488787f38 100644 --- a/Spigot-Server-Patches/0398-Make-the-default-permission-message-configurable.patch +++ b/Spigot-Server-Patches/0397-Make-the-default-permission-message-configurable.patch @@ -1,4 +1,4 @@ -From b9b889e4ac8118cc7aaeba6c4dd296f767002436 Mon Sep 17 00:00:00 2001 +From 166fdc798d2c233284a2614f979b33b3870ccbab Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 19:49:56 +0000 Subject: [PATCH] Make the default permission message configurable diff --git a/Spigot-Server-Patches/0399-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0398-Add-more-Zombie-API.patch similarity index 98% rename from Spigot-Server-Patches/0399-Add-more-Zombie-API.patch rename to Spigot-Server-Patches/0398-Add-more-Zombie-API.patch index 66eae07361..c20f351668 100644 --- a/Spigot-Server-Patches/0399-Add-more-Zombie-API.patch +++ b/Spigot-Server-Patches/0398-Add-more-Zombie-API.patch @@ -1,4 +1,4 @@ -From 71f4a80d0a3fa035ed1bee5c0539f65f0a4b9639 Mon Sep 17 00:00:00 2001 +From 296a608e9d11e22b986858a98ea69fa2456b92a6 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 04:29:59 -0500 Subject: [PATCH] Add more Zombie API diff --git a/Spigot-Server-Patches/0400-limit-the-range-at-which-we-ll-consider-an-attackabl.patch b/Spigot-Server-Patches/0399-limit-the-range-at-which-we-ll-consider-an-attackabl.patch similarity index 94% rename from Spigot-Server-Patches/0400-limit-the-range-at-which-we-ll-consider-an-attackabl.patch rename to Spigot-Server-Patches/0399-limit-the-range-at-which-we-ll-consider-an-attackabl.patch index 08cb37a60d..ecaf762ae3 100644 --- a/Spigot-Server-Patches/0400-limit-the-range-at-which-we-ll-consider-an-attackabl.patch +++ b/Spigot-Server-Patches/0399-limit-the-range-at-which-we-ll-consider-an-attackabl.patch @@ -1,4 +1,4 @@ -From b8d0b1dc65c1afec931ebcbe8f196c7ecc92fefe Mon Sep 17 00:00:00 2001 +From 10f0e5e9acaf3a64baf52483ef99d2d6b1f86cfc Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 13 Nov 2018 14:01:00 +0000 Subject: [PATCH] limit the range at which we'll consider an attackable target @@ -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 d790fd89f..c9a65f7a6 100644 +index d790fd89f7..c9a65f7a60 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -2720,8 +2720,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc diff --git a/Spigot-Server-Patches/0401-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0400-Prevent-rayTrace-from-loading-chunks.patch similarity index 95% rename from Spigot-Server-Patches/0401-Prevent-rayTrace-from-loading-chunks.patch rename to Spigot-Server-Patches/0400-Prevent-rayTrace-from-loading-chunks.patch index 80644b4b1a..beec156856 100644 --- a/Spigot-Server-Patches/0401-Prevent-rayTrace-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0400-Prevent-rayTrace-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From b5b512f38eb6de0b6887ea7b61cc07acb4043188 Mon Sep 17 00:00:00 2001 +From 11841ac355d403ada181a7bb338119c8df19c2ed Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 26 Nov 2018 19:21:58 -0500 Subject: [PATCH] Prevent rayTrace from loading chunks @@ -7,7 +7,7 @@ ray tracing into an unloaded chunk should be treated as a miss this saves a ton of lag for when AI tries to raytrace near unloaded chunks. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 7721dfee65..1454af710e 100644 +index c9a65f7a60..789f9b63c1 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -860,7 +860,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc diff --git a/Spigot-Server-Patches/0402-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0401-Handle-Large-Packets-disconnecting-client.patch similarity index 98% rename from Spigot-Server-Patches/0402-Handle-Large-Packets-disconnecting-client.patch rename to Spigot-Server-Patches/0401-Handle-Large-Packets-disconnecting-client.patch index 11f1ace845..5aa43855ca 100644 --- a/Spigot-Server-Patches/0402-Handle-Large-Packets-disconnecting-client.patch +++ b/Spigot-Server-Patches/0401-Handle-Large-Packets-disconnecting-client.patch @@ -1,4 +1,4 @@ -From b07b820037f167f150b3af33ed2fff7e9cd88ea6 Mon Sep 17 00:00:00 2001 +From 2ce7c332bf662e3ddf29fda6608c045e4bc0fcaa Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Nov 2018 21:18:06 -0500 Subject: [PATCH] Handle Large Packets disconnecting client diff --git a/Spigot-Server-Patches/0403-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0402-Lazy-init-world-storage-in-CraftOfflinePlayer.patch similarity index 97% rename from Spigot-Server-Patches/0403-Lazy-init-world-storage-in-CraftOfflinePlayer.patch rename to Spigot-Server-Patches/0402-Lazy-init-world-storage-in-CraftOfflinePlayer.patch index 92eadc8e93..c10121202a 100644 --- a/Spigot-Server-Patches/0403-Lazy-init-world-storage-in-CraftOfflinePlayer.patch +++ b/Spigot-Server-Patches/0402-Lazy-init-world-storage-in-CraftOfflinePlayer.patch @@ -1,4 +1,4 @@ -From 240f4d59799fbc801df981f49420cf9b5a9b563f Mon Sep 17 00:00:00 2001 +From 6a7778f0999c4c4205e7bc4839c54080319ec963 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 11 Dec 2018 22:25:07 -0500 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer diff --git a/Spigot-Server-Patches/0404-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0403-Add-PlayerConnectionCloseEvent.patch similarity index 98% rename from Spigot-Server-Patches/0404-Add-PlayerConnectionCloseEvent.patch rename to Spigot-Server-Patches/0403-Add-PlayerConnectionCloseEvent.patch index 8327d25067..c201910790 100644 --- a/Spigot-Server-Patches/0404-Add-PlayerConnectionCloseEvent.patch +++ b/Spigot-Server-Patches/0403-Add-PlayerConnectionCloseEvent.patch @@ -1,4 +1,4 @@ -From 162fee0c9a057136c8fc744b62f1c0926a1e6220 Mon Sep 17 00:00:00 2001 +From e9dbaf795fa031bb5b79bc5ba49b37dda17d43d9 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 7 Oct 2018 12:05:28 -0700 Subject: [PATCH] Add PlayerConnectionCloseEvent diff --git a/Spigot-Server-Patches/0405-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0404-Prevent-Enderman-from-loading-chunks.patch similarity index 97% rename from Spigot-Server-Patches/0405-Prevent-Enderman-from-loading-chunks.patch rename to Spigot-Server-Patches/0404-Prevent-Enderman-from-loading-chunks.patch index 870a384ec9..326a31378d 100644 --- a/Spigot-Server-Patches/0405-Prevent-Enderman-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0404-Prevent-Enderman-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 747ca560c9bc065b36c1649811507dc0d1a6e456 Mon Sep 17 00:00:00 2001 +From ddb7e1081efbe525d9d2daf3cfc5f6a97fc8f65c Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 18 Dec 2018 02:15:08 +0000 Subject: [PATCH] Prevent Enderman from loading chunks diff --git a/Spigot-Server-Patches/0406-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0405-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 99% rename from Spigot-Server-Patches/0406-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to Spigot-Server-Patches/0405-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index e587636248..0a15d17ad6 100644 --- a/Spigot-Server-Patches/0406-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/Spigot-Server-Patches/0405-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -1,4 +1,4 @@ -From de09720b1332eaf211d79f51318a4c3c1a12eb2e Mon Sep 17 00:00:00 2001 +From 15c47ec9ce65bdbcbeb5cd913f9b2113ba27f091 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Jan 2019 00:35:43 -0600 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed diff --git a/Spigot-Server-Patches/0407-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0406-Fix-PlayerEditBookEvent.patch similarity index 96% rename from Spigot-Server-Patches/0407-Fix-PlayerEditBookEvent.patch rename to Spigot-Server-Patches/0406-Fix-PlayerEditBookEvent.patch index 0d88970c0f..9a715db9e3 100644 --- a/Spigot-Server-Patches/0407-Fix-PlayerEditBookEvent.patch +++ b/Spigot-Server-Patches/0406-Fix-PlayerEditBookEvent.patch @@ -1,4 +1,4 @@ -From a5eec7e0b987b7adeeb8a9ec29aaa09b003b8860 Mon Sep 17 00:00:00 2001 +From 50c1bf042b2a039dcc0477b77164025fd11c01fb Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Sun, 16 Dec 2018 13:07:33 +1100 Subject: [PATCH] Fix PlayerEditBookEvent diff --git a/Spigot-Server-Patches/0408-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0407-Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 93% rename from Spigot-Server-Patches/0408-Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to Spigot-Server-Patches/0407-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index fd3b6aa990..021de54f0a 100644 --- a/Spigot-Server-Patches/0408-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/Spigot-Server-Patches/0407-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -1,4 +1,4 @@ -From c693e26da2f98ce91cb05d220f05c5faf5a253c3 Mon Sep 17 00:00:00 2001 +From d733b73d25bc2c62785c907942d5ec74426995a8 Mon Sep 17 00:00:00 2001 From: connorhartley Date: Mon, 7 Jan 2019 14:43:48 -0600 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect diff --git a/Spigot-Server-Patches/0409-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0408-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch similarity index 97% rename from Spigot-Server-Patches/0409-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch rename to Spigot-Server-Patches/0408-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch index a6d13d2990..cbada34d74 100644 --- a/Spigot-Server-Patches/0409-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch +++ b/Spigot-Server-Patches/0408-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch @@ -1,4 +1,4 @@ -From c9cd937ba5a7735bb88c1be1b478d0adcc871a9a Mon Sep 17 00:00:00 2001 +From 3c9659cd27cef3f0b62da872ed3562e09ffa373c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 31 Jan 2019 16:33:36 -0500 Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons diff --git a/Spigot-Server-Patches/0410-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0409-Block-Entity-remove-from-being-called-on-Players.patch similarity index 95% rename from Spigot-Server-Patches/0410-Block-Entity-remove-from-being-called-on-Players.patch rename to Spigot-Server-Patches/0409-Block-Entity-remove-from-being-called-on-Players.patch index 681f6c4b2e..d74938e022 100644 --- a/Spigot-Server-Patches/0410-Block-Entity-remove-from-being-called-on-Players.patch +++ b/Spigot-Server-Patches/0409-Block-Entity-remove-from-being-called-on-Players.patch @@ -1,4 +1,4 @@ -From 355b9a0bb1d1af72cb61b3f8850c5b387dcf7b89 Mon Sep 17 00:00:00 2001 +From 9c747b07188a41935255652d35f3fafce5c98efc Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 4 Feb 2019 23:33:24 -0500 Subject: [PATCH] Block Entity#remove from being called on Players diff --git a/Spigot-Server-Patches/0411-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0410-Allow-Saving-of-Oversized-Chunks.patch similarity index 99% rename from Spigot-Server-Patches/0411-Allow-Saving-of-Oversized-Chunks.patch rename to Spigot-Server-Patches/0410-Allow-Saving-of-Oversized-Chunks.patch index 99f072cb83..ee0b457810 100644 --- a/Spigot-Server-Patches/0411-Allow-Saving-of-Oversized-Chunks.patch +++ b/Spigot-Server-Patches/0410-Allow-Saving-of-Oversized-Chunks.patch @@ -1,4 +1,4 @@ -From 828d56a3dccc292ea38fa319aaec5477291e3e8c Mon Sep 17 00:00:00 2001 +From 7fc69ad6ff0add30867c2bdfbdf15f79ee3c2ca2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Feb 2019 01:08:19 -0500 Subject: [PATCH] Allow Saving of Oversized Chunks diff --git a/Spigot-Server-Patches/0412-BlockDestroyEvent.patch b/Spigot-Server-Patches/0411-BlockDestroyEvent.patch similarity index 95% rename from Spigot-Server-Patches/0412-BlockDestroyEvent.patch rename to Spigot-Server-Patches/0411-BlockDestroyEvent.patch index d03864e226..1ffcf3e3d2 100644 --- a/Spigot-Server-Patches/0412-BlockDestroyEvent.patch +++ b/Spigot-Server-Patches/0411-BlockDestroyEvent.patch @@ -1,4 +1,4 @@ -From 340d46ba0e1d0bac0baffe2a0bcfa0d87fcff70e Mon Sep 17 00:00:00 2001 +From 383f8b2e99f1162e4b10e225af33961c6e63b705 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 6 Feb 2019 00:20:33 -0500 Subject: [PATCH] BlockDestroyEvent @@ -11,7 +11,7 @@ floating in the air. This can replace many uses of BlockPhysicsEvent diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1454af710e..e280b58531 100644 +index 789f9b63c1..a7a7250324 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -548,8 +548,20 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc diff --git a/Spigot-Server-Patches/0413-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0412-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch similarity index 98% rename from Spigot-Server-Patches/0413-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch rename to Spigot-Server-Patches/0412-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch index 795914e5e8..686508de59 100644 --- a/Spigot-Server-Patches/0413-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch +++ b/Spigot-Server-Patches/0412-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch @@ -1,4 +1,4 @@ -From 9ba6775e3eddfd4b8af01471ce6cf7b3a658291a Mon Sep 17 00:00:00 2001 +From b542649faa7b173cbe7bbc107f619b446c7f2913 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Jan 2019 00:08:15 -0500 Subject: [PATCH] Fix Custom Shapeless Custom Crafting Recipes diff --git a/Spigot-Server-Patches/0414-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0413-Fix-sign-edit-memory-leak.patch similarity index 97% rename from Spigot-Server-Patches/0414-Fix-sign-edit-memory-leak.patch rename to Spigot-Server-Patches/0413-Fix-sign-edit-memory-leak.patch index d2f316477c..b3c409937a 100644 --- a/Spigot-Server-Patches/0414-Fix-sign-edit-memory-leak.patch +++ b/Spigot-Server-Patches/0413-Fix-sign-edit-memory-leak.patch @@ -1,4 +1,4 @@ -From c1585662600e8e6bfee07aa5a791f388de85717a Mon Sep 17 00:00:00 2001 +From cb7ef6626d134b3d6dd1325d3b815ef49f4dca81 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Feb 2019 00:15:28 -0500 Subject: [PATCH] Fix sign edit memory leak diff --git a/Spigot-Server-Patches/0415-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0414-Limit-Client-Sign-length-more.patch similarity index 97% rename from Spigot-Server-Patches/0415-Limit-Client-Sign-length-more.patch rename to Spigot-Server-Patches/0414-Limit-Client-Sign-length-more.patch index 5ff9668fb1..ea9ca2a94c 100644 --- a/Spigot-Server-Patches/0415-Limit-Client-Sign-length-more.patch +++ b/Spigot-Server-Patches/0414-Limit-Client-Sign-length-more.patch @@ -1,4 +1,4 @@ -From 9278475d36f65e5b95b44b28ff15b9524015973e Mon Sep 17 00:00:00 2001 +From 976a44a52647981508f406d3010048d27dd79a40 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Feb 2019 22:18:40 -0500 Subject: [PATCH] Limit Client Sign length more diff --git a/Spigot-Server-Patches/0416-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0415-Don-t-check-ConvertSigns-boolean-every-sign-save.patch similarity index 95% rename from Spigot-Server-Patches/0416-Don-t-check-ConvertSigns-boolean-every-sign-save.patch rename to Spigot-Server-Patches/0415-Don-t-check-ConvertSigns-boolean-every-sign-save.patch index f20ecbfc99..59e3b456a8 100644 --- a/Spigot-Server-Patches/0416-Don-t-check-ConvertSigns-boolean-every-sign-save.patch +++ b/Spigot-Server-Patches/0415-Don-t-check-ConvertSigns-boolean-every-sign-save.patch @@ -1,4 +1,4 @@ -From f0aeb314f4816c28b5007dbfbdb005d10143d724 Mon Sep 17 00:00:00 2001 +From 2fa084ec05ab595bf3b7db61332c33374223f447 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 11:11:29 -0500 Subject: [PATCH] Don't check ConvertSigns boolean every sign save diff --git a/Spigot-Server-Patches/0417-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0416-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch similarity index 98% rename from Spigot-Server-Patches/0417-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch rename to Spigot-Server-Patches/0416-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch index f6473b2618..df93bbe0b8 100644 --- a/Spigot-Server-Patches/0417-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch +++ b/Spigot-Server-Patches/0416-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch @@ -1,4 +1,4 @@ -From d2464a0cfa4f2c0bb30336e4e6d7d757649c7a21 Mon Sep 17 00:00:00 2001 +From 3109c1c0a557665c04ccfa78067d93a04d085ff3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 14:55:01 -0500 Subject: [PATCH] Handle Excessive Signs in Chunks creating too large of diff --git a/Spigot-Server-Patches/0418-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0417-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch similarity index 97% rename from Spigot-Server-Patches/0418-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch rename to Spigot-Server-Patches/0417-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch index ef291025d5..f531d78000 100644 --- a/Spigot-Server-Patches/0418-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch +++ b/Spigot-Server-Patches/0417-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch @@ -1,4 +1,4 @@ -From 4ff4f66ea29bd8405f2e5182c9746214f12b53a3 Mon Sep 17 00:00:00 2001 +From 4402cefabfdb626f0ccca5d655e2328b84bcb229 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 16:12:35 -0500 Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency diff --git a/Spigot-Server-Patches/0419-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0418-Set-Zombie-last-tick-at-start-of-drowning-process.patch similarity index 93% rename from Spigot-Server-Patches/0419-Set-Zombie-last-tick-at-start-of-drowning-process.patch rename to Spigot-Server-Patches/0418-Set-Zombie-last-tick-at-start-of-drowning-process.patch index 7e9f056a76..57549592c1 100644 --- a/Spigot-Server-Patches/0419-Set-Zombie-last-tick-at-start-of-drowning-process.patch +++ b/Spigot-Server-Patches/0418-Set-Zombie-last-tick-at-start-of-drowning-process.patch @@ -1,4 +1,4 @@ -From ff4860cb5f82d587c904247af5dafe3e4f2916a9 Mon Sep 17 00:00:00 2001 +From f01aab41710008303b13222f0ff7a47c71be5583 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 4 Mar 2019 02:23:28 -0500 Subject: [PATCH] Set Zombie last tick at start of drowning process diff --git a/Spigot-Server-Patches/0420-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0419-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 91% rename from Spigot-Server-Patches/0420-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to Spigot-Server-Patches/0419-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch index 1405803fdc..ef8fc0caa8 100644 --- a/Spigot-Server-Patches/0420-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch +++ b/Spigot-Server-Patches/0419-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch @@ -1,4 +1,4 @@ -From 6bf7f6d474e8bb96afb2cbdd3c273f9a25c269da Mon Sep 17 00:00:00 2001 +From eb0e934626eb08d7dd6c3fad4aca46e1664981b9 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 13 Mar 2019 20:08:09 +0200 Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled diff --git a/Spigot-Server-Patches/0421-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0420-Use-proper-max-length-when-serialising-BungeeCord-te.patch similarity index 96% rename from Spigot-Server-Patches/0421-Use-proper-max-length-when-serialising-BungeeCord-te.patch rename to Spigot-Server-Patches/0420-Use-proper-max-length-when-serialising-BungeeCord-te.patch index 3862458b05..920e3efad7 100644 --- a/Spigot-Server-Patches/0421-Use-proper-max-length-when-serialising-BungeeCord-te.patch +++ b/Spigot-Server-Patches/0420-Use-proper-max-length-when-serialising-BungeeCord-te.patch @@ -1,4 +1,4 @@ -From f914570652750a8a7d94fe7ccb6b8a860f3c5d25 Mon Sep 17 00:00:00 2001 +From d661f8fa1f8e0207b7149db0bf5633331e3845a7 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 20 Mar 2019 21:19:29 -0700 Subject: [PATCH] Use proper max length when serialising BungeeCord text diff --git a/Spigot-Server-Patches/0422-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0421-Entity-getEntitySpawnReason.patch similarity index 98% rename from Spigot-Server-Patches/0422-Entity-getEntitySpawnReason.patch rename to Spigot-Server-Patches/0421-Entity-getEntitySpawnReason.patch index 5d114156b9..b7aaf03b17 100644 --- a/Spigot-Server-Patches/0422-Entity-getEntitySpawnReason.patch +++ b/Spigot-Server-Patches/0421-Entity-getEntitySpawnReason.patch @@ -1,4 +1,4 @@ -From 6878901664ce139320799123c21205c632518b94 Mon Sep 17 00:00:00 2001 +From d59eed96854235065933cc8118246b82646c3220 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 00:24:52 -0400 Subject: [PATCH] Entity#getEntitySpawnReason @@ -98,7 +98,7 @@ index b1630137ec..df416e3b59 100644 if (entity != null) { UUID uuid = nbttagcompound1.a("Attach"); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e280b58531..0e8025d311 100644 +index a7a7250324..aa04b95646 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1084,6 +1084,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc diff --git a/Spigot-Server-Patches/0423-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0422-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 97% rename from Spigot-Server-Patches/0423-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to Spigot-Server-Patches/0422-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch index c96473b008..9f72dd00f1 100644 --- a/Spigot-Server-Patches/0423-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch +++ b/Spigot-Server-Patches/0422-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch @@ -1,4 +1,4 @@ -From 07bc019d7485fc75328f148ca9498a5216a3f657 Mon Sep 17 00:00:00 2001 +From 35385d028f1e70e228f22f78184e55ac6301975d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 01:01:32 -0400 Subject: [PATCH] Only count Natural Spawned mobs towards natural spawn mob diff --git a/Spigot-Server-Patches/0424-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0423-Update-entity-Metadata-for-all-tracked-players.patch similarity index 94% rename from Spigot-Server-Patches/0424-Update-entity-Metadata-for-all-tracked-players.patch rename to Spigot-Server-Patches/0423-Update-entity-Metadata-for-all-tracked-players.patch index c524fdbbe1..f1b1126a46 100644 --- a/Spigot-Server-Patches/0424-Update-entity-Metadata-for-all-tracked-players.patch +++ b/Spigot-Server-Patches/0423-Update-entity-Metadata-for-all-tracked-players.patch @@ -1,4 +1,4 @@ -From a10f5f8613944c8b57e54babc61a3f93fc878433 Mon Sep 17 00:00:00 2001 +From 260c5b7ab0070e16df492fedb42989b6b665b9c5 Mon Sep 17 00:00:00 2001 From: AgentTroll Date: Fri, 22 Mar 2019 22:24:03 -0700 Subject: [PATCH] Update entity Metadata for all tracked players diff --git a/Spigot-Server-Patches/0425-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0424-Fire-event-on-GS4-query.patch similarity index 99% rename from Spigot-Server-Patches/0425-Fire-event-on-GS4-query.patch rename to Spigot-Server-Patches/0424-Fire-event-on-GS4-query.patch index 330293f1b8..12f798f3ab 100644 --- a/Spigot-Server-Patches/0425-Fire-event-on-GS4-query.patch +++ b/Spigot-Server-Patches/0424-Fire-event-on-GS4-query.patch @@ -1,4 +1,4 @@ -From d93407a6a86afa6ade028a6285c54b2b5374dd9f Mon Sep 17 00:00:00 2001 +From e557c04d525ee315b19f0e375ae8f8304e6e5132 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 17 Mar 2019 21:46:56 +0200 Subject: [PATCH] Fire event on GS4 query diff --git a/Spigot-Server-Patches/0426-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0425-Implement-PlayerPostRespawnEvent.patch similarity index 96% rename from Spigot-Server-Patches/0426-Implement-PlayerPostRespawnEvent.patch rename to Spigot-Server-Patches/0425-Implement-PlayerPostRespawnEvent.patch index a66cd22a10..e08e210707 100644 --- a/Spigot-Server-Patches/0426-Implement-PlayerPostRespawnEvent.patch +++ b/Spigot-Server-Patches/0425-Implement-PlayerPostRespawnEvent.patch @@ -1,4 +1,4 @@ -From 86fdb38b7adbe22c2122182b9aaa623e0cc59b52 Mon Sep 17 00:00:00 2001 +From 93375b92cec01b6df35127f72fdc7131dd7606a1 Mon Sep 17 00:00:00 2001 From: MisterVector Date: Fri, 26 Oct 2018 21:31:00 -0700 Subject: [PATCH] Implement PlayerPostRespawnEvent diff --git a/Spigot-Server-Patches/0427-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0426-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 95% rename from Spigot-Server-Patches/0427-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to Spigot-Server-Patches/0426-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch index 44f01f4a06..cc9b1e147d 100644 --- a/Spigot-Server-Patches/0427-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch +++ b/Spigot-Server-Patches/0426-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch @@ -1,4 +1,4 @@ -From 8e7a5ca3bc46e18ff3d7bde7ca3cbe7b713623a8 Mon Sep 17 00:00:00 2001 +From 3e0f2cba85cf3973263dc0e979f575d13871fc3b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 18:09:20 -0400 Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items diff --git a/Spigot-Server-Patches/0428-Don-t-update-entity-trackers-for-worlds-without-play.patch b/Spigot-Server-Patches/0427-Don-t-update-entity-trackers-for-worlds-without-play.patch similarity index 96% rename from Spigot-Server-Patches/0428-Don-t-update-entity-trackers-for-worlds-without-play.patch rename to Spigot-Server-Patches/0427-Don-t-update-entity-trackers-for-worlds-without-play.patch index e3348db920..d29f3b9ad0 100644 --- a/Spigot-Server-Patches/0428-Don-t-update-entity-trackers-for-worlds-without-play.patch +++ b/Spigot-Server-Patches/0427-Don-t-update-entity-trackers-for-worlds-without-play.patch @@ -1,4 +1,4 @@ -From efd33c3794e72cc40a77a3e58ecf90aec6efd6c2 Mon Sep 17 00:00:00 2001 +From 8c2ebd93987cb69b1d026be706cde64064199c8c Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 24 Mar 2019 18:52:31 +0000 Subject: [PATCH] Don't update entity trackers for worlds without players diff --git a/Spigot-Server-Patches/0429-Server-Tick-Events.patch b/Spigot-Server-Patches/0428-Server-Tick-Events.patch similarity index 96% rename from Spigot-Server-Patches/0429-Server-Tick-Events.patch rename to Spigot-Server-Patches/0428-Server-Tick-Events.patch index afc6fba092..51549e95da 100644 --- a/Spigot-Server-Patches/0429-Server-Tick-Events.patch +++ b/Spigot-Server-Patches/0428-Server-Tick-Events.patch @@ -1,4 +1,4 @@ -From 0051bbc2ee1699aed51c6ca5dddb1a3f033aa444 Mon Sep 17 00:00:00 2001 +From c4bf9f6376eaced57b5b23e4426002e1c78c8782 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 22:48:45 -0400 Subject: [PATCH] Server Tick Events diff --git a/Spigot-Server-Patches/0430-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0429-PlayerDeathEvent-getItemsToKeep.patch similarity index 98% rename from Spigot-Server-Patches/0430-PlayerDeathEvent-getItemsToKeep.patch rename to Spigot-Server-Patches/0429-PlayerDeathEvent-getItemsToKeep.patch index 7f1815dcfa..6fda60f020 100644 --- a/Spigot-Server-Patches/0430-PlayerDeathEvent-getItemsToKeep.patch +++ b/Spigot-Server-Patches/0429-PlayerDeathEvent-getItemsToKeep.patch @@ -1,4 +1,4 @@ -From 4feb8f9b2bffe706d9eade116d6bf311dc77c451 Mon Sep 17 00:00:00 2001 +From 65ec7e6f63ce18e7104c5647956ead8a476ed70a Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 23:01:33 -0400 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep diff --git a/Spigot-Server-Patches/0431-Optimize-Persistent-Data-Loading.patch b/Spigot-Server-Patches/0430-Optimize-Persistent-Data-Loading.patch similarity index 98% rename from Spigot-Server-Patches/0431-Optimize-Persistent-Data-Loading.patch rename to Spigot-Server-Patches/0430-Optimize-Persistent-Data-Loading.patch index 33633082d6..05a81edecf 100644 --- a/Spigot-Server-Patches/0431-Optimize-Persistent-Data-Loading.patch +++ b/Spigot-Server-Patches/0430-Optimize-Persistent-Data-Loading.patch @@ -1,4 +1,4 @@ -From f640bef2e74224aa9ef01b0351f951e9e5b517d7 Mon Sep 17 00:00:00 2001 +From 647ca67e93ab289f8ccc920b602fa59b00f949a2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Mar 2019 01:25:11 -0400 Subject: [PATCH] Optimize Persistent Data Loading diff --git a/Spigot-Server-Patches/0432-Allow-login-events-to-fire-only-after-the-server-plu.patch b/Spigot-Server-Patches/0431-Allow-login-events-to-fire-only-after-the-server-plu.patch similarity index 97% rename from Spigot-Server-Patches/0432-Allow-login-events-to-fire-only-after-the-server-plu.patch rename to Spigot-Server-Patches/0431-Allow-login-events-to-fire-only-after-the-server-plu.patch index da68f4a055..8f9767a011 100644 --- a/Spigot-Server-Patches/0432-Allow-login-events-to-fire-only-after-the-server-plu.patch +++ b/Spigot-Server-Patches/0431-Allow-login-events-to-fire-only-after-the-server-plu.patch @@ -1,4 +1,4 @@ -From 75a702d4b18f81dd7b3a17296e9ddef09f7b67d1 Mon Sep 17 00:00:00 2001 +From 6cfcbcfd0c0252c945e9058598d2e793ee7f2bbc Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 31 Mar 2019 22:02:24 -0700 Subject: [PATCH] Allow login events to fire only after the server plugins are diff --git a/Spigot-Server-Patches/0433-Make-region-files-more-reliable-to-write-to.patch b/Spigot-Server-Patches/0432-Make-region-files-more-reliable-to-write-to.patch similarity index 99% rename from Spigot-Server-Patches/0433-Make-region-files-more-reliable-to-write-to.patch rename to Spigot-Server-Patches/0432-Make-region-files-more-reliable-to-write-to.patch index f7cbe7384b..c3a341706f 100644 --- a/Spigot-Server-Patches/0433-Make-region-files-more-reliable-to-write-to.patch +++ b/Spigot-Server-Patches/0432-Make-region-files-more-reliable-to-write-to.patch @@ -1,4 +1,4 @@ -From ed7d354ccaa9465fd12030d6a0621780ecbe14fc Mon Sep 17 00:00:00 2001 +From a1302f191f49bae1d19fa8cf1104b81acb83472b Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 1 Apr 2019 18:57:32 -0700 Subject: [PATCH] Make region files more reliable to write to diff --git a/Spigot-Server-Patches/0434-Optimize-GameRules-to-use-LinkedHashMap.patch b/Spigot-Server-Patches/0433-Optimize-GameRules-to-use-LinkedHashMap.patch similarity index 98% rename from Spigot-Server-Patches/0434-Optimize-GameRules-to-use-LinkedHashMap.patch rename to Spigot-Server-Patches/0433-Optimize-GameRules-to-use-LinkedHashMap.patch index 3068614997..910b736bea 100644 --- a/Spigot-Server-Patches/0434-Optimize-GameRules-to-use-LinkedHashMap.patch +++ b/Spigot-Server-Patches/0433-Optimize-GameRules-to-use-LinkedHashMap.patch @@ -1,4 +1,4 @@ -From dac566303446ee307bd3875361c7bf94a192e45b Mon Sep 17 00:00:00 2001 +From d0a0981ed4bc59fee1f9871d45f0c8b4d0ac2620 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Thu, 4 Apr 2019 17:55:05 -0700 Subject: [PATCH] Optimize GameRules to use LinkedHashMap diff --git a/Spigot-Server-Patches/0435-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0434-Optimize-Captured-TileEntity-Lookup.patch similarity index 93% rename from Spigot-Server-Patches/0435-Optimize-Captured-TileEntity-Lookup.patch rename to Spigot-Server-Patches/0434-Optimize-Captured-TileEntity-Lookup.patch index 7775be729e..30886d73f2 100644 --- a/Spigot-Server-Patches/0435-Optimize-Captured-TileEntity-Lookup.patch +++ b/Spigot-Server-Patches/0434-Optimize-Captured-TileEntity-Lookup.patch @@ -1,4 +1,4 @@ -From bbf5a5ff04d56b217118ab54e6c2d91bb16ce7bb Mon Sep 17 00:00:00 2001 +From 1c0b15ed0ccee3e34f15554e58e264de191977f1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 6 Apr 2019 10:16:48 -0400 Subject: [PATCH] Optimize Captured TileEntity Lookup @@ -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 aa04b9564..f5156a89a 100644 +index aa04b95646..f5156a89a5 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1934,12 +1934,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc diff --git a/Spigot-Server-Patches/0436-Add-Heightmap-API.patch b/Spigot-Server-Patches/0435-Add-Heightmap-API.patch similarity index 96% rename from Spigot-Server-Patches/0436-Add-Heightmap-API.patch rename to Spigot-Server-Patches/0435-Add-Heightmap-API.patch index a051e25809..f258536d33 100644 --- a/Spigot-Server-Patches/0436-Add-Heightmap-API.patch +++ b/Spigot-Server-Patches/0435-Add-Heightmap-API.patch @@ -1,11 +1,11 @@ -From 899b3fb3c22a1f365bfef5318b90b99b632c0a49 Mon Sep 17 00:00:00 2001 +From fe680851757a281419cb6ce4de40016d32727b3e Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 1 Jan 2019 02:22:01 -0800 Subject: [PATCH] Add Heightmap API diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b940f95bdb..d20f6ac7e4 100644 +index f5156a89a5..57b0f1a38e 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -720,6 +720,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc diff --git a/Spigot-Server-Patches/0437-Handle-bad-chunks-more-gracefully.patch b/Spigot-Server-Patches/0436-Handle-bad-chunks-more-gracefully.patch similarity index 97% rename from Spigot-Server-Patches/0437-Handle-bad-chunks-more-gracefully.patch rename to Spigot-Server-Patches/0436-Handle-bad-chunks-more-gracefully.patch index 5f044d3c10..0aa83b1344 100644 --- a/Spigot-Server-Patches/0437-Handle-bad-chunks-more-gracefully.patch +++ b/Spigot-Server-Patches/0436-Handle-bad-chunks-more-gracefully.patch @@ -1,4 +1,4 @@ -From d0f37a6611ca8b011d391ced8e259e23b78aaee9 Mon Sep 17 00:00:00 2001 +From c783a97918fbfc9ec2da1f1cca9475bfcd4f7844 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 15 Apr 2019 02:24:52 +0100 Subject: [PATCH] Handle bad chunks more gracefully diff --git a/Spigot-Server-Patches/0438-Fix-NPE-from-sign-placement.patch b/Spigot-Server-Patches/0437-Fix-NPE-from-sign-placement.patch similarity index 97% rename from Spigot-Server-Patches/0438-Fix-NPE-from-sign-placement.patch rename to Spigot-Server-Patches/0437-Fix-NPE-from-sign-placement.patch index 11bb5611be..59e0f8b163 100644 --- a/Spigot-Server-Patches/0438-Fix-NPE-from-sign-placement.patch +++ b/Spigot-Server-Patches/0437-Fix-NPE-from-sign-placement.patch @@ -1,4 +1,4 @@ -From d5c2e00a30aa96c665393676e4dc49aa0a2feed2 Mon Sep 17 00:00:00 2001 +From 5101cc45bfa0c0bfe7b10ec48a179486dda609b0 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 17 Apr 2019 00:48:59 +0100 Subject: [PATCH] Fix NPE from sign placement diff --git a/Spigot-Server-Patches/0439-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0438-Mob-Spawner-API-Enhancements.patch similarity index 98% rename from Spigot-Server-Patches/0439-Mob-Spawner-API-Enhancements.patch rename to Spigot-Server-Patches/0438-Mob-Spawner-API-Enhancements.patch index d3596719d4..92295e3c76 100644 --- a/Spigot-Server-Patches/0439-Mob-Spawner-API-Enhancements.patch +++ b/Spigot-Server-Patches/0438-Mob-Spawner-API-Enhancements.patch @@ -1,4 +1,4 @@ -From 965a2dc88afd9fb86088110cf7104e3aae020428 Mon Sep 17 00:00:00 2001 +From a22319f1c97b10ac0fc4e94467a2502c10e1c859 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 19 Apr 2019 12:41:13 -0500 Subject: [PATCH] Mob Spawner API Enhancements diff --git a/Spigot-Server-Patches/0440-don-t-NPE-on-dimensionmanager-toString.patch b/Spigot-Server-Patches/0439-don-t-NPE-on-dimensionmanager-toString.patch similarity index 96% rename from Spigot-Server-Patches/0440-don-t-NPE-on-dimensionmanager-toString.patch rename to Spigot-Server-Patches/0439-don-t-NPE-on-dimensionmanager-toString.patch index 4593ed7d1f..cc441b634c 100644 --- a/Spigot-Server-Patches/0440-don-t-NPE-on-dimensionmanager-toString.patch +++ b/Spigot-Server-Patches/0439-don-t-NPE-on-dimensionmanager-toString.patch @@ -1,4 +1,4 @@ -From 77a1e11685c6e91533e16f35ae3f0fe4fefbffc1 Mon Sep 17 00:00:00 2001 +From 701880fb5c0094c2569b8c7340cf0fa4277433ac Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 22 Apr 2019 19:51:14 +0100 Subject: [PATCH] don't NPE on dimensionmanager toString diff --git a/Spigot-Server-Patches/0441-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0440-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 91% rename from Spigot-Server-Patches/0441-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to Spigot-Server-Patches/0440-Fix-sounds-when-item-frames-are-modified-MC-123450.patch index c35e847aef..4b97beb4c0 100644 --- a/Spigot-Server-Patches/0441-Fix-sounds-when-item-frames-are-modified-MC-123450.patch +++ b/Spigot-Server-Patches/0440-Fix-sounds-when-item-frames-are-modified-MC-123450.patch @@ -1,4 +1,4 @@ -From f175505ce0a62b77390a9d7c83dfa52c309287a3 Mon Sep 17 00:00:00 2001 +From 273c93317bcf0f5acd823b31eae7e1f2da65a0d8 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Sat, 27 Apr 2019 20:00:43 +0100 Subject: [PATCH] Fix sounds when item frames are modified (MC-123450) @@ -6,7 +6,7 @@ Subject: [PATCH] Fix sounds when item frames are modified (MC-123450) This also fixes the adding sound playing when the item frame direction is changed. diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java -index 964509a3..1b1e0838 100644 +index 964509a337..1b1e083896 100644 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java @@ -186,7 +186,7 @@ public class EntityItemFrame extends EntityHanging { @@ -19,7 +19,7 @@ index 964509a3..1b1e0838 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java -index 227a9ffa..d6328d2f 100644 +index 227a9ffa03..d6328d2fd2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java @@ -51,7 +51,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame { @@ -32,5 +32,5 @@ index 227a9ffa..d6328d2f 100644 this.entity = frame; } -- -2.18.0.windows.1 +2.21.0