diff --git a/Spigot-Server-Patches/0262-Don-t-save-Proto-Chunks.patch b/Spigot-Server-Patches/0262-Don-t-save-Proto-Chunks.patch deleted file mode 100644 index e14b7240c..000000000 --- a/Spigot-Server-Patches/0262-Don-t-save-Proto-Chunks.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d44eea0a0f82fd4a03370687e427b516e5f03835 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Sun, 22 Jul 2018 21:21:41 -0400 -Subject: [PATCH] Don't save Proto Chunks - -These chunks are unfinished, and waste cpu time saving these unfinished chunks. -the loadChunk method refuses to acknoledge they exists, and will restart -a new chunk generation process to begin with, so saving them serves no benefit. - -diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 9a65c98b9f..85e9db8f4b 100644 ---- a/src/main/java/net/minecraft/server/PlayerChunkMap.java -+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java -@@ -638,6 +638,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { - } - - public boolean saveChunk(IChunkAccess ichunkaccess) { -+ if (ichunkaccess.getChunkStatus().getType() == ChunkStatus.Type.PROTOCHUNK) { return true; } // Paper - don't save proto chunks - this.n.a(ichunkaccess.getPos()); - if (!ichunkaccess.isNeedsSaving()) { - return false; --- -2.21.0 - diff --git a/Spigot-Server-Patches/0263-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0262-Optimize-RegistryID.c.patch similarity index 97% rename from Spigot-Server-Patches/0263-Optimize-RegistryID.c.patch rename to Spigot-Server-Patches/0262-Optimize-RegistryID.c.patch index 7a225643f..43a6f98b2 100644 --- a/Spigot-Server-Patches/0263-Optimize-RegistryID.c.patch +++ b/Spigot-Server-Patches/0262-Optimize-RegistryID.c.patch @@ -1,4 +1,4 @@ -From db1163c8e5d2121e3ae5b048a1d68a66290344a4 Mon Sep 17 00:00:00 2001 +From b23159e3fa9188ca186874d1ae2cabe634d0afc6 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Mon, 23 Jul 2018 13:08:19 -0400 Subject: [PATCH] Optimize RegistryID.c() diff --git a/Spigot-Server-Patches/0264-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0263-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 94% rename from Spigot-Server-Patches/0264-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to Spigot-Server-Patches/0263-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index 1086093e5..308c741f4 100644 --- a/Spigot-Server-Patches/0264-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/Spigot-Server-Patches/0263-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -1,4 +1,4 @@ -From dc6e06893ec22da27116d0a1bc7a7b0d6bff1835 Mon Sep 17 00:00:00 2001 +From 66c6d3bb58b2f815702c40910b739e16abea61b3 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 @@ -21,7 +21,7 @@ index 83e54cb90..f06bb3ae1 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 f93e3faae..1f2e2cd87 100644 +index 5cf3aea4f..dbb4eb0a8 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -877,6 +877,14 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0265-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch similarity index 95% rename from Spigot-Server-Patches/0265-Vanished-players-don-t-have-rights.patch rename to Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch index b40856ba2..d7b4b9f31 100644 --- a/Spigot-Server-Patches/0265-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch @@ -1,11 +1,11 @@ -From 5fb4cc4d83df1236d12cbbacbabd01eed3a62d2d Mon Sep 17 00:00:00 2001 +From d59b99142a6d7e1f721e59f1fd59187de89c8b81 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 41559d3baf..7f6e20e4b9 100644 +index 15315a43e..7927b69ae 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -97,7 +97,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,7 +18,7 @@ index 41559d3baf..7f6e20e4b9 100644 protected int j; private Entity vehicle; diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java -index ee22bb0387..e5a013ffd2 100644 +index ee22bb038..e5a013ffd 100644 --- a/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java @@ -22,9 +22,18 @@ public interface IEntityAccess { @@ -41,7 +41,7 @@ index ee22bb0387..e5a013ffd2 100644 return VoxelShapes.c(voxelshape, VoxelShapes.a(entity1.getBoundingBox()), OperatorBoolean.AND); }); diff --git a/src/main/java/net/minecraft/server/IWorldReader.java b/src/main/java/net/minecraft/server/IWorldReader.java -index 17dac8dfa4..5b422eaa2d 100644 +index 7308c0c31..ed3f793f2 100644 --- a/src/main/java/net/minecraft/server/IWorldReader.java +++ b/src/main/java/net/minecraft/server/IWorldReader.java @@ -84,7 +84,12 @@ public interface IWorldReader extends IIBlockAccess { @@ -58,7 +58,7 @@ index 17dac8dfa4..5b422eaa2d 100644 return voxelshape.isEmpty() || this.a((Entity) null, voxelshape.a((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ())); diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java -index 59b1e6ce2e..b90cc6652b 100644 +index 59b1e6ce2..b90cc6652 100644 --- a/src/main/java/net/minecraft/server/ItemBlock.java +++ b/src/main/java/net/minecraft/server/ItemBlock.java @@ -126,7 +126,8 @@ public class ItemBlock extends Item { @@ -72,7 +72,7 @@ index 59b1e6ce2e..b90cc6652b 100644 BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 309cbd0dc6..78baaf6253 100644 +index 309cbd0dc..78baaf625 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1136,6 +1136,14 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0266-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0265-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch similarity index 89% rename from Spigot-Server-Patches/0266-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch rename to Spigot-Server-Patches/0265-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch index f240d9816..ed8e8b84e 100644 --- a/Spigot-Server-Patches/0266-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch +++ b/Spigot-Server-Patches/0265-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch @@ -1,4 +1,4 @@ -From 98faf4aceec854a6ea132d828ca8dd1a0c7c0707 Mon Sep 17 00:00:00 2001 +From 8eb04eaaa71a87f84ab918a1cb3bdda831e01c6f Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 23 Jul 2018 22:18:31 -0400 Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it @@ -6,7 +6,7 @@ Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 7bd5a0a8c..f2ca391bf 100644 +index 98c2de550..4409a6ec8 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -416,6 +416,7 @@ public class Chunk implements IChunkAccess { diff --git a/Spigot-Server-Patches/0267-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0266-Add-some-Debug-to-Chunk-Entity-slices.patch similarity index 95% rename from Spigot-Server-Patches/0267-Add-some-Debug-to-Chunk-Entity-slices.patch rename to Spigot-Server-Patches/0266-Add-some-Debug-to-Chunk-Entity-slices.patch index 801c0e8a2..bfb1507c7 100644 --- a/Spigot-Server-Patches/0267-Add-some-Debug-to-Chunk-Entity-slices.patch +++ b/Spigot-Server-Patches/0266-Add-some-Debug-to-Chunk-Entity-slices.patch @@ -1,4 +1,4 @@ -From 094bd1612b657efc827a240c88378f6a1948db2d Mon Sep 17 00:00:00 2001 +From 9c5c011680364f77ecf616fb62a3f2308e557656 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 23 Jul 2018 22:44:23 -0400 Subject: [PATCH] Add some Debug to Chunk Entity slices @@ -9,7 +9,7 @@ This should hopefully avoid duplicate entities ever being created if the entity was to end up in 2 different chunk slices diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index f2ca391bf..2cb3e3696 100644 +index 4409a6ec8..5d1947f82 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -408,6 +408,25 @@ public class Chunk implements IChunkAccess { @@ -57,7 +57,7 @@ index f2ca391bf..2cb3e3696 100644 return; } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7f6e20e4b..a273bec56 100644 +index 7927b69ae..ba40c2be6 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -67,6 +67,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0268-EntityTransformedEvent.patch b/Spigot-Server-Patches/0267-EntityTransformedEvent.patch similarity index 95% rename from Spigot-Server-Patches/0268-EntityTransformedEvent.patch rename to Spigot-Server-Patches/0267-EntityTransformedEvent.patch index b9820b5c3..a97b89a04 100644 --- a/Spigot-Server-Patches/0268-EntityTransformedEvent.patch +++ b/Spigot-Server-Patches/0267-EntityTransformedEvent.patch @@ -1,11 +1,11 @@ -From 62121c08bd2fd851919d90f62ca0528319b3beb8 Mon Sep 17 00:00:00 2001 +From d37ef40bb457ef9f6e47f4410a750f0c62addb95 Mon Sep 17 00:00:00 2001 From: Anthony MacAllister Date: Thu, 26 Jul 2018 15:30:03 -0400 Subject: [PATCH] EntityTransformedEvent diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java -index bb3493c14f..de787d8614 100644 +index bb3493c14..de787d861 100644 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java @@ -101,6 +101,7 @@ public class EntityMushroomCow extends EntityCow { @@ -17,7 +17,7 @@ index bb3493c14f..de787d8614 100644 this.die(); // CraftBukkit - from above diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index b25f3d1592..fe9efa9da1 100644 +index b25f3d159..fe9efa9da 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -602,6 +602,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -29,7 +29,7 @@ index b25f3d1592..fe9efa9da1 100644 // CraftBukkit end this.die(); diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 4cb305ff28..171c1ae4ad 100644 +index 4cb305ff2..171c1ae4a 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -247,6 +247,7 @@ public class EntityZombie extends EntityMonster { @@ -49,7 +49,7 @@ index 4cb305ff28..171c1ae4ad 100644 this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java -index 2fe7fb7889..5cfda3160b 100644 +index 2fe7fb788..5cfda3160 100644 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java @@ -157,6 +157,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo diff --git a/Spigot-Server-Patches/0269-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0268-SkeletonHorse-Additions.patch similarity index 97% rename from Spigot-Server-Patches/0269-SkeletonHorse-Additions.patch rename to Spigot-Server-Patches/0268-SkeletonHorse-Additions.patch index e8e21464a..163838bc3 100644 --- a/Spigot-Server-Patches/0269-SkeletonHorse-Additions.patch +++ b/Spigot-Server-Patches/0268-SkeletonHorse-Additions.patch @@ -1,4 +1,4 @@ -From a9f9d0460f6d51811ea8adfc2398eb8613575f0c Mon Sep 17 00:00:00 2001 +From a641ca430909c6497abe48673d4f735dd149d853 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 27 Jul 2018 22:36:31 -0500 Subject: [PATCH] SkeletonHorse Additions diff --git a/Spigot-Server-Patches/0270-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0269-Prevent-Saving-Bad-entities-to-chunks.patch similarity index 96% rename from Spigot-Server-Patches/0270-Prevent-Saving-Bad-entities-to-chunks.patch rename to Spigot-Server-Patches/0269-Prevent-Saving-Bad-entities-to-chunks.patch index 0ab4a9d07..6d374f8a3 100644 --- a/Spigot-Server-Patches/0270-Prevent-Saving-Bad-entities-to-chunks.patch +++ b/Spigot-Server-Patches/0269-Prevent-Saving-Bad-entities-to-chunks.patch @@ -1,4 +1,4 @@ -From c6d56145f34a4fbdc515cff02a11e053b63ed3a5 Mon Sep 17 00:00:00 2001 +From a21ebf5a16f3393e1f025643e143ba81142506f2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 26 Jul 2018 00:11:12 -0400 Subject: [PATCH] Prevent Saving Bad entities to chunks @@ -18,7 +18,7 @@ an invalid entity. This should reduce log occurrences of dupe uuid messages. diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 1ebb16f0f6..2f749fe26a 100644 +index 1ebb16f0f..2f749fe26 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -318,6 +318,7 @@ public class ChunkRegionLoader { diff --git a/Spigot-Server-Patches/0271-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0270-Don-t-call-getItemMeta-on-hasItemMeta.patch similarity index 98% rename from Spigot-Server-Patches/0271-Don-t-call-getItemMeta-on-hasItemMeta.patch rename to Spigot-Server-Patches/0270-Don-t-call-getItemMeta-on-hasItemMeta.patch index f1755b478..4a70aaac1 100644 --- a/Spigot-Server-Patches/0271-Don-t-call-getItemMeta-on-hasItemMeta.patch +++ b/Spigot-Server-Patches/0270-Don-t-call-getItemMeta-on-hasItemMeta.patch @@ -1,4 +1,4 @@ -From a9a10de78a820a47f07c2b62a31bc46ee49d0350 Mon Sep 17 00:00:00 2001 +From 3baa0dd9a62fd3e8c3823e6cb8f4c9f12b3c0fec Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Thu, 26 Jul 2018 14:10:23 +0200 Subject: [PATCH] Don't call getItemMeta on hasItemMeta diff --git a/Spigot-Server-Patches/0272-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch similarity index 96% rename from Spigot-Server-Patches/0272-Ignore-Dead-Entities-in-entityList-iteration.patch rename to Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch index 0622fbf68..a0460bc0e 100644 --- a/Spigot-Server-Patches/0272-Ignore-Dead-Entities-in-entityList-iteration.patch +++ b/Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch @@ -1,4 +1,4 @@ -From 91fa68cb564b61ee67ef1cc3b0c2b79f5833aa3d Mon Sep 17 00:00:00 2001 +From 644a0a58a1a0e6e63e44fe1a7e7d5b61e1398c0f 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 ce190d88d6..352a39dcb3 100644 +index ce190d88d..352a39dcb 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 ce190d88d6..352a39dcb3 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/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 5d1947f826..197c0fe169 100644 +index 5d1947f82..197c0fe16 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -678,6 +678,7 @@ public class Chunk implements IChunkAccess { @@ -51,7 +51,7 @@ index 5d1947f826..197c0fe169 100644 if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check list.add(t0); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ba40c2be61..6011935dd9 100644 +index ba40c2be6..6011935dd 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -126,6 +126,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -63,7 +63,7 @@ index ba40c2be61..6011935dd9 100644 private float av; private float aw; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index f6ba51d14a..168e19b206 100644 +index f6ba51d14..168e19b20 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -836,6 +836,7 @@ public class WorldServer extends World { @@ -91,7 +91,7 @@ index f6ba51d14a..168e19b206 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 4c67f071b1..1adced482b 100644 +index 4c67f071b..1adced482 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -846,6 +846,7 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0273-Provide-option-to-use-a-versioned-world-folder-for-t.patch b/Spigot-Server-Patches/0272-Provide-option-to-use-a-versioned-world-folder-for-t.patch similarity index 99% rename from Spigot-Server-Patches/0273-Provide-option-to-use-a-versioned-world-folder-for-t.patch rename to Spigot-Server-Patches/0272-Provide-option-to-use-a-versioned-world-folder-for-t.patch index 3a4e043fc..f39b6c94f 100644 --- a/Spigot-Server-Patches/0273-Provide-option-to-use-a-versioned-world-folder-for-t.patch +++ b/Spigot-Server-Patches/0272-Provide-option-to-use-a-versioned-world-folder-for-t.patch @@ -1,4 +1,4 @@ -From d7b88cefa760decb99ba9b5e7f6fb8d9c28edf3f Mon Sep 17 00:00:00 2001 +From 0f69541ea1d4ba682b39102807528e7169e84704 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 29 Jul 2018 15:48:50 -0400 Subject: [PATCH] Provide option to use a versioned world folder for testing @@ -59,7 +59,7 @@ index a9b71c85d..8c3880c83 100644 + } } diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index 6425b14f2..74f102adf 100644 +index 21b3b06f5..871881165 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -10,13 +10,41 @@ import java.io.IOException; diff --git a/Spigot-Server-Patches/0274-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0273-MC-111480-Start-Entity-ID-s-at-1.patch similarity index 91% rename from Spigot-Server-Patches/0274-MC-111480-Start-Entity-ID-s-at-1.patch rename to Spigot-Server-Patches/0273-MC-111480-Start-Entity-ID-s-at-1.patch index b54c15824..53a174dd4 100644 --- a/Spigot-Server-Patches/0274-MC-111480-Start-Entity-ID-s-at-1.patch +++ b/Spigot-Server-Patches/0273-MC-111480-Start-Entity-ID-s-at-1.patch @@ -1,4 +1,4 @@ -From 3d192f6936af9c31f5f49a0ed85d84d303a2d9c8 Mon Sep 17 00:00:00 2001 +From 2535e1b20b096933aa3d2616866008b8a9e0ef08 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 29 Jul 2018 22:58:47 -0400 Subject: [PATCH] MC-111480: Start Entity ID's at 1 @@ -7,7 +7,7 @@ DataWatchers that store Entity ID's treat 0 as special, and can break things such as Elytra Fireworks. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 1d8b42027..69087c7ef 100644 +index 6011935dd..4af1482e2 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 diff --git a/Spigot-Server-Patches/0275-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0274-Implement-Expanded-ArmorStand-API.patch similarity index 98% rename from Spigot-Server-Patches/0275-Implement-Expanded-ArmorStand-API.patch rename to Spigot-Server-Patches/0274-Implement-Expanded-ArmorStand-API.patch index 356f10a01..b2c0835e9 100644 --- a/Spigot-Server-Patches/0275-Implement-Expanded-ArmorStand-API.patch +++ b/Spigot-Server-Patches/0274-Implement-Expanded-ArmorStand-API.patch @@ -1,4 +1,4 @@ -From d69d7ed327962ee55ab7648aa1a1f9fb8fc3b179 Mon Sep 17 00:00:00 2001 +From d35ccc712e7ad1dc95f744fcf1b6cb1946d1d956 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Thu, 26 Jul 2018 02:25:46 -0400 Subject: [PATCH] Implement Expanded ArmorStand API @@ -8,7 +8,7 @@ Add the following: - Enable/Disable slot interactions diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 06b274a71..96d9e8da8 100644 +index 81226d604..b5b763191 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving { diff --git a/Spigot-Server-Patches/0276-AnvilDamageEvent.patch b/Spigot-Server-Patches/0275-AnvilDamageEvent.patch similarity index 94% rename from Spigot-Server-Patches/0276-AnvilDamageEvent.patch rename to Spigot-Server-Patches/0275-AnvilDamageEvent.patch index 0eb91f10b..1b6c9d847 100644 --- a/Spigot-Server-Patches/0276-AnvilDamageEvent.patch +++ b/Spigot-Server-Patches/0275-AnvilDamageEvent.patch @@ -1,11 +1,11 @@ -From ec6b054f08dae92ee154bd9759944984f1f7eeef Mon Sep 17 00:00:00 2001 +From 6a0cb1efaaa31bd6bcc605e91f6725d5dcb9d6ee Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 20 Jul 2018 23:37:03 -0500 Subject: [PATCH] AnvilDamageEvent diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java -index ada5cf982..9e73e731b 100644 +index 88e706f07..abdcd52c4 100644 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java @@ -85,6 +85,16 @@ public class ContainerAnvil extends Container { diff --git a/Spigot-Server-Patches/0277-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0276-Add-TNTPrimeEvent.patch similarity index 98% rename from Spigot-Server-Patches/0277-Add-TNTPrimeEvent.patch rename to Spigot-Server-Patches/0276-Add-TNTPrimeEvent.patch index f6260060e..70f4f7bcb 100644 --- a/Spigot-Server-Patches/0277-Add-TNTPrimeEvent.patch +++ b/Spigot-Server-Patches/0276-Add-TNTPrimeEvent.patch @@ -1,4 +1,4 @@ -From 64f11268880afe697165bd8a80ad96496559374f Mon Sep 17 00:00:00 2001 +From 68f3115edf18da7b0dbf53bac1281e14de163a0c Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 16 Jul 2018 00:05:05 +0300 Subject: [PATCH] Add TNTPrimeEvent @@ -114,7 +114,7 @@ index 013fa3524..7e534417b 100644 world.a(blockposition, false); } diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index d42d4e83e..9ada10cc7 100644 +index 0baec5e11..2b39115c9 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock; diff --git a/Spigot-Server-Patches/0278-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0277-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 97% rename from Spigot-Server-Patches/0278-Break-up-and-make-tab-spam-limits-configurable.patch rename to Spigot-Server-Patches/0277-Break-up-and-make-tab-spam-limits-configurable.patch index 899fce5b3..b2632bf56 100644 --- a/Spigot-Server-Patches/0278-Break-up-and-make-tab-spam-limits-configurable.patch +++ b/Spigot-Server-Patches/0277-Break-up-and-make-tab-spam-limits-configurable.patch @@ -1,4 +1,4 @@ -From 857d9e53fdaa40d9764c085983bfb7eb59bfb4f6 Mon Sep 17 00:00:00 2001 +From c53466a7b3a976448deb0eeb54673b964d4e662a Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 29 Jul 2018 05:02:15 +0100 Subject: [PATCH] Break up and make tab spam limits configurable @@ -45,7 +45,7 @@ index 8c3880c83..d773ef5b0 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 4c99a321b..07e9abda9 100644 +index b8cd93302..f30fec7eb 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0279-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0278-Add-hand-to-bucket-events.patch similarity index 98% rename from Spigot-Server-Patches/0279-Add-hand-to-bucket-events.patch rename to Spigot-Server-Patches/0278-Add-hand-to-bucket-events.patch index b3e2b36d6..3d1dc84a8 100644 --- a/Spigot-Server-Patches/0279-Add-hand-to-bucket-events.patch +++ b/Spigot-Server-Patches/0278-Add-hand-to-bucket-events.patch @@ -1,11 +1,11 @@ -From 170f96ced5ac8e6de154574d7815b300cad56b84 Mon Sep 17 00:00:00 2001 +From a6d1b9d71c34b9a778e7db3fdfa04c66ce0e6c9a Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 2 Aug 2018 08:44:35 -0500 Subject: [PATCH] Add hand to bucket events diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index a17738f9ff..d2c2e3cc33 100644 +index a17738f9f..d2c2e3cc3 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java @@ -62,7 +62,7 @@ public class EntityCow extends EntityAnimal { @@ -18,7 +18,7 @@ index a17738f9ff..d2c2e3cc33 100644 if (event.isCancelled()) { return false; diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java -index cb28914118..5dc967f8ba 100644 +index cb2891411..5dc967f8b 100644 --- a/src/main/java/net/minecraft/server/ItemBucket.java +++ b/src/main/java/net/minecraft/server/ItemBucket.java @@ -39,7 +39,7 @@ public class ItemBucket extends Item { @@ -67,7 +67,7 @@ index cb28914118..5dc967f8ba 100644 ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 78baaf6253..eec3effef7 100644 +index 78baaf625..eec3effef 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -360,6 +360,20 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0280-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0279-MC-135506-Experience-should-save-as-Integers.patch similarity index 95% rename from Spigot-Server-Patches/0280-MC-135506-Experience-should-save-as-Integers.patch rename to Spigot-Server-Patches/0279-MC-135506-Experience-should-save-as-Integers.patch index 431dbb064..6c1a273e0 100644 --- a/Spigot-Server-Patches/0280-MC-135506-Experience-should-save-as-Integers.patch +++ b/Spigot-Server-Patches/0279-MC-135506-Experience-should-save-as-Integers.patch @@ -1,4 +1,4 @@ -From 56b6b14c85f4b13bb2b415d2fa32ad4f7cb54b36 Mon Sep 17 00:00:00 2001 +From 3cd82b2c86f45d91488088da69309381fd6afcea Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 3 Aug 2018 00:04:54 -0400 Subject: [PATCH] MC-135506: Experience should save as Integers diff --git a/Spigot-Server-Patches/0281-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0280-Fix-client-rendering-skulls-from-same-user.patch similarity index 98% rename from Spigot-Server-Patches/0281-Fix-client-rendering-skulls-from-same-user.patch rename to Spigot-Server-Patches/0280-Fix-client-rendering-skulls-from-same-user.patch index ed769a62d..4951e7d30 100644 --- a/Spigot-Server-Patches/0281-Fix-client-rendering-skulls-from-same-user.patch +++ b/Spigot-Server-Patches/0280-Fix-client-rendering-skulls-from-same-user.patch @@ -1,4 +1,4 @@ -From 4d50c898cf30fab7f58def127feab7a6ed89ae3c Mon Sep 17 00:00:00 2001 +From 88d3ebcebfa24aee9f674c8519cf2b4884b96856 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Nov 2016 00:40:42 -0500 Subject: [PATCH] Fix client rendering skulls from same user @@ -74,7 +74,7 @@ index 363ab5da1..d19a30ad8 100644 this.f.add(nbttagcompound); } diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java -index f6a80a00f..5306574e5 100644 +index 177cceb77..0882d82ce 100644 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java @@ -142,9 +142,37 @@ public class TileEntitySkull extends TileEntity /*implements ITickable*/ { // Pa diff --git a/Spigot-Server-Patches/0282-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch similarity index 99% rename from Spigot-Server-Patches/0282-Add-Early-Warning-Feature-to-WatchDog.patch rename to Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch index 1b365e620..019007249 100644 --- a/Spigot-Server-Patches/0282-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch @@ -1,4 +1,4 @@ -From 328ceba36730635c7fc487f90944d51dae4dc398 Mon Sep 17 00:00:00 2001 +From ac2ff8e0612d4e9c9d6f57fe2ff083dd5da5307c Mon Sep 17 00:00:00 2001 From: miclebrick Date: Wed, 8 Aug 2018 15:30:52 -0400 Subject: [PATCH] Add Early Warning Feature to WatchDog diff --git a/Spigot-Server-Patches/0283-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0282-Make-EnderDragon-implement-Mob.patch similarity index 95% rename from Spigot-Server-Patches/0283-Make-EnderDragon-implement-Mob.patch rename to Spigot-Server-Patches/0282-Make-EnderDragon-implement-Mob.patch index 469c000ce..eec20ef51 100644 --- a/Spigot-Server-Patches/0283-Make-EnderDragon-implement-Mob.patch +++ b/Spigot-Server-Patches/0282-Make-EnderDragon-implement-Mob.patch @@ -1,4 +1,4 @@ -From dae24cf43533a4882d0a2e5e0240145da6600f47 Mon Sep 17 00:00:00 2001 +From 8e5983ad147531a95e995f704d85a110cef0f1ac Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 10 Aug 2018 22:11:49 -0400 Subject: [PATCH] Make EnderDragon implement Mob diff --git a/Spigot-Server-Patches/0284-Detect-and-repair-corrupt-Region-Files.patch b/Spigot-Server-Patches/0283-Detect-and-repair-corrupt-Region-Files.patch similarity index 98% rename from Spigot-Server-Patches/0284-Detect-and-repair-corrupt-Region-Files.patch rename to Spigot-Server-Patches/0283-Detect-and-repair-corrupt-Region-Files.patch index 6b53711bb..24575c654 100644 --- a/Spigot-Server-Patches/0284-Detect-and-repair-corrupt-Region-Files.patch +++ b/Spigot-Server-Patches/0283-Detect-and-repair-corrupt-Region-Files.patch @@ -1,4 +1,4 @@ -From 3691197a487e286eaecab0599fed5036d95629b5 Mon Sep 17 00:00:00 2001 +From 14b0e6d38cebae27d8e291c4c0ee396d6155ed48 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 11 Aug 2018 00:49:20 -0400 Subject: [PATCH] Detect and repair corrupt Region Files diff --git a/Spigot-Server-Patches/0285-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0284-Use-ConcurrentHashMap-in-JsonList.patch similarity index 97% rename from Spigot-Server-Patches/0285-Use-ConcurrentHashMap-in-JsonList.patch rename to Spigot-Server-Patches/0284-Use-ConcurrentHashMap-in-JsonList.patch index 0ef1f2518..57a221a6c 100644 --- a/Spigot-Server-Patches/0285-Use-ConcurrentHashMap-in-JsonList.patch +++ b/Spigot-Server-Patches/0284-Use-ConcurrentHashMap-in-JsonList.patch @@ -1,4 +1,4 @@ -From 898bb04554739891efabfcbe7ea02aa267c9ad72 Mon Sep 17 00:00:00 2001 +From fab9440f915a6421a712bf28952ac20a7734157c Mon Sep 17 00:00:00 2001 From: egg82 Date: Tue, 7 Aug 2018 01:24:23 -0600 Subject: [PATCH] Use ConcurrentHashMap in JsonList @@ -25,7 +25,7 @@ The point of this is readability, but does have a side-benefit of a small microp Finally, added a couple obfhelpers for the modified code diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java -index 04f98167d..c169d0176 100644 +index 734e7ecf6..8570e38f4 100644 --- a/src/main/java/net/minecraft/server/JsonList.java +++ b/src/main/java/net/minecraft/server/JsonList.java @@ -35,7 +35,8 @@ public class JsonList> { diff --git a/Spigot-Server-Patches/0286-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0285-Use-a-Queue-for-Queueing-Commands.patch similarity index 96% rename from Spigot-Server-Patches/0286-Use-a-Queue-for-Queueing-Commands.patch rename to Spigot-Server-Patches/0285-Use-a-Queue-for-Queueing-Commands.patch index 637f77cc1..acbeb8088 100644 --- a/Spigot-Server-Patches/0286-Use-a-Queue-for-Queueing-Commands.patch +++ b/Spigot-Server-Patches/0285-Use-a-Queue-for-Queueing-Commands.patch @@ -1,4 +1,4 @@ -From 0e16e3ccb3e277055b24f23ecca8699c275896d5 Mon Sep 17 00:00:00 2001 +From 009051337e6ed3b398fa30636a60c85c48067943 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 12 Aug 2018 02:33:39 -0400 Subject: [PATCH] Use a Queue for Queueing Commands diff --git a/Spigot-Server-Patches/0287-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0286-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 95% rename from Spigot-Server-Patches/0287-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to Spigot-Server-Patches/0286-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch index e1ce3d36d..082a0d8a2 100644 --- a/Spigot-Server-Patches/0287-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch +++ b/Spigot-Server-Patches/0286-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch @@ -1,4 +1,4 @@ -From f3b0557217bb8565f2d1f21b6c8163f278dfc238 Mon Sep 17 00:00:00 2001 +From e148a7b56bc3d1103f0fc73a8a71179206ef08ad Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 01:16:34 -0400 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots diff --git a/Spigot-Server-Patches/0288-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0287-Allow-disabling-armour-stand-ticking.patch similarity index 98% rename from Spigot-Server-Patches/0288-Allow-disabling-armour-stand-ticking.patch rename to Spigot-Server-Patches/0287-Allow-disabling-armour-stand-ticking.patch index 392ef6060..2ad436bce 100644 --- a/Spigot-Server-Patches/0288-Allow-disabling-armour-stand-ticking.patch +++ b/Spigot-Server-Patches/0287-Allow-disabling-armour-stand-ticking.patch @@ -1,11 +1,11 @@ -From 674e0e4d8b6537c06fda0d8d883be32443c5a656 Mon Sep 17 00:00:00 2001 +From 4b8bf06f1a563ca1dc940e356e0d7c3430b69aaa Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 15 Aug 2018 01:26:09 -0700 Subject: [PATCH] Allow disabling armour stand ticking diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index f06bb3ae19..a5b4f99901 100644 +index f06bb3ae1..a5b4f9990 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -391,4 +391,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index f06bb3ae19..a5b4f99901 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index b5b7631919..9157dace14 100644 +index b5b763191..9157dace1 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -44,6 +44,11 @@ public class EntityArmorStand extends EntityLiving { @@ -140,7 +140,7 @@ index b5b7631919..9157dace14 100644 public Vector3f r() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 38ca6d6ba5..bcbfffb6e0 100644 +index 38ca6d6ba..bcbfffb6e 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2265,52 +2265,7 @@ public abstract class EntityLiving extends Entity { @@ -256,7 +256,7 @@ index 38ca6d6ba5..bcbfffb6e0 100644 float f2 = MathHelper.g(f - this.aK); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java -index 9f5c3b92e3..07ce93f17c 100644 +index 9f5c3b92e..07ce93f17 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java @@ -297,5 +297,15 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { diff --git a/Spigot-Server-Patches/0289-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0288-Optimize-BlockPosition-helper-methods.patch similarity index 97% rename from Spigot-Server-Patches/0289-Optimize-BlockPosition-helper-methods.patch rename to Spigot-Server-Patches/0288-Optimize-BlockPosition-helper-methods.patch index 1d2f2a590..0e3f93c80 100644 --- a/Spigot-Server-Patches/0289-Optimize-BlockPosition-helper-methods.patch +++ b/Spigot-Server-Patches/0288-Optimize-BlockPosition-helper-methods.patch @@ -1,4 +1,4 @@ -From 05d907ca0562ea18473f54ccae9bb776b1f4a951 Mon Sep 17 00:00:00 2001 +From cc8bbf05ab6429cb758dfa601f879eaa5cd4524f Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Wed, 15 Aug 2018 12:05:12 -0700 Subject: [PATCH] Optimize BlockPosition helper methods @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize BlockPosition helper methods Resolves #1338 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index a5e5a4eba..6ed584f8d 100644 +index 93c3fa78f..07b0cc7b1 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -134,55 +134,72 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali diff --git a/Spigot-Server-Patches/0290-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch similarity index 97% rename from Spigot-Server-Patches/0290-Send-nearby-packets-from-world-player-list-not-serve.patch rename to Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch index adca1abf4..87c4e812b 100644 --- a/Spigot-Server-Patches/0290-Send-nearby-packets-from-world-player-list-not-serve.patch +++ b/Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch @@ -1,11 +1,11 @@ -From ae46a33de0bf185f7e6f2a8887e509e0ea6a30cc Mon Sep 17 00:00:00 2001 +From ba09cb8ea6fab09a58a9b4bc23747b715934a83b Mon Sep 17 00:00:00 2001 From: Mystiflow Date: Fri, 6 Jul 2018 13:21:30 +0100 Subject: [PATCH] Send nearby packets from world player list not server list diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 006f7b8b9..af437120e 100644 +index e940b4b27..0db1e8334 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -922,8 +922,25 @@ public abstract class PlayerList { @@ -46,7 +46,7 @@ index 006f7b8b9..af437120e 100644 double d5 = d1 - entityplayer.locY; double d6 = d2 - entityplayer.locZ; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 364f26b55..9860175ec 100644 +index 168e19b20..d11d01d73 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1179,7 +1179,7 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0291-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0290-Restore-vanlla-default-mob-spawn-range.patch similarity index 92% rename from Spigot-Server-Patches/0291-Restore-vanlla-default-mob-spawn-range.patch rename to Spigot-Server-Patches/0290-Restore-vanlla-default-mob-spawn-range.patch index f9d5abdc3..4f9315a34 100644 --- a/Spigot-Server-Patches/0291-Restore-vanlla-default-mob-spawn-range.patch +++ b/Spigot-Server-Patches/0290-Restore-vanlla-default-mob-spawn-range.patch @@ -1,4 +1,4 @@ -From 4a07c43a0a2b9d10c75fc3dfa8d91ea53182977c Mon Sep 17 00:00:00 2001 +From bfb75849b0f55973e8bdb2dcc3bc10360cfa7ac6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Aug 2018 12:43:16 -0400 Subject: [PATCH] Restore vanlla default mob-spawn-range diff --git a/Spigot-Server-Patches/0292-Optimize-Hoppers.patch b/Spigot-Server-Patches/0291-Optimize-Hoppers.patch similarity index 98% rename from Spigot-Server-Patches/0292-Optimize-Hoppers.patch rename to Spigot-Server-Patches/0291-Optimize-Hoppers.patch index dc39f45c5..19857d698 100644 --- a/Spigot-Server-Patches/0292-Optimize-Hoppers.patch +++ b/Spigot-Server-Patches/0291-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From e69b8fcf2fafef8f35f21569b2d0f4ae67f12c67 Mon Sep 17 00:00:00 2001 +From 5db80511dbe36446e31010a6151a4d1ba74881e1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Apr 2016 22:09:52 -0400 Subject: [PATCH] Optimize Hoppers @@ -11,7 +11,7 @@ Subject: [PATCH] Optimize Hoppers * Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a5b4f99901..2b5402b009 100644 +index a5b4f9990..2b5402b00 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -360,6 +360,15 @@ public class PaperWorldConfig { @@ -31,7 +31,7 @@ index a5b4f99901..2b5402b009 100644 private void disableSprintInterruptionOnAttack() { disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false); diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index ca1bd02995..2d83c9e79c 100644 +index ca1bd0299..2d83c9e79 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -482,8 +482,9 @@ public final class ItemStack { @@ -47,7 +47,7 @@ index ca1bd02995..2d83c9e79c 100644 itemstack.d(this.C()); if (this.tag != null) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3f2a3dd178..e5c148c481 100644 +index 3f2a3dd17..e5c148c48 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1126,6 +1126,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index acce1788db..5188689fbb 100644 +index acce1788d..5188689fb 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -62,6 +62,7 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -79,7 +79,7 @@ index acce1788db..5188689fbb 100644 this.world.b(this.position, this); if (!this.c.isAir()) { diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java -index d2833f8842..72b4b19d7a 100644 +index d2833f884..72b4b19d7 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -189,6 +189,154 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi diff --git a/Spigot-Server-Patches/0293-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0292-Optimize-CraftBlockData-Creation.patch similarity index 97% rename from Spigot-Server-Patches/0293-Optimize-CraftBlockData-Creation.patch rename to Spigot-Server-Patches/0292-Optimize-CraftBlockData-Creation.patch index 3d115cf17..6cb144ea4 100644 --- a/Spigot-Server-Patches/0293-Optimize-CraftBlockData-Creation.patch +++ b/Spigot-Server-Patches/0292-Optimize-CraftBlockData-Creation.patch @@ -1,4 +1,4 @@ -From b41062570d02f4c230d59ec9b4a7eebab57e19b8 Mon Sep 17 00:00:00 2001 +From c0a6c61d510621d9ac41e4e2be1be35f02ae6b1c Mon Sep 17 00:00:00 2001 From: miclebrick Date: Thu, 23 Aug 2018 11:45:32 -0400 Subject: [PATCH] Optimize CraftBlockData Creation diff --git a/Spigot-Server-Patches/0294-Fix-MC-124320.patch b/Spigot-Server-Patches/0293-Fix-MC-124320.patch similarity index 95% rename from Spigot-Server-Patches/0294-Fix-MC-124320.patch rename to Spigot-Server-Patches/0293-Fix-MC-124320.patch index 2f9390eeb..8ceb0504c 100644 --- a/Spigot-Server-Patches/0294-Fix-MC-124320.patch +++ b/Spigot-Server-Patches/0293-Fix-MC-124320.patch @@ -1,11 +1,11 @@ -From f081911f8008b0d305a83122cbeed1868a4eccfd Mon Sep 17 00:00:00 2001 +From 15d570e40fb66d7068ada15a00b9230d8a484c09 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 23 Aug 2018 09:25:30 -0500 Subject: [PATCH] Fix MC-124320 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 03d3090b3f..0bddca623e 100644 +index 03d3090b3..0bddca623 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -167,6 +167,7 @@ public class Block implements IMaterial { @@ -17,7 +17,7 @@ index 03d3090b3f..0bddca623e 100644 IBlockData iblockdata1 = iblockdata; BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition(); diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 6db334cb59..5e850db327 100644 +index 6db334cb5..5e850db32 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -335,8 +335,9 @@ public class EntityEnderman extends EntityMonster { diff --git a/Spigot-Server-Patches/0295-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0294-Slime-Pathfinder-Events.patch similarity index 99% rename from Spigot-Server-Patches/0295-Slime-Pathfinder-Events.patch rename to Spigot-Server-Patches/0294-Slime-Pathfinder-Events.patch index 44d4f77ca..b60dab4d0 100644 --- a/Spigot-Server-Patches/0295-Slime-Pathfinder-Events.patch +++ b/Spigot-Server-Patches/0294-Slime-Pathfinder-Events.patch @@ -1,4 +1,4 @@ -From d8e8c0739a9ccbfe94ad583c56067f59493d9055 Mon Sep 17 00:00:00 2001 +From 6b1aeaa32956a74aca60a99dd331de59130561cc Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 08:18:42 -0500 Subject: [PATCH] Slime Pathfinder Events diff --git a/Spigot-Server-Patches/0296-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0295-Configurable-speed-for-water-flowing-over-lava.patch similarity index 98% rename from Spigot-Server-Patches/0296-Configurable-speed-for-water-flowing-over-lava.patch rename to Spigot-Server-Patches/0295-Configurable-speed-for-water-flowing-over-lava.patch index 06edd3ad7..c72e02ca6 100644 --- a/Spigot-Server-Patches/0296-Configurable-speed-for-water-flowing-over-lava.patch +++ b/Spigot-Server-Patches/0295-Configurable-speed-for-water-flowing-over-lava.patch @@ -1,4 +1,4 @@ -From ee09a7f9177ec8f49cec7b223be7dee1e1224179 Mon Sep 17 00:00:00 2001 +From abfb652364a9c4facf9df8e982e634c8d27bbc25 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 8 Aug 2018 16:33:21 -0600 Subject: [PATCH] Configurable speed for water flowing over lava diff --git a/Spigot-Server-Patches/0297-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0296-Optimize-RegistryMaterials.patch similarity index 96% rename from Spigot-Server-Patches/0297-Optimize-RegistryMaterials.patch rename to Spigot-Server-Patches/0296-Optimize-RegistryMaterials.patch index 234324ee0..d5da6d4dd 100644 --- a/Spigot-Server-Patches/0297-Optimize-RegistryMaterials.patch +++ b/Spigot-Server-Patches/0296-Optimize-RegistryMaterials.patch @@ -1,4 +1,4 @@ -From 84528f3c4f2ba7346c3a5066dea2c584a92bd51c Mon Sep 17 00:00:00 2001 +From 32bfb272a008220c31db88ee42df185263cdbd10 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 26 Aug 2018 20:49:50 -0400 Subject: [PATCH] Optimize RegistryMaterials diff --git a/Spigot-Server-Patches/0298-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0297-Add-PhantomPreSpawnEvent.patch similarity index 98% rename from Spigot-Server-Patches/0298-Add-PhantomPreSpawnEvent.patch rename to Spigot-Server-Patches/0297-Add-PhantomPreSpawnEvent.patch index 45c446877..df4d530a7 100644 --- a/Spigot-Server-Patches/0298-Add-PhantomPreSpawnEvent.patch +++ b/Spigot-Server-Patches/0297-Add-PhantomPreSpawnEvent.patch @@ -1,4 +1,4 @@ -From 7f3a15f4c5ca98d157c99ed50dcadd31ee55f8ca Mon Sep 17 00:00:00 2001 +From 9a8d8a8a98df2922bfcc24f9b967c36f7625881a Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 25 Aug 2018 19:56:51 -0500 Subject: [PATCH] Add PhantomPreSpawnEvent diff --git a/Spigot-Server-Patches/0299-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0298-Add-More-Creeper-API.patch similarity index 97% rename from Spigot-Server-Patches/0299-Add-More-Creeper-API.patch rename to Spigot-Server-Patches/0298-Add-More-Creeper-API.patch index bddfc25fa..b4379ab92 100644 --- a/Spigot-Server-Patches/0299-Add-More-Creeper-API.patch +++ b/Spigot-Server-Patches/0298-Add-More-Creeper-API.patch @@ -1,4 +1,4 @@ -From a64875c5420b62df4ca8f1362501bb5e7a93b2b9 Mon Sep 17 00:00:00 2001 +From 8019f8f65473194da8cafb6252780a2e47ab043a Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 11:50:26 -0500 Subject: [PATCH] Add More Creeper API diff --git a/Spigot-Server-Patches/0300-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0299-Inventory-removeItemAnySlot.patch similarity index 97% rename from Spigot-Server-Patches/0300-Inventory-removeItemAnySlot.patch rename to Spigot-Server-Patches/0299-Inventory-removeItemAnySlot.patch index e20be256b..48be1e174 100644 --- a/Spigot-Server-Patches/0300-Inventory-removeItemAnySlot.patch +++ b/Spigot-Server-Patches/0299-Inventory-removeItemAnySlot.patch @@ -1,4 +1,4 @@ -From 06b562c471e8a68cd53db34d91f007e7dbe0a3d0 Mon Sep 17 00:00:00 2001 +From fe90e35388bd795eec603c54e5b9f03504ab4d65 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 28 Aug 2018 23:04:15 -0400 Subject: [PATCH] Inventory#removeItemAnySlot diff --git a/Spigot-Server-Patches/0301-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0300-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch similarity index 94% rename from Spigot-Server-Patches/0301-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch rename to Spigot-Server-Patches/0300-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch index 88a2711d0..d0b96cfe5 100644 --- a/Spigot-Server-Patches/0301-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch +++ b/Spigot-Server-Patches/0300-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch @@ -1,4 +1,4 @@ -From aac7776d42f44bf1548dfc206d1e0c51d88abfe1 Mon Sep 17 00:00:00 2001 +From 02120a333974283be68c84856bc84a770cf3d11e Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 2 Sep 2018 19:34:33 -0700 Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted diff --git a/Spigot-Server-Patches/0302-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0301-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 96% rename from Spigot-Server-Patches/0302-Add-ray-tracing-methods-to-LivingEntity.patch rename to Spigot-Server-Patches/0301-Add-ray-tracing-methods-to-LivingEntity.patch index a70361ae5..b9d207fdd 100644 --- a/Spigot-Server-Patches/0302-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-Server-Patches/0301-Add-ray-tracing-methods-to-LivingEntity.patch @@ -1,11 +1,11 @@ -From 346c270bd25de866799bc1f8e856ef5542322ee7 Mon Sep 17 00:00:00 2001 +From 9481e0e03256d681a474de867b071241d538e0da Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 3 Sep 2018 18:20:03 -0500 Subject: [PATCH] Add ray tracing methods to LivingEntity diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index bcbfffb6e0..75285a7b81 100644 +index bcbfffb6e..75285a7b8 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -3176,6 +3176,23 @@ public abstract class EntityLiving extends Entity { @@ -33,7 +33,7 @@ index bcbfffb6e0..75285a7b81 100644 public int getShieldBlockingDelay() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 8dea7d36b6..d5c4115a85 100644 +index 8dea7d36b..d5c4115a8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -182,6 +182,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0303-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0302-Expose-attack-cooldown-methods-for-Player.patch similarity index 95% rename from Spigot-Server-Patches/0303-Expose-attack-cooldown-methods-for-Player.patch rename to Spigot-Server-Patches/0302-Expose-attack-cooldown-methods-for-Player.patch index 281b6308d..5e9419891 100644 --- a/Spigot-Server-Patches/0303-Expose-attack-cooldown-methods-for-Player.patch +++ b/Spigot-Server-Patches/0302-Expose-attack-cooldown-methods-for-Player.patch @@ -1,11 +1,11 @@ -From edf5208ca4bb1be36b24db9a856c07d1f6472c7b Mon Sep 17 00:00:00 2001 +From 476c879a9677f166df6e8ee4e2988ce21e2e0482 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 4 Sep 2018 15:02:00 -0500 Subject: [PATCH] Expose attack cooldown methods for Player diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index d1a7a873b..2f614dfb6 100644 +index a00b9b209..7d8885ce8 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -2003,14 +2003,17 @@ public abstract class EntityHuman extends EntityLiving { diff --git a/Spigot-Server-Patches/0304-Improve-death-events.patch b/Spigot-Server-Patches/0303-Improve-death-events.patch similarity index 98% rename from Spigot-Server-Patches/0304-Improve-death-events.patch rename to Spigot-Server-Patches/0303-Improve-death-events.patch index d2e84f882..2c3997550 100644 --- a/Spigot-Server-Patches/0304-Improve-death-events.patch +++ b/Spigot-Server-Patches/0303-Improve-death-events.patch @@ -1,4 +1,4 @@ -From e1a07bd3cae5cbdc032e884251d2282f31173c4b Mon Sep 17 00:00:00 2001 +From 969ea3882a7eda13cf410f1a5aeafd39a41b6920 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 21 Aug 2018 01:39:35 +0100 Subject: [PATCH] Improve death events @@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using internal code. diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java -index 84c3ea9d00..f563a7b630 100644 +index 84c3ea9d0..f563a7b63 100644 --- a/src/main/java/net/minecraft/server/CombatTracker.java +++ b/src/main/java/net/minecraft/server/CombatTracker.java @@ -175,6 +175,7 @@ public class CombatTracker { @@ -27,7 +27,7 @@ index 84c3ea9d00..f563a7b630 100644 int i = this.f ? 300 : 100; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 4af1482e29..a8a3f48385 100644 +index 4af1482e2..a8a3f4838 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1467,6 +1467,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -47,7 +47,7 @@ index 4af1482e29..a8a3f48385 100644 protected void i(double d0, double d1, double d2) { diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 9157dace14..235ca47e16 100644 +index 9157dace1..235ca47e1 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -676,7 +676,8 @@ public class EntityArmorStand extends EntityLiving { @@ -61,7 +61,7 @@ index 9157dace14..235ca47e16 100644 } diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java -index 85b32a8ac9..14046c98db 100644 +index 85b32a8ac..14046c98d 100644 --- a/src/main/java/net/minecraft/server/EntityFox.java +++ b/src/main/java/net/minecraft/server/EntityFox.java @@ -597,15 +597,25 @@ public class EntityFox extends EntityAnimal { @@ -94,7 +94,7 @@ index 85b32a8ac9..14046c98db 100644 public static boolean a(EntityFox entityfox, EntityLiving entityliving) { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 75285a7b81..dd6e80c6fd 100644 +index 75285a7b8..dd6e80c6f 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -85,7 +85,7 @@ public abstract class EntityLiving extends Entity { @@ -249,7 +249,7 @@ index 75285a7b81..dd6e80c6fd 100644 return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 30b684b043..343680e3ba 100644 +index 30b684b04..343680e3b 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -75,6 +75,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -300,7 +300,7 @@ index 30b684b043..343680e3ba 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java -index 73cb64e09d..9f317ff2e8 100644 +index 73cb64e09..9f317ff2e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java @@ -806,6 +806,22 @@ public enum CraftSound { @@ -327,7 +327,7 @@ index 73cb64e09d..9f317ff2e8 100644 this.minecraftKey = minecraftKey; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 0386452a8d..deacc21873 100644 +index 0386452a8..deacc2187 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1712,7 +1712,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -348,7 +348,7 @@ index 0386452a8d..deacc21873 100644 public void injectScaledMaxHealth(Collection collection, boolean force) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index eec3effef7..0d66765591 100644 +index eec3effef..0d6676559 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -736,9 +736,16 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0305-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0304-Allow-chests-to-be-placed-with-NBT-data.patch similarity index 96% rename from Spigot-Server-Patches/0305-Allow-chests-to-be-placed-with-NBT-data.patch rename to Spigot-Server-Patches/0304-Allow-chests-to-be-placed-with-NBT-data.patch index 2524ff0d4..180d4f61c 100644 --- a/Spigot-Server-Patches/0305-Allow-chests-to-be-placed-with-NBT-data.patch +++ b/Spigot-Server-Patches/0304-Allow-chests-to-be-placed-with-NBT-data.patch @@ -1,4 +1,4 @@ -From 93f8bc143c52867231425ae8a296a420305d5c4c Mon Sep 17 00:00:00 2001 +From 9772ae9495bfe35580ea06f7f72c1a782f1d0d51 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 8 Sep 2018 18:43:31 -0500 Subject: [PATCH] Allow chests to be placed with NBT data diff --git a/Spigot-Server-Patches/0306-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0305-Mob-Pathfinding-API.patch similarity index 99% rename from Spigot-Server-Patches/0306-Mob-Pathfinding-API.patch rename to Spigot-Server-Patches/0305-Mob-Pathfinding-API.patch index fbdbfba5b..d2ea7df47 100644 --- a/Spigot-Server-Patches/0306-Mob-Pathfinding-API.patch +++ b/Spigot-Server-Patches/0305-Mob-Pathfinding-API.patch @@ -1,4 +1,4 @@ -From d01297e9be72fe5a7826eba646e12579e112ebb1 Mon Sep 17 00:00:00 2001 +From 1587b51bec1ce7a96523277231195fdfecd111b2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 13:30:00 -0400 Subject: [PATCH] Mob Pathfinding API diff --git a/Spigot-Server-Patches/0307-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0306-Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 98% rename from Spigot-Server-Patches/0307-Prevent-chunk-loading-from-Fluid-Flowing.patch rename to Spigot-Server-Patches/0306-Prevent-chunk-loading-from-Fluid-Flowing.patch index 7e1ab61a1..4651b1aa0 100644 --- a/Spigot-Server-Patches/0307-Prevent-chunk-loading-from-Fluid-Flowing.patch +++ b/Spigot-Server-Patches/0306-Prevent-chunk-loading-from-Fluid-Flowing.patch @@ -1,4 +1,4 @@ -From 11644ed0883c8d95df9351037c9808358b246d17 Mon Sep 17 00:00:00 2001 +From 302dc659498a5c22ff5ec29c4d7fc463bca2ea0d Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 10 Sep 2018 23:36:16 -0400 Subject: [PATCH] Prevent chunk loading from Fluid Flowing diff --git a/Spigot-Server-Patches/0308-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch similarity index 99% rename from Spigot-Server-Patches/0308-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch rename to Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch index 3641f727b..23f9fbfa4 100644 --- a/Spigot-Server-Patches/0308-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch +++ b/Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch @@ -1,11 +1,11 @@ -From 845d0f511164ef67e365f79a2cf62af979e1cd33 Mon Sep 17 00:00:00 2001 +From f696adb8ba9ed229973586dbc852ddbf7143e4a2 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 12 Sep 2018 18:53:55 +0300 Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values diff --git a/src/main/java/net/minecraft/server/ArgumentBlock.java b/src/main/java/net/minecraft/server/ArgumentBlock.java -index 3a215dea4..ea93452e6 100644 +index 2574c36d3..1c9edeb31 100644 --- a/src/main/java/net/minecraft/server/ArgumentBlock.java +++ b/src/main/java/net/minecraft/server/ArgumentBlock.java @@ -43,7 +43,7 @@ public class ArgumentBlock { diff --git a/Spigot-Server-Patches/0309-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0308-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch similarity index 96% rename from Spigot-Server-Patches/0309-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch rename to Spigot-Server-Patches/0308-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch index 63bb67c15..446124ded 100644 --- a/Spigot-Server-Patches/0309-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch +++ b/Spigot-Server-Patches/0308-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch @@ -1,11 +1,11 @@ -From 23e5c5c52e717b8471c06e9dac8784dc8e27d313 Mon Sep 17 00:00:00 2001 +From afd115967cece46e05e18a441f4b02d292255a15 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 10 Sep 2018 23:56:36 -0400 Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java -index 706be9a736..b1457526ec 100644 +index 706be9a73..b1457526e 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java @@ -12,11 +12,13 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget { @@ -53,7 +53,7 @@ index 706be9a736..b1457526ec 100644 return block == this.g && iworldreader.getType(blockposition.up()).isAir() && iworldreader.getType(blockposition.up(2)).isAir(); } diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java -index b286934aa8..c7e25e2be8 100644 +index b286934aa..c7e25e2be 100644 --- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java +++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java @@ -93,6 +93,7 @@ public class RandomPositionGenerator { diff --git a/Spigot-Server-Patches/0310-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0309-Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 95% rename from Spigot-Server-Patches/0310-Prevent-mob-spawning-from-loading-generating-chunks.patch rename to Spigot-Server-Patches/0309-Prevent-mob-spawning-from-loading-generating-chunks.patch index 1b61be22b..049a47c6d 100644 --- a/Spigot-Server-Patches/0310-Prevent-mob-spawning-from-loading-generating-chunks.patch +++ b/Spigot-Server-Patches/0309-Prevent-mob-spawning-from-loading-generating-chunks.patch @@ -1,4 +1,4 @@ -From a84f6f7e85fd4ac90b5869c6d71bc7d65342ae89 Mon Sep 17 00:00:00 2001 +From a8cf4013da68d6afc7433f20db3fe7fa20f95d45 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 12 Sep 2018 21:12:57 -0400 Subject: [PATCH] Prevent mob spawning from loading/generating chunks @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks also prevents if out of world border bounds diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 14e2f3ca7..5824cbba6 100644 +index 5da0f2211..94d7bca09 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -25,9 +25,9 @@ public final class SpawnerCreature { diff --git a/Spigot-Server-Patches/0311-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0310-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 97% rename from Spigot-Server-Patches/0311-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to Spigot-Server-Patches/0310-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch index a1bcabb6d..19e277ae6 100644 --- a/Spigot-Server-Patches/0311-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch +++ b/Spigot-Server-Patches/0310-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch @@ -1,4 +1,4 @@ -From aa598d5390c662cdb4aaa311a5c4d7ab92e1f2a2 Mon Sep 17 00:00:00 2001 +From a17c631dfa3d2094949430d8fe51bc72d1273c48 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 12 Sep 2018 21:47:01 -0400 Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning diff --git a/Spigot-Server-Patches/0312-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0311-Implement-furnace-cook-speed-multiplier-API.patch similarity index 97% rename from Spigot-Server-Patches/0312-Implement-furnace-cook-speed-multiplier-API.patch rename to Spigot-Server-Patches/0311-Implement-furnace-cook-speed-multiplier-API.patch index 72a7f5d93..1f3f12625 100644 --- a/Spigot-Server-Patches/0312-Implement-furnace-cook-speed-multiplier-API.patch +++ b/Spigot-Server-Patches/0311-Implement-furnace-cook-speed-multiplier-API.patch @@ -1,4 +1,4 @@ -From 37db6150821f83e9fa58b97186ee816fa587f87e Mon Sep 17 00:00:00 2001 +From 51befe7b8aa9a8f663b23ab86883303efa797235 Mon Sep 17 00:00:00 2001 From: Tassu Date: Thu, 13 Sep 2018 08:45:21 +0300 Subject: [PATCH] Implement furnace cook speed multiplier API @@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API Signed-off-by: Tassu diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java -index be16fe9a9..b9f3a952e 100644 +index 0f6cd246a..c983d260a 100644 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java @@ -8,6 +8,7 @@ import java.util.Map; diff --git a/Spigot-Server-Patches/0313-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0312-Support-Overriding-World-Seeds.patch similarity index 98% rename from Spigot-Server-Patches/0313-Support-Overriding-World-Seeds.patch rename to Spigot-Server-Patches/0312-Support-Overriding-World-Seeds.patch index 2d078f8bf..2996ac696 100644 --- a/Spigot-Server-Patches/0313-Support-Overriding-World-Seeds.patch +++ b/Spigot-Server-Patches/0312-Support-Overriding-World-Seeds.patch @@ -1,4 +1,4 @@ -From 260f1e88e76a4d59213381b18cb34739ffba07df Mon Sep 17 00:00:00 2001 +From e04c7c105982729b3b5fff8537083a3053e86136 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 Sep 2018 23:05:31 -0400 Subject: [PATCH] Support Overriding World Seeds @@ -72,7 +72,7 @@ index e5c148c48..74cdf4945 100644 if (j == 0) { diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java -index 9ecd412ae..eb1464983 100644 +index ace2643be..d4b0cca23 100644 --- a/src/main/java/net/minecraft/server/WorldData.java +++ b/src/main/java/net/minecraft/server/WorldData.java @@ -116,7 +116,7 @@ public class WorldData { diff --git a/Spigot-Server-Patches/0314-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0313-Optimize-Server-World-Map.patch similarity index 99% rename from Spigot-Server-Patches/0314-Optimize-Server-World-Map.patch rename to Spigot-Server-Patches/0313-Optimize-Server-World-Map.patch index 5b5154e5e..b0779338b 100644 --- a/Spigot-Server-Patches/0314-Optimize-Server-World-Map.patch +++ b/Spigot-Server-Patches/0313-Optimize-Server-World-Map.patch @@ -1,4 +1,4 @@ -From 477a54637fe3c5b15011d7ee4ce0c3b75204ffe8 Mon Sep 17 00:00:00 2001 +From ed19d42fb01b163665f9c37ba92a6892004c00ab Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 Sep 2018 23:37:31 -0400 Subject: [PATCH] Optimize Server World Map diff --git a/Spigot-Server-Patches/0315-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0314-PreSpawnerSpawnEvent.patch similarity index 96% rename from Spigot-Server-Patches/0315-PreSpawnerSpawnEvent.patch rename to Spigot-Server-Patches/0314-PreSpawnerSpawnEvent.patch index 9c8570ab1..1458e8ba8 100644 --- a/Spigot-Server-Patches/0315-PreSpawnerSpawnEvent.patch +++ b/Spigot-Server-Patches/0314-PreSpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 63ba073d09459ccd57076cbfd0883d504ad21cd3 Mon Sep 17 00:00:00 2001 +From 2347d3c387c5bddedf2cdb34abaa8f0a348f47d4 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 18 Sep 2018 23:53:23 +0100 Subject: [PATCH] PreSpawnerSpawnEvent diff --git a/Spigot-Server-Patches/0316-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0315-Catch-JsonParseException-in-Entity-and-TE-names.patch similarity index 97% rename from Spigot-Server-Patches/0316-Catch-JsonParseException-in-Entity-and-TE-names.patch rename to Spigot-Server-Patches/0315-Catch-JsonParseException-in-Entity-and-TE-names.patch index 513359b9d..9039571ca 100644 --- a/Spigot-Server-Patches/0316-Catch-JsonParseException-in-Entity-and-TE-names.patch +++ b/Spigot-Server-Patches/0315-Catch-JsonParseException-in-Entity-and-TE-names.patch @@ -1,4 +1,4 @@ -From fd55b0f55604e74068b6bc19e6fedf2f7141b2c7 Mon Sep 17 00:00:00 2001 +From a8903af3349e74919c220b0049b8eb55d8c9fb8e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 22 Sep 2018 15:56:59 -0400 Subject: [PATCH] Catch JsonParseException in Entity and TE names @@ -26,7 +26,7 @@ index 4b7aefb7a..9e568d5d1 100644 if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index efda90f6e..b63a8ad98 100644 +index a8a3f4838..bcfc5318f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1651,7 +1651,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -76,7 +76,7 @@ index 1f26d8a02..12264c4d0 100644 if (this.hasWorld()) { diff --git a/src/main/java/net/minecraft/server/TileEntityContainer.java b/src/main/java/net/minecraft/server/TileEntityContainer.java -index 3590b4e31..ea7d5a430 100644 +index 473ec2cbd..ab6b86e4e 100644 --- a/src/main/java/net/minecraft/server/TileEntityContainer.java +++ b/src/main/java/net/minecraft/server/TileEntityContainer.java @@ -17,7 +17,7 @@ public abstract class TileEntityContainer extends TileEntity implements IInvento diff --git a/Spigot-Server-Patches/0317-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0316-Avoid-dimension-id-collisions.patch similarity index 94% rename from Spigot-Server-Patches/0317-Avoid-dimension-id-collisions.patch rename to Spigot-Server-Patches/0316-Avoid-dimension-id-collisions.patch index 0c5f6bd00..8fb70fab4 100644 --- a/Spigot-Server-Patches/0317-Avoid-dimension-id-collisions.patch +++ b/Spigot-Server-Patches/0316-Avoid-dimension-id-collisions.patch @@ -1,4 +1,4 @@ -From 598cd2370f3c79ea2a7e1145c1e71a52157bea96 Mon Sep 17 00:00:00 2001 +From 1bb4983dcc90a8ec34eb3ecb6d6f358621928293 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 25 Sep 2018 06:53:43 +0200 Subject: [PATCH] Avoid dimension id collisions diff --git a/Spigot-Server-Patches/0318-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0317-Honor-EntityAgeable.ageLock.patch similarity index 91% rename from Spigot-Server-Patches/0318-Honor-EntityAgeable.ageLock.patch rename to Spigot-Server-Patches/0317-Honor-EntityAgeable.ageLock.patch index e36aec180..f5da2f3d4 100644 --- a/Spigot-Server-Patches/0318-Honor-EntityAgeable.ageLock.patch +++ b/Spigot-Server-Patches/0317-Honor-EntityAgeable.ageLock.patch @@ -1,4 +1,4 @@ -From 1df9c8bc97b11ccc9306eb858b37b7186a68ccd2 Mon Sep 17 00:00:00 2001 +From c54bdd2a400eeaf7033a64afdf7ce91ac0031705 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 23 Sep 2018 20:59:53 -0500 Subject: [PATCH] Honor EntityAgeable.ageLock diff --git a/Spigot-Server-Patches/0319-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0318-Configurable-connection-throttle-kick-message.patch similarity index 94% rename from Spigot-Server-Patches/0319-Configurable-connection-throttle-kick-message.patch rename to Spigot-Server-Patches/0318-Configurable-connection-throttle-kick-message.patch index ad92cf41f..e91d16c31 100644 --- a/Spigot-Server-Patches/0319-Configurable-connection-throttle-kick-message.patch +++ b/Spigot-Server-Patches/0318-Configurable-connection-throttle-kick-message.patch @@ -1,11 +1,11 @@ -From 546a69c886e34f2e28b7332b8ab25e7a5bbe92a4 Mon Sep 17 00:00:00 2001 +From fd4a9d23a2336f7f47eda81a25c0ad427b709208 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/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index ffb18902ff..2d3861c184 100644 +index ffb18902f..2d3861c18 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -275,6 +275,11 @@ public class PaperConfig { @@ -21,7 +21,7 @@ index ffb18902ff..2d3861c184 100644 private static void savePlayerData() { savePlayerData = getBoolean("settings.save-player-data", savePlayerData); diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 07d85e5353..4b76c2d14f 100644 +index 07d85e535..4b76c2d14 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -38,7 +38,7 @@ public class HandshakeListener implements PacketHandshakingInListener { diff --git a/Spigot-Server-Patches/0320-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0319-Hook-into-CB-plugin-rewrites.patch similarity index 99% rename from Spigot-Server-Patches/0320-Hook-into-CB-plugin-rewrites.patch rename to Spigot-Server-Patches/0319-Hook-into-CB-plugin-rewrites.patch index 4cbc918b0..603d9d9ff 100644 --- a/Spigot-Server-Patches/0320-Hook-into-CB-plugin-rewrites.patch +++ b/Spigot-Server-Patches/0319-Hook-into-CB-plugin-rewrites.patch @@ -1,4 +1,4 @@ -From 71bea266bdba742adeac29964e9738d67cbba8b8 Mon Sep 17 00:00:00 2001 +From 4394d1444555825bd83735c3e7da973347f6cc81 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/0321-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0320-Allow-setting-the-vex-s-summoner.patch similarity index 93% rename from Spigot-Server-Patches/0321-Allow-setting-the-vex-s-summoner.patch rename to Spigot-Server-Patches/0320-Allow-setting-the-vex-s-summoner.patch index bcb722754..1b40e3436 100644 --- a/Spigot-Server-Patches/0321-Allow-setting-the-vex-s-summoner.patch +++ b/Spigot-Server-Patches/0320-Allow-setting-the-vex-s-summoner.patch @@ -1,11 +1,11 @@ -From e40b050f7de5fdf2cf4eeef058651ad9929b9992 Mon Sep 17 00:00:00 2001 +From 68ce300145fc5bf4befd75f734db692b0beac2aa 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/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java -index 83e022c91..c56933068 100644 +index d7bea8389..bcda21ba7 100644 --- a/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java @@ -133,6 +133,7 @@ public class EntityVex extends EntityMonster { diff --git a/Spigot-Server-Patches/0322-Add-sun-related-API.patch b/Spigot-Server-Patches/0321-Add-sun-related-API.patch similarity index 94% rename from Spigot-Server-Patches/0322-Add-sun-related-API.patch rename to Spigot-Server-Patches/0321-Add-sun-related-API.patch index 8148742dd..ba2ff3b96 100644 --- a/Spigot-Server-Patches/0322-Add-sun-related-API.patch +++ b/Spigot-Server-Patches/0321-Add-sun-related-API.patch @@ -1,11 +1,11 @@ -From a531f99a0c6b8b2236658d2b56d3ad8775b73819 Mon Sep 17 00:00:00 2001 +From 1289a5cb120dc44faac5278e9f2b44a74b5827b7 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 00:54:21 -0500 Subject: [PATCH] Add sun related API diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 11652628b..90923c753 100644 +index c2771c5d9..c81e53090 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1326,6 +1326,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -17,7 +17,7 @@ index 11652628b..90923c753 100644 if (this.world.J() && !this.world.isClientSide) { float f = this.aE(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1f2e2cd87..163d7f37c 100644 +index dbb4eb0a8..d13e4cf73 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -667,6 +667,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0323-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0322-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 93% rename from Spigot-Server-Patches/0323-Check-Drowned-for-Villager-Aggression-Config.patch rename to Spigot-Server-Patches/0322-Check-Drowned-for-Villager-Aggression-Config.patch index 8e0437df4..878aab588 100644 --- a/Spigot-Server-Patches/0323-Check-Drowned-for-Villager-Aggression-Config.patch +++ b/Spigot-Server-Patches/0322-Check-Drowned-for-Villager-Aggression-Config.patch @@ -1,11 +1,11 @@ -From b46e7409a7f9b1d8104cdddf882ed638af593647 Mon Sep 17 00:00:00 2001 +From c7e72a3128b0943ff4c8bdd0bc1da9c94f5a45e7 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/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java -index 0deb51427e..7f34cdbc34 100644 +index 0deb51427..7f34cdbc3 100644 --- a/src/main/java/net/minecraft/server/EntityDrowned.java +++ b/src/main/java/net/minecraft/server/EntityDrowned.java @@ -29,7 +29,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity { diff --git a/Spigot-Server-Patches/0324-Here-s-Johnny.patch b/Spigot-Server-Patches/0323-Here-s-Johnny.patch similarity index 94% rename from Spigot-Server-Patches/0324-Here-s-Johnny.patch rename to Spigot-Server-Patches/0323-Here-s-Johnny.patch index b7bd9c6ec..cb186fca0 100644 --- a/Spigot-Server-Patches/0324-Here-s-Johnny.patch +++ b/Spigot-Server-Patches/0323-Here-s-Johnny.patch @@ -1,11 +1,11 @@ -From 67311c301581a2b14d9aa52fe8fa4445be839709 Mon Sep 17 00:00:00 2001 +From 5f88da5b478b5a6ae133d917a144eb7926672ba3 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/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java -index dbd189afe..9d3c37dce 100644 +index 54c1b7c87..130a2e4ff 100644 --- a/src/main/java/net/minecraft/server/EntityVindicator.java +++ b/src/main/java/net/minecraft/server/EntityVindicator.java @@ -11,7 +11,7 @@ public class EntityVindicator extends EntityIllagerAbstract { diff --git a/Spigot-Server-Patches/0325-Turtle-API.patch b/Spigot-Server-Patches/0324-Turtle-API.patch similarity index 98% rename from Spigot-Server-Patches/0325-Turtle-API.patch rename to Spigot-Server-Patches/0324-Turtle-API.patch index fd5323385..7f2b33d51 100644 --- a/Spigot-Server-Patches/0325-Turtle-API.patch +++ b/Spigot-Server-Patches/0324-Turtle-API.patch @@ -1,11 +1,11 @@ -From 5bb24023575ad2d99db5d967a7d5f05069c2cb60 Mon Sep 17 00:00:00 2001 +From c4109fc8bcaf80d55d8cfc864876486343e91065 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/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java -index 1b4933c07..b7929c5c4 100644 +index 89792eec4..e4eecf568 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -27,51 +27,63 @@ public class EntityTurtle extends EntityAnimal { diff --git a/Spigot-Server-Patches/0326-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch similarity index 97% rename from Spigot-Server-Patches/0326-Limit-lightning-strike-effect-distance.patch rename to Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch index 3839ad0a0..c14862ab3 100644 --- a/Spigot-Server-Patches/0326-Limit-lightning-strike-effect-distance.patch +++ b/Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch @@ -1,4 +1,4 @@ -From d7357332195bb4df6bacf96931c384251fa361f9 Mon Sep 17 00:00:00 2001 +From 14e40ff94b5e6404b743ab0977730c7bed4f0d30 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 @@ -69,7 +69,7 @@ index adf68d165..fbcda86b3 100644 --this.lifeTicks; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 9860175ec..9c4ef2e00 100644 +index d11d01d73..3c986857b 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1179,7 +1179,7 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0327-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0326-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 96% rename from Spigot-Server-Patches/0327-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to Spigot-Server-Patches/0326-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch index f60a21570..5b85d923d 100644 --- a/Spigot-Server-Patches/0327-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch +++ b/Spigot-Server-Patches/0326-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch @@ -1,4 +1,4 @@ -From 9a3add5fb92ddc2ecc088790c29a15ada35f49e2 Mon Sep 17 00:00:00 2001 +From f987bc00c8eceaa1aa7c20a28e731c9366a74521 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/0328-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch similarity index 97% rename from Spigot-Server-Patches/0328-Call-player-spectator-target-events.patch rename to Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch index 770968791..e60357e23 100644 --- a/Spigot-Server-Patches/0328-Call-player-spectator-target-events.patch +++ b/Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch @@ -1,11 +1,11 @@ -From d65a9afe62205e6f3a61a443a5220039640c27c7 Mon Sep 17 00:00:00 2001 +From 0879e89d98fed7cc3db36eb1635b98439082a06f 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/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 251166c4f..bf1a38eb9 100644 +index 343680e3b..0e35f6dc2 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0329-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0328-Add-Velocity-IP-Forwarding-Support.patch similarity index 99% rename from Spigot-Server-Patches/0329-Add-Velocity-IP-Forwarding-Support.patch rename to Spigot-Server-Patches/0328-Add-Velocity-IP-Forwarding-Support.patch index abe0fc074..9a974636f 100644 --- a/Spigot-Server-Patches/0329-Add-Velocity-IP-Forwarding-Support.patch +++ b/Spigot-Server-Patches/0328-Add-Velocity-IP-Forwarding-Support.patch @@ -1,4 +1,4 @@ -From 6511b39d67f36e19eb4c9ada89e8930652b35761 Mon Sep 17 00:00:00 2001 +From 11e86765bb25800e0b6c6a030e4f9f5d14000f2f 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 @@ -203,7 +203,7 @@ index d4d752ddb..5d46a975e 100644 } diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 6c5544807..38386d588 100644 +index efd02bd67..c073b04aa 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -46,7 +46,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { diff --git a/Spigot-Server-Patches/0330-Add-more-Witch-API.patch b/Spigot-Server-Patches/0329-Add-more-Witch-API.patch similarity index 98% rename from Spigot-Server-Patches/0330-Add-more-Witch-API.patch rename to Spigot-Server-Patches/0329-Add-more-Witch-API.patch index 7530c37fe..fa42e2096 100644 --- a/Spigot-Server-Patches/0330-Add-more-Witch-API.patch +++ b/Spigot-Server-Patches/0329-Add-more-Witch-API.patch @@ -1,11 +1,11 @@ -From 393284c65e13b67068ff9340f6f7ff9f25333f5c Mon Sep 17 00:00:00 2001 +From f5f6105f7f6e969a7a5a952a52cd97d4605f048c 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/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index ae9efb72c..3cbb34a0c 100644 +index 8b95ec3a8..f30ce9568 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -1,5 +1,11 @@ diff --git a/Spigot-Server-Patches/0331-Fix-MC-93764.patch b/Spigot-Server-Patches/0330-Fix-MC-93764.patch similarity index 91% rename from Spigot-Server-Patches/0331-Fix-MC-93764.patch rename to Spigot-Server-Patches/0330-Fix-MC-93764.patch index 3939e3803..45cf5c821 100644 --- a/Spigot-Server-Patches/0331-Fix-MC-93764.patch +++ b/Spigot-Server-Patches/0330-Fix-MC-93764.patch @@ -1,4 +1,4 @@ -From f589d2e0a6939cef88911747f5207b1b8f238d87 Mon Sep 17 00:00:00 2001 +From cc33b0f83b440a208acb6d1ca4345fbe756dc397 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/0332-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0331-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 97% rename from Spigot-Server-Patches/0332-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to Spigot-Server-Patches/0331-Add-option-to-prevent-players-from-moving-into-unloa.patch index e60b20eaf..fe93e874e 100644 --- a/Spigot-Server-Patches/0332-Add-option-to-prevent-players-from-moving-into-unloa.patch +++ b/Spigot-Server-Patches/0331-Add-option-to-prevent-players-from-moving-into-unloa.patch @@ -1,4 +1,4 @@ -From 9433377ed63c501082a19eeb78b3270eeb8a80c3 Mon Sep 17 00:00:00 2001 +From 7650a917ee76c8944347ae6c41b7a1d541f0dc3d 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 @@ -20,7 +20,7 @@ index fb44fccc9..ad793ffa3 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 07e9abda9..4ba13da1a 100644 +index f30fec7eb..ff45290b8 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -347,6 +347,13 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0333-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0332-Reset-players-airTicks-on-respawn.patch similarity index 89% rename from Spigot-Server-Patches/0333-Reset-players-airTicks-on-respawn.patch rename to Spigot-Server-Patches/0332-Reset-players-airTicks-on-respawn.patch index 38b80500f..c615fe144 100644 --- a/Spigot-Server-Patches/0333-Reset-players-airTicks-on-respawn.patch +++ b/Spigot-Server-Patches/0332-Reset-players-airTicks-on-respawn.patch @@ -1,11 +1,11 @@ -From d8cf0ed68f026f58597ce1a0ffccf4767f2743e1 Mon Sep 17 00:00:00 2001 +From 036e3fb87860644ac6b6163383cf314adc2a9753 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/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index b63a8ad98..e58c68275 100644 +index bcfc5318f..9395f3e10 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2273,7 +2273,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,7 +18,7 @@ index b63a8ad98..e58c68275 100644 } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index bf1a38eb9..2e068ec2d 100644 +index 0e35f6dc2..2f605365f 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1857,6 +1857,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0334-Strip-private-area-unicode-characters-from-signs.patch b/Spigot-Server-Patches/0333-Strip-private-area-unicode-characters-from-signs.patch similarity index 97% rename from Spigot-Server-Patches/0334-Strip-private-area-unicode-characters-from-signs.patch rename to Spigot-Server-Patches/0333-Strip-private-area-unicode-characters-from-signs.patch index 73204c4ac..c0d333833 100644 --- a/Spigot-Server-Patches/0334-Strip-private-area-unicode-characters-from-signs.patch +++ b/Spigot-Server-Patches/0333-Strip-private-area-unicode-characters-from-signs.patch @@ -1,4 +1,4 @@ -From 7b6141329b843781e3a5df023fb2229632de5327 Mon Sep 17 00:00:00 2001 +From e44f34d3173d7a9e16a6e7a74ef205dd935cfd4e 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 @@ -20,7 +20,7 @@ think of no reason to use it. Fixes GH-1571 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 626ba9b17..7b5d534f4 100644 +index 2c6ce5bae..15b3add9e 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -14,6 +14,11 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // diff --git a/Spigot-Server-Patches/0335-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0334-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 96% rename from Spigot-Server-Patches/0335-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to Spigot-Server-Patches/0334-Don-t-sleep-after-profile-lookups-if-not-needed.patch index ad9be6808..ec910b45e 100644 --- a/Spigot-Server-Patches/0335-Don-t-sleep-after-profile-lookups-if-not-needed.patch +++ b/Spigot-Server-Patches/0334-Don-t-sleep-after-profile-lookups-if-not-needed.patch @@ -1,4 +1,4 @@ -From 61e56a4fe07e8c62743d11128e7cfdf299c9ffe7 Mon Sep 17 00:00:00 2001 +From 7c00d87b4b56b7a22f9f1059cf76bce5db04c6cb 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/0336-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0335-Use-more-reasonable-thread-count-default-for-bootstr.patch similarity index 92% rename from Spigot-Server-Patches/0336-Use-more-reasonable-thread-count-default-for-bootstr.patch rename to Spigot-Server-Patches/0335-Use-more-reasonable-thread-count-default-for-bootstr.patch index f3a5b46e4..97c3750cf 100644 --- a/Spigot-Server-Patches/0336-Use-more-reasonable-thread-count-default-for-bootstr.patch +++ b/Spigot-Server-Patches/0335-Use-more-reasonable-thread-count-default-for-bootstr.patch @@ -1,4 +1,4 @@ -From 751ed975c22f7fd9c400d0c038fddd3f23c5d158 Mon Sep 17 00:00:00 2001 +From 8ad28b03aad516f1544943f0ffa495f4f25bbab3 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/0337-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch b/Spigot-Server-Patches/0336-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch similarity index 94% rename from Spigot-Server-Patches/0337-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch rename to Spigot-Server-Patches/0336-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch index a1c9d8692..3d5a4e133 100644 --- a/Spigot-Server-Patches/0337-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch +++ b/Spigot-Server-Patches/0336-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch @@ -1,4 +1,4 @@ -From 78cc77a1b623ffb5f63d6495d5490313e5689200 Mon Sep 17 00:00:00 2001 +From 28470a8e6dfd253aa55dba3784e1755692c748d1 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 @@ -13,7 +13,7 @@ keep the clone of the item used to a non empty value so it represents the item used. diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index f692da609..5bc8bd7cd 100644 +index 06ea3899a..7f90a617f 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -354,10 +354,11 @@ public class PlayerInteractManager { diff --git a/Spigot-Server-Patches/0338-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch similarity index 97% rename from Spigot-Server-Patches/0338-Optimize-World-Time-Updates.patch rename to Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch index 2372b4391..a7713fd58 100644 --- a/Spigot-Server-Patches/0338-Optimize-World-Time-Updates.patch +++ b/Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch @@ -1,4 +1,4 @@ -From 84475f986b799dadb19ad533e08cf00add03268e Mon Sep 17 00:00:00 2001 +From 4e10c1bbd3dff1d841e55af0ad8dcc3f988778a5 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/0339-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0338-Restore-custom-InventoryHolder-support.patch similarity index 96% rename from Spigot-Server-Patches/0339-Restore-custom-InventoryHolder-support.patch rename to Spigot-Server-Patches/0338-Restore-custom-InventoryHolder-support.patch index bd429b53f..8b592806d 100644 --- a/Spigot-Server-Patches/0339-Restore-custom-InventoryHolder-support.patch +++ b/Spigot-Server-Patches/0338-Restore-custom-InventoryHolder-support.patch @@ -1,4 +1,4 @@ -From fd24db3c4af203dd891fee90a16380c08f0dd0ef Mon Sep 17 00:00:00 2001 +From 33bd08d2ba7b12df10d470d1a30c10cfa166b0be 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/0340-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0339-Use-Vanilla-Minecart-Speeds.patch similarity index 91% rename from Spigot-Server-Patches/0340-Use-Vanilla-Minecart-Speeds.patch rename to Spigot-Server-Patches/0339-Use-Vanilla-Minecart-Speeds.patch index f53ce511e..114e0b588 100644 --- a/Spigot-Server-Patches/0340-Use-Vanilla-Minecart-Speeds.patch +++ b/Spigot-Server-Patches/0339-Use-Vanilla-Minecart-Speeds.patch @@ -1,4 +1,4 @@ -From c00cc02a372fb4d9749a8bb8f696b6b36190dc7b Mon Sep 17 00:00:00 2001 +From 98b3efce4e247621f027b7fe7fb2c43c1b8fcc97 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 8 Nov 2018 21:33:09 -0500 Subject: [PATCH] Use Vanilla Minecart Speeds @@ -6,7 +6,7 @@ Subject: [PATCH] Use Vanilla Minecart Speeds CraftBukkit changed the values on flying speed, restore back to vanilla diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index 6fc332dbf..828a8711d 100644 +index 2a2105cbc..3a3ed039a 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -35,9 +35,9 @@ public abstract class EntityMinecartAbstract extends Entity { diff --git a/Spigot-Server-Patches/0341-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0340-Fix-SpongeAbsortEvent-handling.patch similarity index 93% rename from Spigot-Server-Patches/0341-Fix-SpongeAbsortEvent-handling.patch rename to Spigot-Server-Patches/0340-Fix-SpongeAbsortEvent-handling.patch index 5414908c9..cee3633e9 100644 --- a/Spigot-Server-Patches/0341-Fix-SpongeAbsortEvent-handling.patch +++ b/Spigot-Server-Patches/0340-Fix-SpongeAbsortEvent-handling.patch @@ -1,4 +1,4 @@ -From d60d046b6fd9ee91cf1d1e4e731a2065074563b6 Mon Sep 17 00:00:00 2001 +From 65f5e94d73159dcc1333e28f1219af0c1bfc28d8 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 10 Nov 2018 05:15:21 +0000 Subject: [PATCH] Fix SpongeAbsortEvent handling @@ -6,7 +6,7 @@ Subject: [PATCH] Fix SpongeAbsortEvent handling Only process drops when the block is actually going to be removed diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 0bddca623e..8f809a4ee4 100644 +index 0bddca623..8f809a4ee 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -472,7 +472,7 @@ public class Block implements IMaterial { @@ -19,7 +19,7 @@ index 0bddca623e..8f809a4ee4 100644 if (world instanceof WorldServer) { a(iblockdata, (WorldServer) world, blockposition, tileentity).forEach((itemstack) -> { diff --git a/src/main/java/net/minecraft/server/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java -index 4e281ce6dd..6a64af71b9 100644 +index 4e281ce6d..6a64af71b 100644 --- a/src/main/java/net/minecraft/server/BlockSponge.java +++ b/src/main/java/net/minecraft/server/BlockSponge.java @@ -113,8 +113,11 @@ public class BlockSponge extends Block { diff --git a/Spigot-Server-Patches/0342-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0341-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 92% rename from Spigot-Server-Patches/0342-Don-t-allow-digging-into-unloaded-chunks.patch rename to Spigot-Server-Patches/0341-Don-t-allow-digging-into-unloaded-chunks.patch index d9fd8ace2..f0547b26f 100644 --- a/Spigot-Server-Patches/0342-Don-t-allow-digging-into-unloaded-chunks.patch +++ b/Spigot-Server-Patches/0341-Don-t-allow-digging-into-unloaded-chunks.patch @@ -1,11 +1,11 @@ -From f084a78d2b9eeae3ab154d6127c396066291ca48 Mon Sep 17 00:00:00 2001 +From a84756c0cc7249d163464d530d8bf99764a8593f 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index ff45290b84..293e5d819c 100644 +index ff45290b8..293e5d819 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1250,6 +1250,11 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0343-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch similarity index 99% rename from Spigot-Server-Patches/0343-Optimize-redstone-algorithm.patch rename to Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch index bb9d3db9e..1255639c6 100644 --- a/Spigot-Server-Patches/0343-Optimize-redstone-algorithm.patch +++ b/Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch @@ -1,4 +1,4 @@ -From 87c87ad160f47b7171bab823ade46d9be9a2310a Mon Sep 17 00:00:00 2001 +From 1785bdbd71be84d3988751c7ed8950ca66e03af1 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 ad793ffa38..ef882b897f 100644 +index ad793ffa3..ef882b897 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -439,4 +439,14 @@ public class PaperWorldConfig { @@ -39,7 +39,7 @@ index ad793ffa38..ef882b897f 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..cf5661f1c5 +index 000000000..cf5661f1c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java @@ -0,0 +1,912 @@ @@ -956,7 +956,7 @@ index 0000000000..cf5661f1c5 + } +} diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java -index 7ce9cdb853..6b5015ce5f 100644 +index 7ce9cdb85..6b5015ce5 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java @@ -1,5 +1,7 @@ @@ -1124,7 +1124,7 @@ index 7ce9cdb853..6b5015ce5f 100644 c(iblockdata, world, blockposition); world.a(blockposition, false); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index d13e4cf735..f811ef8cc8 100644 +index d13e4cf73..f811ef8cc 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -556,6 +556,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0344-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0343-force-entity-dismount-during-teleportation.patch similarity index 96% rename from Spigot-Server-Patches/0344-force-entity-dismount-during-teleportation.patch rename to Spigot-Server-Patches/0343-force-entity-dismount-during-teleportation.patch index b3cc83180..c7a12ecf2 100644 --- a/Spigot-Server-Patches/0344-force-entity-dismount-during-teleportation.patch +++ b/Spigot-Server-Patches/0343-force-entity-dismount-during-teleportation.patch @@ -1,4 +1,4 @@ -From a7402d36cdb5dcb94e31ff2117f0623e8d1daf39 Mon Sep 17 00:00:00 2001 +From 680f38471891cd541474b9b0eade52bb3ccabcaf 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 @@ -20,7 +20,7 @@ this is going to be the best soultion all around. Improvements/suggestions welcome! diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 9395f3e106..ea4442d76d 100644 +index 9395f3e10..ea4442d76 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1995,12 +1995,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -72,7 +72,7 @@ index 9395f3e106..ea4442d76d 100644 if (event.isCancelled()) { return false; diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 7d8885ce81..318c2b0dcf 100644 +index 7d8885ce8..318c2b0dc 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -937,9 +937,11 @@ public abstract class EntityHuman extends EntityLiving { @@ -91,7 +91,7 @@ index 7d8885ce81..318c2b0dcf 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index dd6e80c6fd..ae1cda49aa 100644 +index dd6e80c6f..ae1cda49a 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2667,11 +2667,13 @@ public abstract class EntityLiving extends Entity { @@ -112,7 +112,7 @@ index dd6e80c6fd..ae1cda49aa 100644 this.B(entity); } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 2f605365f7..7f89d45ed2 100644 +index 2f605365f..7f89d45ed 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -997,11 +997,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0345-Book-Size-Limits.patch b/Spigot-Server-Patches/0344-Book-Size-Limits.patch similarity index 97% rename from Spigot-Server-Patches/0345-Book-Size-Limits.patch rename to Spigot-Server-Patches/0344-Book-Size-Limits.patch index c9df2e84c..3c50e3a8f 100644 --- a/Spigot-Server-Patches/0345-Book-Size-Limits.patch +++ b/Spigot-Server-Patches/0344-Book-Size-Limits.patch @@ -1,4 +1,4 @@ -From a4a3be2e676fd159d16b7497205c1a5749a393f9 Mon Sep 17 00:00:00 2001 +From 36654b61426aecd3fda14002e023730f5c453cd7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Nov 2018 23:08:50 -0500 Subject: [PATCH] Book Size Limits @@ -22,7 +22,7 @@ index a79cba50e..e5e41c662 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a887be15c..baab1a88a 100644 +index 293e5d819..f68693525 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -14,6 +14,7 @@ import java.util.Iterator; diff --git a/Spigot-Server-Patches/0346-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0345-Make-the-default-permission-message-configurable.patch similarity index 97% rename from Spigot-Server-Patches/0346-Make-the-default-permission-message-configurable.patch rename to Spigot-Server-Patches/0345-Make-the-default-permission-message-configurable.patch index 14a43a6b9..4004a36cf 100644 --- a/Spigot-Server-Patches/0346-Make-the-default-permission-message-configurable.patch +++ b/Spigot-Server-Patches/0345-Make-the-default-permission-message-configurable.patch @@ -1,4 +1,4 @@ -From 00f5928f1768ce8b1de130933c391da8fd09fbb1 Mon Sep 17 00:00:00 2001 +From 8d19fecfab08e3ee23b30fe6a19f00352333adea 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/0347-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0346-Add-more-Zombie-API.patch similarity index 98% rename from Spigot-Server-Patches/0347-Add-more-Zombie-API.patch rename to Spigot-Server-Patches/0346-Add-more-Zombie-API.patch index 86b0025d2..383a1798e 100644 --- a/Spigot-Server-Patches/0347-Add-more-Zombie-API.patch +++ b/Spigot-Server-Patches/0346-Add-more-Zombie-API.patch @@ -1,11 +1,11 @@ -From 738ad01b1c3aedf48337837713706ce5d488893c Mon Sep 17 00:00:00 2001 +From 211899db841918fe476f6dac60b11d89df32a80c 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/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 90923c753..5cc08ca7c 100644 +index c81e53090..48ce15484 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1246,6 +1246,8 @@ public abstract class EntityInsentient extends EntityLiving { diff --git a/Spigot-Server-Patches/0348-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0347-Prevent-rayTrace-from-loading-chunks.patch similarity index 95% rename from Spigot-Server-Patches/0348-Prevent-rayTrace-from-loading-chunks.patch rename to Spigot-Server-Patches/0347-Prevent-rayTrace-from-loading-chunks.patch index 68992c10e..1ffc9edb6 100644 --- a/Spigot-Server-Patches/0348-Prevent-rayTrace-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0347-Prevent-rayTrace-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From ccc47d2376f1f6f4a464cdd086135dfc7801b7f1 Mon Sep 17 00:00:00 2001 +From c5e0aeb093d960e33895c510129db518a3ecee63 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 diff --git a/Spigot-Server-Patches/0349-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0348-Handle-Large-Packets-disconnecting-client.patch similarity index 98% rename from Spigot-Server-Patches/0349-Handle-Large-Packets-disconnecting-client.patch rename to Spigot-Server-Patches/0348-Handle-Large-Packets-disconnecting-client.patch index 7a6193299..53084d456 100644 --- a/Spigot-Server-Patches/0349-Handle-Large-Packets-disconnecting-client.patch +++ b/Spigot-Server-Patches/0348-Handle-Large-Packets-disconnecting-client.patch @@ -1,4 +1,4 @@ -From 43963caa455961da93ac4e202a2afbddf3b6f15f Mon Sep 17 00:00:00 2001 +From d654882c23645a74bcaf783541d0b5f59df0bbba 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 @@ -7,7 +7,7 @@ If a players inventory is too big to send in a single packet, split the inventory set into multiple packets instead. diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 38386d588..2c28b97d8 100644 +index c073b04aa..1652662ae 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -99,6 +99,15 @@ public class NetworkManager extends SimpleChannelInboundHandler> { diff --git a/Spigot-Server-Patches/0350-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0349-Lazy-init-world-storage-in-CraftOfflinePlayer.patch similarity index 97% rename from Spigot-Server-Patches/0350-Lazy-init-world-storage-in-CraftOfflinePlayer.patch rename to Spigot-Server-Patches/0349-Lazy-init-world-storage-in-CraftOfflinePlayer.patch index 137ff6579..7f6bb3d37 100644 --- a/Spigot-Server-Patches/0350-Lazy-init-world-storage-in-CraftOfflinePlayer.patch +++ b/Spigot-Server-Patches/0349-Lazy-init-world-storage-in-CraftOfflinePlayer.patch @@ -1,4 +1,4 @@ -From 7a8de00ab10ca0a140ab7adc0460553932af3942 Mon Sep 17 00:00:00 2001 +From 6428cbf266f4dc6e424b49d0ddba22e82c0befe5 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/0351-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0350-Add-PlayerConnectionCloseEvent.patch similarity index 97% rename from Spigot-Server-Patches/0351-Add-PlayerConnectionCloseEvent.patch rename to Spigot-Server-Patches/0350-Add-PlayerConnectionCloseEvent.patch index c0b092a6a..1976bcfb6 100644 --- a/Spigot-Server-Patches/0351-Add-PlayerConnectionCloseEvent.patch +++ b/Spigot-Server-Patches/0350-Add-PlayerConnectionCloseEvent.patch @@ -1,4 +1,4 @@ -From 120808b9ed9305c487d75470dadd345c67c0cc19 Mon Sep 17 00:00:00 2001 +From 0cd2b1da42e4771f25d792ad9387acfcc765b2eb Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 7 Oct 2018 12:05:28 -0700 Subject: [PATCH] Add PlayerConnectionCloseEvent @@ -50,7 +50,7 @@ index 5d46a975e..9e4bc2405 100644 private SecretKey loginKey; private EntityPlayer l; diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 2c28b97d8..1b0643c27 100644 +index 1652662ae..23fcdea17 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -346,6 +346,26 @@ public class NetworkManager extends SimpleChannelInboundHandler> { diff --git a/Spigot-Server-Patches/0352-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0351-Prevent-Enderman-from-loading-chunks.patch similarity index 95% rename from Spigot-Server-Patches/0352-Prevent-Enderman-from-loading-chunks.patch rename to Spigot-Server-Patches/0351-Prevent-Enderman-from-loading-chunks.patch index 388c68d4b..8a95a200f 100644 --- a/Spigot-Server-Patches/0352-Prevent-Enderman-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0351-Prevent-Enderman-from-loading-chunks.patch @@ -1,11 +1,11 @@ -From fc6ba51276935a15372f60dd20880fcd5c2a1c57 Mon Sep 17 00:00:00 2001 +From ef680ce19df7c5e78efe920d3a6f015aa1a80cea 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/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index ad1553f6e..c6a2e0839 100644 +index 5e850db32..d4c4dc2fd 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -325,7 +325,8 @@ public class EntityEnderman extends EntityMonster { diff --git a/Spigot-Server-Patches/0353-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0352-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 98% rename from Spigot-Server-Patches/0353-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to Spigot-Server-Patches/0352-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index da11b7b21..4f7a393e5 100644 --- a/Spigot-Server-Patches/0353-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/Spigot-Server-Patches/0352-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -1,4 +1,4 @@ -From a906f9dff899ba0376b820d012236439d968674e Mon Sep 17 00:00:00 2001 +From 3ce57cf192543240a80794ce558716f8e3f0e15a 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 @@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and documented as to their purpose. diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index a05b31f73..79139be38 100644 +index 7f89d45ed..64d1b72a8 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -75,6 +75,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -28,7 +28,7 @@ index a05b31f73..79139be38 100644 public boolean queueHealthUpdatePacket = false; public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket; diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index af437120e..1eae8057d 100644 +index 0db1e8334..0aafa1b60 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -94,6 +94,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0354-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0353-Fix-PlayerEditBookEvent.patch similarity index 94% rename from Spigot-Server-Patches/0354-Fix-PlayerEditBookEvent.patch rename to Spigot-Server-Patches/0353-Fix-PlayerEditBookEvent.patch index 32ef46142..a991dd0a9 100644 --- a/Spigot-Server-Patches/0354-Fix-PlayerEditBookEvent.patch +++ b/Spigot-Server-Patches/0353-Fix-PlayerEditBookEvent.patch @@ -1,4 +1,4 @@ -From 4d0a37f46e4edd5bd6438eb4c6ae0a7e5214064d Mon Sep 17 00:00:00 2001 +From c1de41cf5f2ec6108306d37dfbf1385081ae2e15 Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Sun, 16 Dec 2018 13:07:33 +1100 Subject: [PATCH] Fix PlayerEditBookEvent @@ -10,7 +10,7 @@ it impossible to properly cancel the event or modify the book meta cancelled writing diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index baab1a88a..f007290ff 100644 +index f68693525..98d1138cb 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -860,9 +860,11 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0355-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 90% rename from Spigot-Server-Patches/0355-Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index 5865e9593..5f808ec54 100644 --- a/Spigot-Server-Patches/0355-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -1,11 +1,11 @@ -From 0b348726ba58833452b50fc0d6e5ac8ce349c5a9 Mon Sep 17 00:00:00 2001 +From bbeecf1f284a7d540827e4b609de84052fb4bfce 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/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 79139be38..c7f22870b 100644 +index 64d1b72a8..0a67f48f6 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1280,6 +1280,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0356-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0355-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch similarity index 96% rename from Spigot-Server-Patches/0356-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch rename to Spigot-Server-Patches/0355-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch index a4969995a..e497a6552 100644 --- a/Spigot-Server-Patches/0356-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch +++ b/Spigot-Server-Patches/0355-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch @@ -1,4 +1,4 @@ -From 526e77b1d53264548589704961c8e62942ffc0f0 Mon Sep 17 00:00:00 2001 +From 0110b90cf96f902c4271a0582869f179e6833b81 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 @@ -24,7 +24,7 @@ Instead we opt to remove the check entirely so that the event fires for all piston types. diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java -index 141006e36..78603d2cb 100644 +index b41750f22..d548b27b8 100644 --- a/src/main/java/net/minecraft/server/BlockPiston.java +++ b/src/main/java/net/minecraft/server/BlockPiston.java @@ -121,7 +121,7 @@ public class BlockPiston extends BlockDirectional { diff --git a/Spigot-Server-Patches/0357-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0356-Block-Entity-remove-from-being-called-on-Players.patch similarity index 95% rename from Spigot-Server-Patches/0357-Block-Entity-remove-from-being-called-on-Players.patch rename to Spigot-Server-Patches/0356-Block-Entity-remove-from-being-called-on-Players.patch index 8f1a2c36c..06d7d9170 100644 --- a/Spigot-Server-Patches/0357-Block-Entity-remove-from-being-called-on-Players.patch +++ b/Spigot-Server-Patches/0356-Block-Entity-remove-from-being-called-on-Players.patch @@ -1,4 +1,4 @@ -From ffa6d841ac14b1b378e3a19fe391af3344c50e0d Mon Sep 17 00:00:00 2001 +From 23dcf720508f450e79989b9279cae31020d6a63c 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/0358-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0357-Allow-Saving-of-Oversized-Chunks.patch similarity index 99% rename from Spigot-Server-Patches/0358-Allow-Saving-of-Oversized-Chunks.patch rename to Spigot-Server-Patches/0357-Allow-Saving-of-Oversized-Chunks.patch index 80845d225..4369c12ea 100644 --- a/Spigot-Server-Patches/0358-Allow-Saving-of-Oversized-Chunks.patch +++ b/Spigot-Server-Patches/0357-Allow-Saving-of-Oversized-Chunks.patch @@ -1,4 +1,4 @@ -From 9d6f89ebd925e3ceb8114f517c4827d0bc344b46 Mon Sep 17 00:00:00 2001 +From b1daf825933dfebf17b7701c40dbe983feeb35a3 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 @@ -286,7 +286,7 @@ index e68f90194..ed2ccebb2 100644 + } diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index 74f102adf..3f7190b6a 100644 +index 871881165..c53518a47 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -47,6 +47,7 @@ public abstract class RegionFileCache implements AutoCloseable { diff --git a/Spigot-Server-Patches/0359-BlockDestroyEvent.patch b/Spigot-Server-Patches/0358-BlockDestroyEvent.patch similarity index 95% rename from Spigot-Server-Patches/0359-BlockDestroyEvent.patch rename to Spigot-Server-Patches/0358-BlockDestroyEvent.patch index e920a592e..740e7720d 100644 --- a/Spigot-Server-Patches/0359-BlockDestroyEvent.patch +++ b/Spigot-Server-Patches/0358-BlockDestroyEvent.patch @@ -1,4 +1,4 @@ -From 1413bae6de96ea8e6d20801ec5e5505e23e09f9c Mon Sep 17 00:00:00 2001 +From e4e8eb871eb4c2e2ee8f9752ed648055a988f592 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 3425f034c..4280fdf80 100644 +index f811ef8cc..032419155 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -486,8 +486,20 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0360-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0359-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch similarity index 97% rename from Spigot-Server-Patches/0360-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch rename to Spigot-Server-Patches/0359-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch index 5904e93b8..b24ec12fe 100644 --- a/Spigot-Server-Patches/0360-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch +++ b/Spigot-Server-Patches/0359-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch @@ -1,4 +1,4 @@ -From 1f27a68ba3937a8da619a8755a4351b83244053c Mon Sep 17 00:00:00 2001 +From ae2e079ae86a1f53dafa32b8aa904e9ad7922334 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/0361-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0360-Fix-sign-edit-memory-leak.patch similarity index 94% rename from Spigot-Server-Patches/0361-Fix-sign-edit-memory-leak.patch rename to Spigot-Server-Patches/0360-Fix-sign-edit-memory-leak.patch index 932c966cb..faf319759 100644 --- a/Spigot-Server-Patches/0361-Fix-sign-edit-memory-leak.patch +++ b/Spigot-Server-Patches/0360-Fix-sign-edit-memory-leak.patch @@ -1,4 +1,4 @@ -From 2324c30717edbe9602a8ab535b018ff43d7f27ac Mon Sep 17 00:00:00 2001 +From e776f5ab14aa0c2cf5e54dee68753ae4d7f1cf13 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Fix sign edit memory leak when a player edits a sign, a reference to their Entity is never cleand up. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 98d1138cbd..b3f1fb9eb2 100644 +index 98d1138cb..b3f1fb9eb 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2565,7 +2565,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -19,7 +19,7 @@ index 98d1138cbd..b3f1fb9eb2 100644 this.sendPacket(tileentity.getUpdatePacket()); // CraftBukkit return; diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 15b3add9ed..caeaca4c7a 100644 +index 15b3add9e..caeaca4c7 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -17,6 +17,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // diff --git a/Spigot-Server-Patches/0362-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0361-Limit-Client-Sign-length-more.patch similarity index 96% rename from Spigot-Server-Patches/0362-Limit-Client-Sign-length-more.patch rename to Spigot-Server-Patches/0361-Limit-Client-Sign-length-more.patch index d0d7ca9cc..18ca995d3 100644 --- a/Spigot-Server-Patches/0362-Limit-Client-Sign-length-more.patch +++ b/Spigot-Server-Patches/0361-Limit-Client-Sign-length-more.patch @@ -1,4 +1,4 @@ -From eab93ce140d0c02ce3f8c792af676e699bba7524 Mon Sep 17 00:00:00 2001 +From bf2e2a2b9059d94f9f580540499aa42cc2938754 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 @@ -22,7 +22,7 @@ it only impacts data sent from the client. Set -DPaper.maxSignLength=XX to change limit or -1 to disable diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index b3f1fb9eb2..5ad28ec748 100644 +index b3f1fb9eb..5ad28ec74 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -103,6 +103,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0363-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0362-Don-t-check-ConvertSigns-boolean-every-sign-save.patch similarity index 93% rename from Spigot-Server-Patches/0363-Don-t-check-ConvertSigns-boolean-every-sign-save.patch rename to Spigot-Server-Patches/0362-Don-t-check-ConvertSigns-boolean-every-sign-save.patch index 24a44a43a..f46ff8238 100644 --- a/Spigot-Server-Patches/0363-Don-t-check-ConvertSigns-boolean-every-sign-save.patch +++ b/Spigot-Server-Patches/0362-Don-t-check-ConvertSigns-boolean-every-sign-save.patch @@ -1,4 +1,4 @@ -From 8b5be03f29233ec04460af50651a60799c74acc0 Mon Sep 17 00:00:00 2001 +From 3be664433ed6563585bcdcf2490ef6c432f2a945 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 @@ -7,7 +7,7 @@ property lookups arent super cheap. they synchronize, validate and check security managers. diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index daf0aeb43..91c99222d 100644 +index caeaca4c7..dd7889a4f 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -18,6 +18,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // diff --git a/Spigot-Server-Patches/0364-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0363-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch similarity index 97% rename from Spigot-Server-Patches/0364-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch rename to Spigot-Server-Patches/0363-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch index 5c25c8628..c3c440320 100644 --- a/Spigot-Server-Patches/0364-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch +++ b/Spigot-Server-Patches/0363-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch @@ -1,4 +1,4 @@ -From a1999499091cbd5b29e9c051cc32f9beb2d1df39 Mon Sep 17 00:00:00 2001 +From b1e2f45ae5808f32e28b0826ca14b762d34dfaaa 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 @@ -11,7 +11,7 @@ Use -DPaper.excessiveSignsLimit=500 to configure that limit, or -1 to disable the limit and let your players be abused. diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 1b0643c27..4766f7b77 100644 +index 23fcdea17..ba23d2833 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -220,6 +220,15 @@ public class NetworkManager extends SimpleChannelInboundHandler> { diff --git a/Spigot-Server-Patches/0365-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0364-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch similarity index 95% rename from Spigot-Server-Patches/0365-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch rename to Spigot-Server-Patches/0364-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch index 68d1d22b5..c146ef061 100644 --- a/Spigot-Server-Patches/0365-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch +++ b/Spigot-Server-Patches/0364-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch @@ -1,4 +1,4 @@ -From cbcb45ce92a783630c26656564b1d99326d43266 Mon Sep 17 00:00:00 2001 +From 5dab6532a79c382ecfe09106c4a82d9b9d48385b 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 @@ -11,7 +11,7 @@ everything to the Whitelist object. https://github.com/PaperMC/Paper/issues/1880 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java -index c169d0176..55bc4b265 100644 +index 8570e38f4..c97be42dd 100644 --- a/src/main/java/net/minecraft/server/JsonList.java +++ b/src/main/java/net/minecraft/server/JsonList.java @@ -64,6 +64,7 @@ public class JsonList> { @@ -23,7 +23,7 @@ index c169d0176..55bc4b265 100644 this.e = flag; } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 1eae8057d..e6c894463 100644 +index 0aafa1b60..eab23bd15 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -62,7 +62,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0366-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0365-Set-Zombie-last-tick-at-start-of-drowning-process.patch similarity index 93% rename from Spigot-Server-Patches/0366-Set-Zombie-last-tick-at-start-of-drowning-process.patch rename to Spigot-Server-Patches/0365-Set-Zombie-last-tick-at-start-of-drowning-process.patch index be167ff81..454f50b1b 100644 --- a/Spigot-Server-Patches/0366-Set-Zombie-last-tick-at-start-of-drowning-process.patch +++ b/Spigot-Server-Patches/0365-Set-Zombie-last-tick-at-start-of-drowning-process.patch @@ -1,4 +1,4 @@ -From 9990944cbb2b0f091fd26a876c6e9bbab7bf4212 Mon Sep 17 00:00:00 2001 +From 25067838466eb90db0e83c92feb9cc03c7cc5406 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/0367-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0366-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 87% rename from Spigot-Server-Patches/0367-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to Spigot-Server-Patches/0366-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch index 5b2362495..c39750fc1 100644 --- a/Spigot-Server-Patches/0367-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch +++ b/Spigot-Server-Patches/0366-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch @@ -1,11 +1,11 @@ -From f49d4f07fe1c441001d5116594585e3bad5eb04f Mon Sep 17 00:00:00 2001 +From a4dc3110711450f77f0e011cdae82ee1626903df 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/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index e6c894463..ce66596c6 100644 +index eab23bd15..b924f3d76 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1034,6 +1034,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0368-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0367-Add-LivingEntity-getTargetEntity.patch similarity index 96% rename from Spigot-Server-Patches/0368-Add-LivingEntity-getTargetEntity.patch rename to Spigot-Server-Patches/0367-Add-LivingEntity-getTargetEntity.patch index b2fbd2789..e313d8013 100644 --- a/Spigot-Server-Patches/0368-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-Server-Patches/0367-Add-LivingEntity-getTargetEntity.patch @@ -1,11 +1,11 @@ -From 26a97e7124567c48cd076ba9195e5d47ca619cb3 Mon Sep 17 00:00:00 2001 +From 21ae0164e8c747eab3f6fcbf79d200e23dbd1719 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/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java -index 4f60b931a1..c950139c0f 100644 +index 4f60b931a..c950139c0 100644 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java @@ -108,6 +108,7 @@ public class AxisAlignedBB { @@ -46,7 +46,7 @@ index 4f60b931a1..c950139c0f 100644 double[] adouble = new double[]{1.0D}; double d0 = vec3d1.x - vec3d.x; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ea4442d76d..6dae950c2d 100644 +index ea4442d76..6dae950c2 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1447,6 +1447,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -66,7 +66,7 @@ index ea4442d76d..6dae950c2d 100644 return 0.0F; } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index ae1cda49aa..17ee1c3eb7 100644 +index ae1cda49a..17ee1c3eb 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -3223,6 +3223,37 @@ public abstract class EntityLiving extends Entity { @@ -108,7 +108,7 @@ index ae1cda49aa..17ee1c3eb7 100644 public int getShieldBlockingDelay() { diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index 035d70419d..2ebcbe17ce 100644 +index 035d70419..2ebcbe17c 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -18,6 +18,7 @@ public final class IEntitySelector { @@ -120,7 +120,7 @@ index 035d70419d..2ebcbe17ce 100644 return !entity.t(); }; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index d5c4115a85..c4aa1945ff 100644 +index d5c4115a8..c4aa1945f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -202,6 +202,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0369-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0368-Use-proper-max-length-when-serialising-BungeeCord-te.patch similarity index 96% rename from Spigot-Server-Patches/0369-Use-proper-max-length-when-serialising-BungeeCord-te.patch rename to Spigot-Server-Patches/0368-Use-proper-max-length-when-serialising-BungeeCord-te.patch index 94555cffd..ea5e408c5 100644 --- a/Spigot-Server-Patches/0369-Use-proper-max-length-when-serialising-BungeeCord-te.patch +++ b/Spigot-Server-Patches/0368-Use-proper-max-length-when-serialising-BungeeCord-te.patch @@ -1,4 +1,4 @@ -From 8c00a5074a4e7a81b0222950ad3568bcfff15191 Mon Sep 17 00:00:00 2001 +From a5108a8422e787acd77cfeae3ab2d712ca23b930 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/0370-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0369-Entity-getEntitySpawnReason.patch similarity index 96% rename from Spigot-Server-Patches/0370-Entity-getEntitySpawnReason.patch rename to Spigot-Server-Patches/0369-Entity-getEntitySpawnReason.patch index cd5cc934f..511aa9020 100644 --- a/Spigot-Server-Patches/0370-Entity-getEntitySpawnReason.patch +++ b/Spigot-Server-Patches/0369-Entity-getEntitySpawnReason.patch @@ -1,4 +1,4 @@ -From ff16b5f55a5a4b182b35a3fcd8b704b7a1aedf03 Mon Sep 17 00:00:00 2001 +From 519d8ed327b08e12b413014380e019873e5e7d2f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 00:24:52 -0400 Subject: [PATCH] Entity#getEntitySpawnReason @@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners, or DEFAULT since data was not stored. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 35ec15b39..7ded9bc6c 100644 +index 6dae950c2..5711cf664 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -68,6 +68,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -59,7 +59,7 @@ index 35ec15b39..7ded9bc6c 100644 } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index ce66596c6..5645147da 100644 +index b924f3d76..95f309342 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -250,7 +250,7 @@ public abstract class PlayerList { @@ -72,7 +72,7 @@ index ce66596c6..5645147da 100644 }); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 9c4ef2e00..1a01e5e69 100644 +index 3c986857b..c93bf8e8b 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -932,6 +932,7 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0371-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0370-Update-entity-Metadata-for-all-tracked-players.patch similarity index 92% rename from Spigot-Server-Patches/0371-Update-entity-Metadata-for-all-tracked-players.patch rename to Spigot-Server-Patches/0370-Update-entity-Metadata-for-all-tracked-players.patch index e5ff06a5c..f36ec66dd 100644 --- a/Spigot-Server-Patches/0371-Update-entity-Metadata-for-all-tracked-players.patch +++ b/Spigot-Server-Patches/0370-Update-entity-Metadata-for-all-tracked-players.patch @@ -1,11 +1,11 @@ -From 748f2cb401b853a1963f7fac7c7dbad5e291350f Mon Sep 17 00:00:00 2001 +From d95416ab0b62ee13e0f11db1ff1b2221129ee363 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/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index afd8748da8..17b6ab57c2 100644 +index afd8748da..17b6ab57c 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -379,6 +379,12 @@ public class EntityTrackerEntry { @@ -22,7 +22,7 @@ index afd8748da8..17b6ab57c2 100644 this.f.accept(packet); if (this.tracker instanceof EntityPlayer) { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 5ad28ec748..f3f6fa1c45 100644 +index 5ad28ec74..f3f6fa1c4 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2025,7 +2025,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0372-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0371-Fire-event-on-GS4-query.patch similarity index 98% rename from Spigot-Server-Patches/0372-Fire-event-on-GS4-query.patch rename to Spigot-Server-Patches/0371-Fire-event-on-GS4-query.patch index 044270a6d..11278003e 100644 --- a/Spigot-Server-Patches/0372-Fire-event-on-GS4-query.patch +++ b/Spigot-Server-Patches/0371-Fire-event-on-GS4-query.patch @@ -1,11 +1,11 @@ -From d644a82fa7226a9d05f86121493a30c2bef8aa56 Mon Sep 17 00:00:00 2001 +From e7c9501ecb2e65a95f8a81b3e6dd69b1a9180d97 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/src/main/java/net/minecraft/server/RemoteConnectionThread.java b/src/main/java/net/minecraft/server/RemoteConnectionThread.java -index 66bfbcf02b..d821ef9a75 100644 +index 66bfbcf02..d821ef9a7 100644 --- a/src/main/java/net/minecraft/server/RemoteConnectionThread.java +++ b/src/main/java/net/minecraft/server/RemoteConnectionThread.java @@ -15,7 +15,7 @@ public abstract class RemoteConnectionThread implements Runnable { @@ -26,7 +26,7 @@ index 66bfbcf02b..d821ef9a75 100644 return this.b.getPlayerCount(); } diff --git a/src/main/java/net/minecraft/server/RemoteStatusListener.java b/src/main/java/net/minecraft/server/RemoteStatusListener.java -index a556a71334..67e94a6f07 100644 +index a556a7133..67e94a6f0 100644 --- a/src/main/java/net/minecraft/server/RemoteStatusListener.java +++ b/src/main/java/net/minecraft/server/RemoteStatusListener.java @@ -21,19 +21,19 @@ public class RemoteStatusListener extends RemoteConnectionThread { @@ -184,7 +184,7 @@ index a556a71334..67e94a6f07 100644 } } diff --git a/src/main/java/net/minecraft/server/RemoteStatusReply.java b/src/main/java/net/minecraft/server/RemoteStatusReply.java -index 848b5c3f0e..73efea7e13 100644 +index 848b5c3f0..73efea7e1 100644 --- a/src/main/java/net/minecraft/server/RemoteStatusReply.java +++ b/src/main/java/net/minecraft/server/RemoteStatusReply.java @@ -18,15 +18,27 @@ public class RemoteStatusReply { diff --git a/Spigot-Server-Patches/0373-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0372-Implement-PlayerPostRespawnEvent.patch similarity index 95% rename from Spigot-Server-Patches/0373-Implement-PlayerPostRespawnEvent.patch rename to Spigot-Server-Patches/0372-Implement-PlayerPostRespawnEvent.patch index 15e9acf43..557b0cdfc 100644 --- a/Spigot-Server-Patches/0373-Implement-PlayerPostRespawnEvent.patch +++ b/Spigot-Server-Patches/0372-Implement-PlayerPostRespawnEvent.patch @@ -1,11 +1,11 @@ -From 4586cbcfa44debe50fe0af9ba9a9fa61f7dea122 Mon Sep 17 00:00:00 2001 +From 3dc625efd1910582b72e02915aa73aaeb4f0195f 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/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 5645147da..0e7e47f83 100644 +index 95f309342..47789ee6b 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -637,9 +637,14 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0374-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0373-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 95% rename from Spigot-Server-Patches/0374-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to Spigot-Server-Patches/0373-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch index 69eb37627..9c4e40e76 100644 --- a/Spigot-Server-Patches/0374-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch +++ b/Spigot-Server-Patches/0373-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch @@ -1,4 +1,4 @@ -From e37f1eb51738e8092a3111dcd21a3ef5bf2ea0c9 Mon Sep 17 00:00:00 2001 +From fad0f9f59721daf38bb68aecb6465588b25ccf06 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/0375-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0374-Implement-getters-and-setters-for-EntityItem-owner-a.patch similarity index 95% rename from Spigot-Server-Patches/0375-Implement-getters-and-setters-for-EntityItem-owner-a.patch rename to Spigot-Server-Patches/0374-Implement-getters-and-setters-for-EntityItem-owner-a.patch index 200d35018..ed186a10d 100644 --- a/Spigot-Server-Patches/0375-Implement-getters-and-setters-for-EntityItem-owner-a.patch +++ b/Spigot-Server-Patches/0374-Implement-getters-and-setters-for-EntityItem-owner-a.patch @@ -1,4 +1,4 @@ -From 2545cd7990271021c0219055a0e75eb53f48e638 Mon Sep 17 00:00:00 2001 +From dbae2d53e2473ee7c84499f409faf51096829527 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/0376-Server-Tick-Events.patch b/Spigot-Server-Patches/0375-Server-Tick-Events.patch similarity index 96% rename from Spigot-Server-Patches/0376-Server-Tick-Events.patch rename to Spigot-Server-Patches/0375-Server-Tick-Events.patch index eabdac3d8..ea4883484 100644 --- a/Spigot-Server-Patches/0376-Server-Tick-Events.patch +++ b/Spigot-Server-Patches/0375-Server-Tick-Events.patch @@ -1,4 +1,4 @@ -From 3420e2ae9b6259d364e6dc8467e4e248451b3736 Mon Sep 17 00:00:00 2001 +From 5ceffba14f8451560d802a47305c50d9a1912696 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/0377-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0376-PlayerDeathEvent-getItemsToKeep.patch similarity index 96% rename from Spigot-Server-Patches/0377-PlayerDeathEvent-getItemsToKeep.patch rename to Spigot-Server-Patches/0376-PlayerDeathEvent-getItemsToKeep.patch index 2f4088d2d..7742b88b6 100644 --- a/Spigot-Server-Patches/0377-PlayerDeathEvent-getItemsToKeep.patch +++ b/Spigot-Server-Patches/0376-PlayerDeathEvent-getItemsToKeep.patch @@ -1,4 +1,4 @@ -From 96e9cba58589bb68363db3553a5d1e968f6b23d7 Mon Sep 17 00:00:00 2001 +From 7c4e02a6e14ac2f1c541140698344b8dc7bf451b Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 23:01:33 -0400 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep @@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index c7f22870b..21ec45e6f 100644 +index 0a67f48f6..691a2d094 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -508,6 +508,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0378-Optimize-Persistent-Data-Loading.patch b/Spigot-Server-Patches/0377-Optimize-Persistent-Data-Loading.patch similarity index 97% rename from Spigot-Server-Patches/0378-Optimize-Persistent-Data-Loading.patch rename to Spigot-Server-Patches/0377-Optimize-Persistent-Data-Loading.patch index 174ba834e..e44bc5fc9 100644 --- a/Spigot-Server-Patches/0378-Optimize-Persistent-Data-Loading.patch +++ b/Spigot-Server-Patches/0377-Optimize-Persistent-Data-Loading.patch @@ -1,4 +1,4 @@ -From 3e8131a0eaca92facca6ca11ef032922ddeb455d Mon Sep 17 00:00:00 2001 +From e1ed8abcbc9786fcffb960f9f44426bffe13d9f6 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/0379-Allow-login-events-to-fire-only-after-the-server-plu.patch b/Spigot-Server-Patches/0378-Allow-login-events-to-fire-only-after-the-server-plu.patch similarity index 97% rename from Spigot-Server-Patches/0379-Allow-login-events-to-fire-only-after-the-server-plu.patch rename to Spigot-Server-Patches/0378-Allow-login-events-to-fire-only-after-the-server-plu.patch index bb04660f7..465c29985 100644 --- a/Spigot-Server-Patches/0379-Allow-login-events-to-fire-only-after-the-server-plu.patch +++ b/Spigot-Server-Patches/0378-Allow-login-events-to-fire-only-after-the-server-plu.patch @@ -1,4 +1,4 @@ -From b32b8d3116d036ba691bbf5526e0fb3a28b736fa Mon Sep 17 00:00:00 2001 +From ef1a2041f4c43bb39e7b7035fb3a14863da5ccf2 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/0380-Make-region-files-more-reliable-to-write-to.patch b/Spigot-Server-Patches/0379-Make-region-files-more-reliable-to-write-to.patch similarity index 99% rename from Spigot-Server-Patches/0380-Make-region-files-more-reliable-to-write-to.patch rename to Spigot-Server-Patches/0379-Make-region-files-more-reliable-to-write-to.patch index 961ac8b00..97bce2a02 100644 --- a/Spigot-Server-Patches/0380-Make-region-files-more-reliable-to-write-to.patch +++ b/Spigot-Server-Patches/0379-Make-region-files-more-reliable-to-write-to.patch @@ -1,4 +1,4 @@ -From 67ee8261046196bb0c1b3472296709b0e8c77b9f Mon Sep 17 00:00:00 2001 +From 5cfb6d39c794cf0f3cf995fda77bef61acf02e27 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/0381-Optimize-GameRules-to-use-LinkedHashMap.patch b/Spigot-Server-Patches/0380-Optimize-GameRules-to-use-LinkedHashMap.patch similarity index 98% rename from Spigot-Server-Patches/0381-Optimize-GameRules-to-use-LinkedHashMap.patch rename to Spigot-Server-Patches/0380-Optimize-GameRules-to-use-LinkedHashMap.patch index 953c0db0b..301d4632b 100644 --- a/Spigot-Server-Patches/0381-Optimize-GameRules-to-use-LinkedHashMap.patch +++ b/Spigot-Server-Patches/0380-Optimize-GameRules-to-use-LinkedHashMap.patch @@ -1,4 +1,4 @@ -From 1fda00658411d9f5f8423038438f04f429f50aae Mon Sep 17 00:00:00 2001 +From f5c04bb8f4496e6409dd1f60edd7fd2e1bd38abd 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/0382-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0381-Optimize-Captured-TileEntity-Lookup.patch similarity index 93% rename from Spigot-Server-Patches/0382-Optimize-Captured-TileEntity-Lookup.patch rename to Spigot-Server-Patches/0381-Optimize-Captured-TileEntity-Lookup.patch index 1209b28af..888829297 100644 --- a/Spigot-Server-Patches/0382-Optimize-Captured-TileEntity-Lookup.patch +++ b/Spigot-Server-Patches/0381-Optimize-Captured-TileEntity-Lookup.patch @@ -1,4 +1,4 @@ -From 4ade6daf8cd140e254b7959c7a3ccef5b30b6dad Mon Sep 17 00:00:00 2001 +From 33beaa1f1eca62c989c590808b99c55ea0b61944 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 4280fdf80..6a36c4467 100644 +index 032419155..177ea8f4c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1049,12 +1049,13 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0383-Add-Heightmap-API.patch b/Spigot-Server-Patches/0382-Add-Heightmap-API.patch similarity index 96% rename from Spigot-Server-Patches/0383-Add-Heightmap-API.patch rename to Spigot-Server-Patches/0382-Add-Heightmap-API.patch index cc6adfa7f..e06eb2b90 100644 --- a/Spigot-Server-Patches/0383-Add-Heightmap-API.patch +++ b/Spigot-Server-Patches/0382-Add-Heightmap-API.patch @@ -1,11 +1,11 @@ -From 7f663a3b842b9aa8cc50b9841270f995e40c3d03 Mon Sep 17 00:00:00 2001 +From 755a168f7205e572a96c24a9f3c6838d9934d5c0 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 6a36c4467..d4789478b 100644 +index 177ea8f4c..a12964f90 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -625,8 +625,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0384-Handle-bad-chunks-more-gracefully.patch b/Spigot-Server-Patches/0383-Handle-bad-chunks-more-gracefully.patch similarity index 96% rename from Spigot-Server-Patches/0384-Handle-bad-chunks-more-gracefully.patch rename to Spigot-Server-Patches/0383-Handle-bad-chunks-more-gracefully.patch index 1859b0e20..a5a7ae52b 100644 --- a/Spigot-Server-Patches/0384-Handle-bad-chunks-more-gracefully.patch +++ b/Spigot-Server-Patches/0383-Handle-bad-chunks-more-gracefully.patch @@ -1,4 +1,4 @@ -From 621fec7667224efd7d2c9c75fc25d5220c810714 Mon Sep 17 00:00:00 2001 +From 6cc9dca44a2a2be130d0382b38f35f4de8109f7f 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 @@ -15,7 +15,7 @@ Should Mojang choose to alter this behavior in the future, this change will simply defer to whatever that new behavior is. diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index 3f7190b6a..844f491c7 100644 +index c53518a47..6f34d8aea 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -171,8 +171,21 @@ public abstract class RegionFileCache implements AutoCloseable { diff --git a/Spigot-Server-Patches/0385-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0384-Mob-Spawner-API-Enhancements.patch similarity index 98% rename from Spigot-Server-Patches/0385-Mob-Spawner-API-Enhancements.patch rename to Spigot-Server-Patches/0384-Mob-Spawner-API-Enhancements.patch index 809e934cc..874e2c4c1 100644 --- a/Spigot-Server-Patches/0385-Mob-Spawner-API-Enhancements.patch +++ b/Spigot-Server-Patches/0384-Mob-Spawner-API-Enhancements.patch @@ -1,4 +1,4 @@ -From c596f9df47e0204ca49538a3b3f5d198baaacb6d Mon Sep 17 00:00:00 2001 +From 92a8dc4e7db90a9acd20ad38dda4099a34879bbe 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/0386-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0385-Per-Player-View-Distance-API-placeholders.patch similarity index 96% rename from Spigot-Server-Patches/0386-Per-Player-View-Distance-API-placeholders.patch rename to Spigot-Server-Patches/0385-Per-Player-View-Distance-API-placeholders.patch index c5d5a2678..ff766136c 100644 --- a/Spigot-Server-Patches/0386-Per-Player-View-Distance-API-placeholders.patch +++ b/Spigot-Server-Patches/0385-Per-Player-View-Distance-API-placeholders.patch @@ -1,4 +1,4 @@ -From 482f1ab8fa309232376ebeff7361a705adaa26bb Mon Sep 17 00:00:00 2001 +From 5103d96bf5b9c496d660dde0fc819f73243cc19a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 6 May 2019 01:29:25 -0400 Subject: [PATCH] Per-Player View Distance API placeholders @@ -7,7 +7,7 @@ I hope to look at this more in-depth soon. It appears doable. However this should not block the update. diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 9ada10cc7..5751d39e0 100644 +index 2b39115c9..a248f63f1 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -570,9 +570,9 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -23,7 +23,7 @@ index 9ada10cc7..5751d39e0 100644 double deltaX = this.locX - player.locX; double deltaZ = this.locZ - player.locZ; diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index 48b22894a..dbd854206 100644 +index e3feb39ad..5609fcfe0 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -208,9 +208,9 @@ public class EntityWither extends EntityMonster implements IRangedEntity { diff --git a/Spigot-Server-Patches/0387-Async-Chunk-placeholder.patch b/Spigot-Server-Patches/0386-Async-Chunk-placeholder.patch similarity index 97% rename from Spigot-Server-Patches/0387-Async-Chunk-placeholder.patch rename to Spigot-Server-Patches/0386-Async-Chunk-placeholder.patch index 29813f7cb..38a8d1797 100644 --- a/Spigot-Server-Patches/0387-Async-Chunk-placeholder.patch +++ b/Spigot-Server-Patches/0386-Async-Chunk-placeholder.patch @@ -1,4 +1,4 @@ -From a435fc5184fe7389b693cffe4966ba92f758b737 Mon Sep 17 00:00:00 2001 +From 48e095c9022c5b4cec520ed144dff31443494f12 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 6 May 2019 12:29:24 -0700 Subject: [PATCH] Async Chunk placeholder diff --git a/Spigot-Server-Patches/0388-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0387-Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 88% rename from Spigot-Server-Patches/0388-Fix-CB-call-to-changed-postToMainThread-method.patch rename to Spigot-Server-Patches/0387-Fix-CB-call-to-changed-postToMainThread-method.patch index 8dfcbfe8a..3db1e7618 100644 --- a/Spigot-Server-Patches/0388-Fix-CB-call-to-changed-postToMainThread-method.patch +++ b/Spigot-Server-Patches/0387-Fix-CB-call-to-changed-postToMainThread-method.patch @@ -1,11 +1,11 @@ -From 03bf5c7b4e5227f828b28a61cc0013a9f0809db7 Mon Sep 17 00:00:00 2001 +From 48110a346d4469552122af301007a9ff22d190e4 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 10 May 2019 18:38:19 +0100 Subject: [PATCH] Fix CB call to changed postToMainThread method diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 5b4576388..e517e9f9f 100644 +index f3f6fa1c4..01c268a58 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -282,7 +282,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0389-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0388-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 94% rename from Spigot-Server-Patches/0389-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to Spigot-Server-Patches/0388-Fix-sounds-when-item-frames-are-modified-MC-123450.patch index d7c00dbfe..eb1acb19f 100644 --- a/Spigot-Server-Patches/0389-Fix-sounds-when-item-frames-are-modified-MC-123450.patch +++ b/Spigot-Server-Patches/0388-Fix-sounds-when-item-frames-are-modified-MC-123450.patch @@ -1,4 +1,4 @@ -From f6e6aa4920408febe133917cfc3265a38dae1dab Mon Sep 17 00:00:00 2001 +From 36d1b06a6145bb3141af2e925f7b0c713a95acd2 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 816f7ae6b..3064bce49 100644 +index 3ecdd00a1..aac28bfa3 100644 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java @@ -211,7 +211,7 @@ public class EntityItemFrame extends EntityHanging { diff --git a/Spigot-Server-Patches/0390-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0389-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch similarity index 93% rename from Spigot-Server-Patches/0390-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch rename to Spigot-Server-Patches/0389-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch index 4ddd4a493..65301e1f8 100644 --- a/Spigot-Server-Patches/0390-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch +++ b/Spigot-Server-Patches/0389-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch @@ -1,4 +1,4 @@ -From c5ce9824cf21c2d4a6b994883f062b0c8bd969e4 Mon Sep 17 00:00:00 2001 +From 88ca104557986c026650d02697b9cf3edc962258 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 13 May 2019 21:10:59 -0700 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer @@ -16,7 +16,7 @@ handling that should have been handled synchronously will be handled synchronously when the server gets shut down. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ba68d7f833..f1cd38d421 100644 +index ba68d7f83..f1cd38d42 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1936,7 +1936,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sat, 11 May 2019 08:19:27 -0700 Subject: [PATCH] Elide lock in DataWatcher @@ -17,7 +17,7 @@ of the Entity, the further readlocks are actually useless (which get obtained on set, get, etc calls). diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java -index f224043d8e..bbea8ef726 100644 +index f224043d8..bbea8ef72 100644 --- a/src/main/java/net/minecraft/server/DataWatcher.java +++ b/src/main/java/net/minecraft/server/DataWatcher.java @@ -23,7 +23,7 @@ public class DataWatcher { diff --git a/Spigot-Server-Patches/0392-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0391-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch similarity index 95% rename from Spigot-Server-Patches/0392-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch rename to Spigot-Server-Patches/0391-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch index 2a5f59af0..344115803 100644 --- a/Spigot-Server-Patches/0392-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch +++ b/Spigot-Server-Patches/0391-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch @@ -1,4 +1,4 @@ -From 2febac2e738eccd76915878e85bd91f2a3445bb4 Mon Sep 17 00:00:00 2001 +From 152cb5909a0fb8881db4fac8b71478dada93e1f9 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 @@ -19,7 +19,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/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index c93bf8e8b5..e61381221f 100644 +index c93bf8e8b..e61381221 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -635,7 +635,7 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0393-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0392-Duplicate-UUID-Resolve-Option.patch similarity index 98% rename from Spigot-Server-Patches/0393-Duplicate-UUID-Resolve-Option.patch rename to Spigot-Server-Patches/0392-Duplicate-UUID-Resolve-Option.patch index a65d612cd..7e5db717e 100644 --- a/Spigot-Server-Patches/0393-Duplicate-UUID-Resolve-Option.patch +++ b/Spigot-Server-Patches/0392-Duplicate-UUID-Resolve-Option.patch @@ -1,4 +1,4 @@ -From e59340051a3ce62f821029cde0d969b9dad187c7 Mon Sep 17 00:00:00 2001 +From 5d490a5bfe80403f4e89ac3d6ede504a5eb83103 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jul 2018 14:27:34 -0400 Subject: [PATCH] Duplicate UUID Resolve Option @@ -33,7 +33,7 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA It is recommended you regenerate the entities, as these were legit entities, and deserve your love. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index ef882b897f..385b3ac0ce 100644 +index ef882b897..385b3ac0c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -449,4 +449,43 @@ public class PaperWorldConfig { @@ -81,7 +81,7 @@ index ef882b897f..385b3ac0ce 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 197c0fe169..ef07f665b7 100644 +index 197c0fe16..ef07f665b 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -397,6 +397,7 @@ public class Chunk implements IChunkAccess { @@ -93,7 +93,7 @@ index 197c0fe169..ef07f665b7 100644 int k = MathHelper.floor(entity.locY / 16.0D); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 5711cf6647..fffe26939b 100644 +index 5711cf664..fffe26939 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2674,6 +2674,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -105,7 +105,7 @@ index 5711cf6647..fffe26939b 100644 this.uniqueID = uuid; this.ap = this.uniqueID.toString(); diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 85e9db8f4b..aaa634b888 100644 +index 1362099f1..3fdb6935e 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1,5 +1,6 @@ @@ -194,7 +194,7 @@ index 85e9db8f4b..aaa634b888 100644 if (list != null) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index e61381221f..e9e5ecf747 100644 +index e61381221..e9e5ecf74 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -2,6 +2,8 @@ package net.minecraft.server; diff --git a/Spigot-Server-Patches/0394-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0393-improve-CraftWorld-isChunkLoaded.patch similarity index 91% rename from Spigot-Server-Patches/0394-improve-CraftWorld-isChunkLoaded.patch rename to Spigot-Server-Patches/0393-improve-CraftWorld-isChunkLoaded.patch index f76fe05f9..d7e473ef8 100644 --- a/Spigot-Server-Patches/0394-improve-CraftWorld-isChunkLoaded.patch +++ b/Spigot-Server-Patches/0393-improve-CraftWorld-isChunkLoaded.patch @@ -1,4 +1,4 @@ -From 45d0334a0e2ad547d5ab5d0078c24916b0dda636 Mon Sep 17 00:00:00 2001 +From 03eda436935de6ad94031a531ac8581efcd7f50e Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 21 May 2019 02:34:04 +0100 Subject: [PATCH] improve CraftWorld#isChunkLoaded @@ -9,7 +9,7 @@ waiting for the execution queue to get to our request; We can just query the chunk status and get a response now, vs having to wait diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 63f953617d..c0207694ac 100644 +index 63f953617..c0207694a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -382,8 +382,7 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0395-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0394-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 96% rename from Spigot-Server-Patches/0395-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to Spigot-Server-Patches/0394-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 2fd07acd7..e88966288 100644 --- a/Spigot-Server-Patches/0395-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0394-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From f6d23363d4f8ca3f631628099325e0039dc07cca Mon Sep 17 00:00:00 2001 +From 791552cb7752b4724a1b27e004a6a3c4e300ca54 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world This lets you disable it for some worlds and lower it for others. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 385b3ac0ce..b854061983 100644 +index 385b3ac0c..b85406198 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -488,4 +488,10 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 385b3ac0ce..b854061983 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f1cd38d421..184f1b00f0 100644 +index f1cd38d42..184f1b00f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -570,6 +570,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 24 May 2019 07:53:16 +0100 Subject: [PATCH] Fix some generation concurrency issues diff --git a/src/main/java/net/minecraft/server/DefinedStructureManager.java b/src/main/java/net/minecraft/server/DefinedStructureManager.java -index 6aa0ca3959..ed9b5c63f0 100644 +index 6aa0ca395..ed9b5c63f 100644 --- a/src/main/java/net/minecraft/server/DefinedStructureManager.java +++ b/src/main/java/net/minecraft/server/DefinedStructureManager.java @@ -20,7 +20,7 @@ import org.apache.logging.log4j.Logger; @@ -18,7 +18,7 @@ index 6aa0ca3959..ed9b5c63f0 100644 private final MinecraftServer d; private final java.nio.file.Path e; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a12964f904..7e01731f64 100644 +index a12964f90..7e01731f6 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -101,6 +101,23 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -46,7 +46,7 @@ index a12964f904..7e01731f64 100644 public CraftWorld getWorld() { return this.world; diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java -index eca27e52e9..fb3463fcce 100644 +index eca27e52e..fb3463fcc 100644 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java @@ -10,10 +10,12 @@ import javax.annotation.Nullable; diff --git a/Spigot-Server-Patches/0397-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0396-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch similarity index 93% rename from Spigot-Server-Patches/0397-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch rename to Spigot-Server-Patches/0396-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch index 753985e0c..db4140e47 100644 --- a/Spigot-Server-Patches/0397-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch +++ b/Spigot-Server-Patches/0396-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch @@ -1,4 +1,4 @@ -From f35d09dad58c40e66449cc78b81e80771c5f46c8 Mon Sep 17 00:00:00 2001 +From e8460ab0ab74b393a0d2e6ef99953ef6da5372c3 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 27 May 2019 17:35:39 -0500 Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative @@ -6,7 +6,7 @@ Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative diff --git a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java -index 418c638d31..2eaed1cd63 100644 +index 418c638d3..2eaed1cd6 100644 --- a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java +++ b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java @@ -163,6 +163,12 @@ public class EntityAreaEffectCloud extends Entity { diff --git a/Spigot-Server-Patches/0398-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0397-ChunkMapDistance-CME.patch similarity index 93% rename from Spigot-Server-Patches/0398-ChunkMapDistance-CME.patch rename to Spigot-Server-Patches/0397-ChunkMapDistance-CME.patch index 714edf982..59c7b9429 100644 --- a/Spigot-Server-Patches/0398-ChunkMapDistance-CME.patch +++ b/Spigot-Server-Patches/0397-ChunkMapDistance-CME.patch @@ -1,11 +1,11 @@ -From f48fe8c4496fd1625f481df4d088f8938dde05c3 Mon Sep 17 00:00:00 2001 +From c9ebde9228cf948c411658c987ddeced08df3cb8 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 29 May 2019 04:01:22 +0100 Subject: [PATCH] ChunkMapDistance CME diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java -index ba4b9fa59c..d3c2ad3c40 100644 +index ba4b9fa59..d3c2ad3c4 100644 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java @@ -39,7 +39,7 @@ public abstract class ChunkMapDistance {