From c9fd745840d8b9e6515cbc9996362a03a33fdcdf Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 31 Aug 2019 20:30:44 +0100 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: ff0672ca SPIGOT-5211: Add Raid API CraftBukkit Changes: 96bc85f0 SPIGOT-5298: Remove unexplained 0.1 drop chance offset 6ed8a189 SPIGOT-5290: Invulnerable and/or Marker armor stand triggers EntityDamageEvent 631eaeb0 SPIGOT-5297: PlayerBedLeaveEvent.getBed() returns player location 8d4bc541 SPIGOT-5293: Sponge behaviour differs from Vanilla e91fd75e SPIGOT-5291: Missing event for ravagers trampling crops cbdd7139 SPIGOT-5211: Add Raid API edd8fdfb SPIGOT-5287: Fix rare CME generating new chunks 3fc97f08 SPIGOT-5265: FireworkExplodeEvent only fired when rockets explode in air Spigot Changes: 065a3734 Rebuild patches a5961826 SPIGOT-5286: tick-inactive-villagers invokes the AI for NoAI villagers --- .../0122-Add-EntityZapEvent.patch | 8 ++--- ...8-Add-source-to-PlayerExpChangeEvent.patch | 8 ++--- .../0131-Add-ProjectileCollideEvent.patch | 6 ++-- ...to-control-if-armour-stands-can-move.patch | 8 ++--- .../0139-Firework-API-s.patch | 18 +++++------ ...rovide-E-TE-Chunk-count-stat-methods.patch | 8 ++--- ...PI-for-Reason-Source-Triggering-play.patch | 8 ++--- .../0148-Do-not-let-armorstands-drown.patch | 10 +++--- ...-maximum-exp-value-when-merging-orbs.patch | 6 ++-- .../0191-ExperienceOrbMergeEvent.patch | 6 ++-- ...ld.spawnParticle-API-and-add-Builder.patch | 6 ++-- ...Item-entities-with-World.spawnEntity.patch | 8 ++--- ...ent-consumeArrow-and-getArrowItem-AP.patch | 8 ++--- .../0240-Expand-Explosions-API.patch | 8 ++--- ...4-Implement-World.getEntity-UUID-API.patch | 8 ++--- .../0245-InventoryCloseEvent-Reason-API.patch | 8 ++--- ...1-Vanished-players-don-t-have-rights.patch | 6 ++-- ...ead-Entities-in-entityList-iteration.patch | 12 +++---- .../0275-Add-hand-to-bucket-events.patch | 8 ++--- ...Allow-disabling-armour-stand-ticking.patch | 16 +++++----- ...ets-from-world-player-list-not-serve.patch | 6 ++-- ...loadChunk-int-int-false-load-unconve.patch | 8 ++--- .../0300-Improve-death-events.patch | 32 +++++++++---------- .../0318-Add-sun-related-API.patch | 8 ++--- .../0337-Fix-SpongeAbsortEvent-handling.patch | 10 +++--- .../0376-Add-Heightmap-API.patch | 8 ++--- ...385-improve-CraftWorld-isChunkLoaded.patch | 8 ++--- ...le-Keep-Spawn-Loaded-range-per-world.patch | 6 ++-- ...x-some-generation-concurrency-issues.patch | 21 +++--------- ...394-Fix-World-isChunkGenerated-calls.patch | 10 +++--- ...10-Asynchronous-chunk-IO-and-loading.patch | 12 +++---- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 34 files changed, 148 insertions(+), 161 deletions(-) diff --git a/Spigot-Server-Patches/0122-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0122-Add-EntityZapEvent.patch index 4fc8df587..424afefb9 100644 --- a/Spigot-Server-Patches/0122-Add-EntityZapEvent.patch +++ b/Spigot-Server-Patches/0122-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From 8a82f8ccee640794c614900f956276e5e64cf3f0 Mon Sep 17 00:00:00 2001 +From 336ebd0ca73ac288512ec519770bc0f371b811a7 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:30 -0700 Subject: [PATCH] Add EntityZapEvent @@ -22,7 +22,7 @@ index ee5bfd6f0..7136e274a 100644 if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) { return; diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index ba0386ad4..09d12d1fc 100644 +index 89065deb4..dcd02930d 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -693,6 +693,12 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -39,10 +39,10 @@ index ba0386ad4..09d12d1fc 100644 entitywitch.prepare(this.world, this.world.getDamageScaler(new BlockPosition(entitywitch)), EnumMobSpawn.CONVERSION, (GroupDataEntity) null, (NBTTagCompound) null); entitywitch.setNoAI(this.isNoAI()); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 8a170c77c..562e692b2 100644 +index 4623201ee..aa0048b57 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1009,6 +1009,14 @@ public class CraftEventFactory { +@@ -1018,6 +1018,14 @@ public class CraftEventFactory { return event; } diff --git a/Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch index 2cc9bd82a..aae56d6e3 100644 --- a/Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch @@ -1,4 +1,4 @@ -From c36c80530c089b059444fbfb983937b30010b9d4 Mon Sep 17 00:00:00 2001 +From 4de4e4b1b22b8739b092ced032b1c33414828f9a Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Thu, 8 Sep 2016 08:48:33 -0700 Subject: [PATCH] Add source to PlayerExpChangeEvent @@ -18,10 +18,10 @@ index 332dc0e53..eec6de9ad 100644 this.die(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 562e692b2..e3d1135de 100644 +index aa0048b57..b3939c0f2 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -106,6 +106,7 @@ import org.bukkit.entity.ThrownPotion; +@@ -111,6 +111,7 @@ import org.bukkit.entity.ThrownPotion; import org.bukkit.entity.Vehicle; import org.bukkit.entity.Villager; import org.bukkit.entity.Villager.Profession; @@ -29,7 +29,7 @@ index 562e692b2..e3d1135de 100644 import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.Event.Result; -@@ -968,6 +969,17 @@ public class CraftEventFactory { +@@ -977,6 +978,17 @@ public class CraftEventFactory { return event; } diff --git a/Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch index 87ed5d749..e15d994c0 100644 --- a/Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch +++ b/Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch @@ -1,4 +1,4 @@ -From 52fe7dbe4a7ee6ec1e8f11d21e003e2f0b87b6f5 Mon Sep 17 00:00:00 2001 +From 62cf55a377acc3950a4485dcd2a5389f3096cd6b Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 16 Dec 2016 21:25:39 -0600 Subject: [PATCH] Add ProjectileCollideEvent @@ -93,10 +93,10 @@ index d1710259c..5f0cb4c33 100644 this.c(((MovingObjectPositionBlock) movingobjectposition).getBlockPosition()); } else { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index e3d1135de..a59e35040 100644 +index b3939c0f2..0202c7662 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1113,6 +1113,16 @@ public class CraftEventFactory { +@@ -1122,6 +1122,16 @@ public class CraftEventFactory { return CraftItemStack.asNMSCopy(bitem); } diff --git a/Spigot-Server-Patches/0136-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0136-Add-API-methods-to-control-if-armour-stands-can-move.patch index d99654add..ed766fb84 100644 --- a/Spigot-Server-Patches/0136-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-Server-Patches/0136-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -1,11 +1,11 @@ -From f35ea1e0498c253d3e0d72ed12413b2ca1ea2f5a Mon Sep 17 00:00:00 2001 +From acb6a2a74f23b56bdaa44797acc636ebfec78049 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 21 Dec 2016 11:47:25 -0600 Subject: [PATCH] Add API methods to control if armour stands can move diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 6561dc637..dbc75382a 100644 +index 2e7d966c2..3e78b152f 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -43,6 +43,7 @@ public class EntityArmorStand extends EntityLiving { @@ -16,7 +16,7 @@ index 6561dc637..dbc75382a 100644 public EntityArmorStand(EntityTypes entitytypes, World world) { super(entitytypes, world); -@@ -796,4 +797,13 @@ public class EntityArmorStand extends EntityLiving { +@@ -801,4 +802,13 @@ public class EntityArmorStand extends EntityLiving { return this.getEntityType().k().a(f); } @@ -52,5 +52,5 @@ index 2b66a08ad..124c3185b 100644 + // Paper end } -- -2.22.0 +2.23.0 diff --git a/Spigot-Server-Patches/0139-Firework-API-s.patch b/Spigot-Server-Patches/0139-Firework-API-s.patch index a102e6e8f..effd5fb47 100644 --- a/Spigot-Server-Patches/0139-Firework-API-s.patch +++ b/Spigot-Server-Patches/0139-Firework-API-s.patch @@ -1,11 +1,11 @@ -From 5cc70c7a81386cc66cead409e9f0e90d4ccd07af Mon Sep 17 00:00:00 2001 +From 76db7975abcdafa9fcfec1b5448d2bde8f9b4cff Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 28 Dec 2016 07:18:33 +0100 Subject: [PATCH] Firework API's diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java -index fd3897c056..3cf3b1c174 100644 +index 8f4116cde..dbbb96ac5 100644 --- a/src/main/java/net/minecraft/server/EntityFireworks.java +++ b/src/main/java/net/minecraft/server/EntityFireworks.java @@ -3,6 +3,8 @@ package net.minecraft.server; @@ -27,7 +27,7 @@ index fd3897c056..3cf3b1c174 100644 public EntityFireworks(EntityTypes entitytypes, World world) { super(entitytypes, world); -@@ -263,6 +266,11 @@ public class EntityFireworks extends Entity implements IProjectile { +@@ -271,6 +274,11 @@ public class EntityFireworks extends Entity implements IProjectile { } nbttagcompound.setBoolean("ShotAtAngle", (Boolean) this.datawatcher.get(EntityFireworks.d)); @@ -39,7 +39,7 @@ index fd3897c056..3cf3b1c174 100644 } @Override -@@ -278,7 +286,11 @@ public class EntityFireworks extends Entity implements IProjectile { +@@ -286,7 +294,11 @@ public class EntityFireworks extends Entity implements IProjectile { if (nbttagcompound.hasKey("ShotAtAngle")) { this.datawatcher.set(EntityFireworks.d, nbttagcompound.getBoolean("ShotAtAngle")); } @@ -53,7 +53,7 @@ index fd3897c056..3cf3b1c174 100644 @Override diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java -index 28d7fdeef8..874d9f500e 100644 +index 28d7fdeef..874d9f500 100644 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java @@ -199,6 +199,7 @@ public class ItemCrossbow extends ItemProjectileWeapon { @@ -65,7 +65,7 @@ index 28d7fdeef8..874d9f500e 100644 object = a(world, entityliving, itemstack, itemstack1); if (flag || f3 != 0.0F) { diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java -index 37caa79cba..aea46ffae5 100644 +index 37caa79cb..aea46ffae 100644 --- a/src/main/java/net/minecraft/server/ItemFireworks.java +++ b/src/main/java/net/minecraft/server/ItemFireworks.java @@ -17,6 +17,7 @@ public class ItemFireworks extends Item { @@ -90,7 +90,7 @@ index 37caa79cba..aea46ffae5 100644 itemstack.subtract(1); } diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java -index 3f6d2676e7..b1fd18151b 100644 +index 3f6d2676e..b1fd18151 100644 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java @@ -112,7 +112,7 @@ public class NBTTagCompound implements NBTBase { @@ -103,7 +103,7 @@ index 3f6d2676e7..b1fd18151b 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java -index d3cbad9a5c..219a1e4c0d 100644 +index d3cbad9a5..219a1e4c0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java @@ -2,6 +2,7 @@ package org.bukkit.craftbukkit.entity; @@ -145,5 +145,5 @@ index d3cbad9a5c..219a1e4c0d 100644 + // Paper end } -- -2.22.0 +2.23.0 diff --git a/Spigot-Server-Patches/0141-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0141-Provide-E-TE-Chunk-count-stat-methods.patch index 36ded7bea..a7fa78902 100644 --- a/Spigot-Server-Patches/0141-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/Spigot-Server-Patches/0141-Provide-E-TE-Chunk-count-stat-methods.patch @@ -1,4 +1,4 @@ -From 5d5f94cde1d2c983ddce06a462201aec17641069 Mon Sep 17 00:00:00 2001 +From e611d31aee9dacc9acc8871e1a1df9d403f941aa Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:24:46 -0500 Subject: [PATCH] Provide E/TE/Chunk count stat methods @@ -7,10 +7,10 @@ Provides counts without the ineffeciency of using .getEntities().size() which creates copy of the collections. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 13f2dbdd6..2087a38a2 100644 +index a5abc0717..75a3a8a88 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -271,6 +271,48 @@ public class CraftWorld implements World { +@@ -273,6 +273,48 @@ public class CraftWorld implements World { private int waterAnimalSpawn = -1; private int ambientSpawn = -1; @@ -60,5 +60,5 @@ index 13f2dbdd6..2087a38a2 100644 public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) { -- -2.22.0 +2.23.0 diff --git a/Spigot-Server-Patches/0144-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0144-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index ac9865d63..d8de711b8 100644 --- a/Spigot-Server-Patches/0144-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-Server-Patches/0144-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -1,4 +1,4 @@ -From af6b0e1caa5ecd670c1e88b8ee4f1a3161b4d2e1 Mon Sep 17 00:00:00 2001 +From c3b79911080cb54b76b5fa9fe4008855c258b7aa Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:31:46 -0500 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player @@ -187,7 +187,7 @@ index 25c7214de..594cc70de 100644 } diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 09d12d1fc..a4033a666 100644 +index dcd02930d..8a5127c5d 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -504,7 +504,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -265,10 +265,10 @@ index 0cb2e6d87..2bbd3663a 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 5b48bbdfb..75f5e752c 100644 +index 75a3a8a88..8798ecae3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1711,7 +1711,7 @@ public class CraftWorld implements World { +@@ -1713,7 +1713,7 @@ public class CraftWorld implements World { } else if (TNTPrimed.class.isAssignableFrom(clazz)) { entity = new EntityTNTPrimed(world, x, y, z, null); } else if (ExperienceOrb.class.isAssignableFrom(clazz)) { diff --git a/Spigot-Server-Patches/0148-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0148-Do-not-let-armorstands-drown.patch index 13ba04d5a..2aac8c92e 100644 --- a/Spigot-Server-Patches/0148-Do-not-let-armorstands-drown.patch +++ b/Spigot-Server-Patches/0148-Do-not-let-armorstands-drown.patch @@ -1,14 +1,14 @@ -From adba45d168b214c08095f750fe909b28608806b4 Mon Sep 17 00:00:00 2001 +From 2f2e638edbbacbf9356bc1679b56ac781e14df12 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 18 Feb 2017 19:29:58 -0600 Subject: [PATCH] Do not let armorstands drown diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index dbc75382a..f7e593afe 100644 +index 3e78b152f..9e6633a1b 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java -@@ -805,5 +805,10 @@ public class EntityArmorStand extends EntityLiving { +@@ -810,5 +810,10 @@ public class EntityArmorStand extends EntityLiving { super.move(moveType, vec3d); } } @@ -20,7 +20,7 @@ index dbc75382a..f7e593afe 100644 // Paper end } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 537781e29..abd96b2c4 100644 +index 79edb3b3c..a016cbb21 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -223,6 +223,7 @@ public abstract class EntityLiving extends Entity { @@ -41,5 +41,5 @@ index 537781e29..abd96b2c4 100644 if (this.getAirTicks() == -20) { this.setAirTicks(0); -- -2.22.0 +2.23.0 diff --git a/Spigot-Server-Patches/0183-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0183-Option-for-maximum-exp-value-when-merging-orbs.patch index 54004523c..adc433cb0 100644 --- a/Spigot-Server-Patches/0183-Option-for-maximum-exp-value-when-merging-orbs.patch +++ b/Spigot-Server-Patches/0183-Option-for-maximum-exp-value-when-merging-orbs.patch @@ -1,4 +1,4 @@ -From 4818fe6917efb325af39b9b2b6a14128c75e1621 Mon Sep 17 00:00:00 2001 +From 7b7485a91475522cb0fe168bb65e6ec55c1caab6 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 10 Nov 2017 23:03:12 -0500 Subject: [PATCH] Option for maximum exp value when merging orbs @@ -20,10 +20,10 @@ index 4d0d4cbe4..b3d8fe9c6 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index a59e35040..81c0c8cf7 100644 +index 0202c7662..5257941e9 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -528,16 +528,32 @@ public class CraftEventFactory { +@@ -537,16 +537,32 @@ public class CraftEventFactory { EntityExperienceOrb xp = (EntityExperienceOrb) entity; double radius = world.spigotConfig.expMerge; if (radius > 0) { diff --git a/Spigot-Server-Patches/0191-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0191-ExperienceOrbMergeEvent.patch index a13543768..3e087581f 100644 --- a/Spigot-Server-Patches/0191-ExperienceOrbMergeEvent.patch +++ b/Spigot-Server-Patches/0191-ExperienceOrbMergeEvent.patch @@ -1,4 +1,4 @@ -From f05b3edd7d2fe3bf084677bbe89f3ef983118838 Mon Sep 17 00:00:00 2001 +From 782fe85c988f7dff4bd866321a742aad5865e93d Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:57:26 -0500 Subject: [PATCH] ExperienceOrbMergeEvent @@ -8,10 +8,10 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor metadata such as spawn reason, or conditionally move data from source to target. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 81c0c8cf7..95a0364f3 100644 +index 5257941e9..489943410 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -538,7 +538,7 @@ public class CraftEventFactory { +@@ -547,7 +547,7 @@ public class CraftEventFactory { if (e instanceof EntityExperienceOrb) { EntityExperienceOrb loopItem = (EntityExperienceOrb) e; // Paper start diff --git a/Spigot-Server-Patches/0222-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0222-Expand-World.spawnParticle-API-and-add-Builder.patch index d8be830a1..425bc8d52 100644 --- a/Spigot-Server-Patches/0222-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-Server-Patches/0222-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -1,4 +1,4 @@ -From 3d5c1c4a2c091d1c649e9c7756ecc8b7942b1d28 Mon Sep 17 00:00:00 2001 +From 13bd7215a2ea91d0707bf7c417287ac9679de28c Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 15 Aug 2017 22:29:12 -0400 Subject: [PATCH] Expand World.spawnParticle API and add Builder @@ -43,10 +43,10 @@ index 594401c39..cbabe7743 100644 if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 75f5e752c..a0c5f7f91 100644 +index 8798ecae3..16de4efef 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2177,11 +2177,17 @@ public class CraftWorld implements World { +@@ -2179,11 +2179,17 @@ public class CraftWorld implements World { @Override public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) { diff --git a/Spigot-Server-Patches/0226-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0226-Allow-spawning-Item-entities-with-World.spawnEntity.patch index dfeb0503b..9f5478489 100644 --- a/Spigot-Server-Patches/0226-Allow-spawning-Item-entities-with-World.spawnEntity.patch +++ b/Spigot-Server-Patches/0226-Allow-spawning-Item-entities-with-World.spawnEntity.patch @@ -1,4 +1,4 @@ -From 030a17b8b5f1d5b6abd32d88f1fd26fa4ac3f52d Mon Sep 17 00:00:00 2001 +From f498a1a83a6ead6408383a780c51342aa5b78e71 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 Jun 2018 20:39:20 -0400 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity @@ -8,10 +8,10 @@ This API has more capabilities than .dropItem with the Consumer function Item can be set inside of the Consumer pre spawn function. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index a0c5f7f91..2fac4462d 100644 +index 16de4efef..00ce2fecf 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1405,6 +1405,10 @@ public class CraftWorld implements World { +@@ -1407,6 +1407,10 @@ public class CraftWorld implements World { if (Boat.class.isAssignableFrom(clazz)) { entity = new EntityBoat(world, x, y, z); entity.setPositionRotation(x, y, z, yaw, pitch); @@ -23,5 +23,5 @@ index a0c5f7f91..2fac4462d 100644 entity = new EntityFallingBlock(world, x, y, z, world.getType(new BlockPosition(x, y, z))); } else if (Projectile.class.isAssignableFrom(clazz)) { -- -2.22.0 +2.23.0 diff --git a/Spigot-Server-Patches/0236-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0236-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch index d673efd96..6494bb56f 100644 --- a/Spigot-Server-Patches/0236-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch +++ b/Spigot-Server-Patches/0236-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch @@ -1,4 +1,4 @@ -From b1e611afbfb191ac83c8ef7546facf7951a036f1 Mon Sep 17 00:00:00 2001 +From e7101a32d4ccec5fe80bcf9578bc6abea64e56ec Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 15 Jun 2013 19:51:17 -0400 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API @@ -72,10 +72,10 @@ index 874d9f500..f0d784108 100644 event.getProjectile().remove(); return; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 95a0364f3..d423150ee 100644 +index 489943410..e58dac2c8 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -50,6 +50,7 @@ import net.minecraft.server.GeneratorAccess; +@@ -51,6 +51,7 @@ import net.minecraft.server.GeneratorAccess; import net.minecraft.server.IBlockData; import net.minecraft.server.IChatBaseComponent; import net.minecraft.server.IInventory; @@ -83,7 +83,7 @@ index 95a0364f3..d423150ee 100644 import net.minecraft.server.ItemActionContext; import net.minecraft.server.ItemStack; import net.minecraft.server.Items; -@@ -456,16 +457,16 @@ public class CraftEventFactory { +@@ -465,16 +466,16 @@ public class CraftEventFactory { /** * EntityShootBowEvent */ diff --git a/Spigot-Server-Patches/0240-Expand-Explosions-API.patch b/Spigot-Server-Patches/0240-Expand-Explosions-API.patch index f4c74f6fe..3d2f3fe2e 100644 --- a/Spigot-Server-Patches/0240-Expand-Explosions-API.patch +++ b/Spigot-Server-Patches/0240-Expand-Explosions-API.patch @@ -1,4 +1,4 @@ -From bb27e2b2e5c4fbae7612e8fd0b57e9ba8fc9c731 Mon Sep 17 00:00:00 2001 +From f17bffdb081dd11064ea387f1c03793cd9387d29 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Jun 2018 23:17:24 -0400 Subject: [PATCH] Expand Explosions API @@ -6,10 +6,10 @@ Subject: [PATCH] Expand Explosions API Add Entity as a Source capability, and add more API choices, and on Location. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 26ddf4a6c..61732ae8d 100644 +index 00ce2fecf..50a49f59b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -851,6 +851,11 @@ public class CraftWorld implements World { +@@ -853,6 +853,11 @@ public class CraftWorld implements World { public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks) { return !world.createExplosion(null, x, y, z, power, setFire, breakBlocks ? Explosion.Effect.BREAK : Explosion.Effect.NONE).wasCanceled; } @@ -22,5 +22,5 @@ index 26ddf4a6c..61732ae8d 100644 @Override public boolean createExplosion(Location loc, float power) { -- -2.22.0 +2.23.0 diff --git a/Spigot-Server-Patches/0244-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0244-Implement-World.getEntity-UUID-API.patch index 6a25dd722..ea196ec07 100644 --- a/Spigot-Server-Patches/0244-Implement-World.getEntity-UUID-API.patch +++ b/Spigot-Server-Patches/0244-Implement-World.getEntity-UUID-API.patch @@ -1,14 +1,14 @@ -From 4cad924d4ab368e3962e1c69158bac777bb459b3 Mon Sep 17 00:00:00 2001 +From 22eb50697152295a5a00c5913b72ae16c0d43599 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 3 Jul 2018 16:08:14 +0200 Subject: [PATCH] Implement World.getEntity(UUID) API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index d75ac36aa..5e53ee010 100644 +index 50a49f59b..d57aafb6a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1207,6 +1207,15 @@ public class CraftWorld implements World { +@@ -1209,6 +1209,15 @@ public class CraftWorld implements World { return list; } @@ -25,5 +25,5 @@ index d75ac36aa..5e53ee010 100644 public void save() { org.spigotmc.AsyncCatcher.catchOp("world save"); // Spigot -- -2.22.0 +2.23.0 diff --git a/Spigot-Server-Patches/0245-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0245-InventoryCloseEvent-Reason-API.patch index 469c208dc..4ea41d5be 100644 --- a/Spigot-Server-Patches/0245-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0245-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From e48d87230262abe8b1e90084de518ab0bb3188f8 Mon Sep 17 00:00:00 2001 +From 414ebdf970619b7b3b67ae5b72c3feb24bd2e7fa Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:56:23 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers to "confirm" things based on if it was player triggered close or not. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 5a95fe160..9544039ab 100644 +index e1bd10579..89915b359 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -164,7 +164,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -168,10 +168,10 @@ index e610c8aae..ce35e6bbc 100644 // Check if the fromWorld and toWorld are the same. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index d423150ee..d30392205 100644 +index e58dac2c8..9f39cfa45 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1254,8 +1254,19 @@ public class CraftEventFactory { +@@ -1263,8 +1263,19 @@ public class CraftEventFactory { return event; } diff --git a/Spigot-Server-Patches/0261-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0261-Vanished-players-don-t-have-rights.patch index 7aef6f38e..ab8aca5ad 100644 --- a/Spigot-Server-Patches/0261-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0261-Vanished-players-don-t-have-rights.patch @@ -1,4 +1,4 @@ -From 4f3585c6277c3f8a03a695b37f6e06bafaf46e66 Mon Sep 17 00:00:00 2001 +From 18d0bdedeb33895bbc7a2162f2010607894e8313 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 @@ -129,10 +129,10 @@ index cacc18ca4..c60279da8 100644 public BiomeBase getBiome(BlockPosition blockposition) { IChunkProvider ichunkprovider = this.getChunkProvider(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index d30392205..ea6c538ef 100644 +index 9f39cfa45..f4db17759 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1135,6 +1135,14 @@ public class CraftEventFactory { +@@ -1144,6 +1144,14 @@ public class CraftEventFactory { Projectile projectile = (Projectile) entity.getBukkitEntity(); org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity(); com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided); diff --git a/Spigot-Server-Patches/0268-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0268-Ignore-Dead-Entities-in-entityList-iteration.patch index 8075175fc..ae35ab55d 100644 --- a/Spigot-Server-Patches/0268-Ignore-Dead-Entities-in-entityList-iteration.patch +++ b/Spigot-Server-Patches/0268-Ignore-Dead-Entities-in-entityList-iteration.patch @@ -1,4 +1,4 @@ -From 1a692f9358bd968a46dbb821e0b050731e2de7e0 Mon Sep 17 00:00:00 2001 +From e91de6db766758109c53194621c3b0933fd85bf2 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 @@ -92,10 +92,10 @@ index 281cde519..a0465c85f 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 5e53ee010..766bb4bc1 100644 +index d57aafb6a..1adc71021 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -944,6 +944,7 @@ public class CraftWorld implements World { +@@ -946,6 +946,7 @@ public class CraftWorld implements World { for (Object o : world.entitiesById.values()) { if (o instanceof net.minecraft.server.Entity) { net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o; @@ -103,7 +103,7 @@ index 5e53ee010..766bb4bc1 100644 Entity bukkitEntity = mcEnt.getBukkitEntity(); // Assuming that bukkitEntity isn't null -@@ -963,6 +964,7 @@ public class CraftWorld implements World { +@@ -965,6 +966,7 @@ public class CraftWorld implements World { for (Object o : world.entitiesById.values()) { if (o instanceof net.minecraft.server.Entity) { net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o; @@ -111,7 +111,7 @@ index 5e53ee010..766bb4bc1 100644 Entity bukkitEntity = mcEnt.getBukkitEntity(); // Assuming that bukkitEntity isn't null -@@ -989,6 +991,7 @@ public class CraftWorld implements World { +@@ -991,6 +993,7 @@ public class CraftWorld implements World { for (Object entity: world.entitiesById.values()) { if (entity instanceof net.minecraft.server.Entity) { @@ -119,7 +119,7 @@ index 5e53ee010..766bb4bc1 100644 Entity bukkitEntity = ((net.minecraft.server.Entity) entity).getBukkitEntity(); if (bukkitEntity == null) { -@@ -1012,6 +1015,7 @@ public class CraftWorld implements World { +@@ -1014,6 +1017,7 @@ public class CraftWorld implements World { for (Object entity: world.entitiesById.values()) { if (entity instanceof net.minecraft.server.Entity) { diff --git a/Spigot-Server-Patches/0275-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0275-Add-hand-to-bucket-events.patch index 8cd1ef847..328f08c10 100644 --- a/Spigot-Server-Patches/0275-Add-hand-to-bucket-events.patch +++ b/Spigot-Server-Patches/0275-Add-hand-to-bucket-events.patch @@ -1,4 +1,4 @@ -From 6eb6609e2c631380c8754d9fa87aac479ab51b7a Mon Sep 17 00:00:00 2001 +From f182bbf69fb73125d9db3e0c098654b2946e1d8c 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 @@ -67,10 +67,10 @@ index 59e239e9d..91ff811d8 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 ea6c538ef..d9679f77c 100644 +index f4db17759..e22389457 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -360,6 +360,21 @@ public class CraftEventFactory { +@@ -369,6 +369,21 @@ public class CraftEventFactory { private static PlayerEvent getPlayerBucketEvent(boolean isFilling, World world, EntityHuman who, BlockPosition changed, BlockPosition clicked, EnumDirection clickedFace, ItemStack itemstack, net.minecraft.server.Item item) { Player player = (Player) who.getBukkitEntity(); @@ -92,7 +92,7 @@ index ea6c538ef..d9679f77c 100644 CraftItemStack itemInHand = CraftItemStack.asNewCraftStack(item); Material bucket = CraftMagicNumbers.getMaterial(itemstack.getItem()); -@@ -371,10 +386,10 @@ public class CraftEventFactory { +@@ -380,10 +395,10 @@ public class CraftEventFactory { PlayerEvent event; if (isFilling) { diff --git a/Spigot-Server-Patches/0284-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0284-Allow-disabling-armour-stand-ticking.patch index d8e2829a1..a02c8d171 100644 --- a/Spigot-Server-Patches/0284-Allow-disabling-armour-stand-ticking.patch +++ b/Spigot-Server-Patches/0284-Allow-disabling-armour-stand-ticking.patch @@ -1,11 +1,11 @@ -From 71ad58ad5a2f615ecde1edac307a09353bac3826 Mon Sep 17 00:00:00 2001 +From 88841b295d4d86d407a9c4f9dd69b4841c7e58cb 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 09607fb447..5832c3e868 100644 +index 09607fb44..5832c3e86 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -386,4 +386,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 09607fb447..5832c3e868 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 9e7b4f6feb..627925e3ba 100644 +index c04dee058..aa9e69bce 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 { @@ -71,7 +71,7 @@ index 9e7b4f6feb..627925e3ba 100644 NBTTagCompound nbttagcompound1 = nbttagcompound.getCompound("Pose"); this.g(nbttagcompound1); -@@ -584,7 +597,29 @@ public class EntityArmorStand extends EntityLiving { +@@ -589,7 +602,29 @@ public class EntityArmorStand extends EntityLiving { @Override public void tick() { @@ -101,7 +101,7 @@ index 9e7b4f6feb..627925e3ba 100644 Vector3f vector3f = (Vector3f) this.datawatcher.get(EntityArmorStand.c); if (!this.headPose.equals(vector3f)) { -@@ -707,31 +742,37 @@ public class EntityArmorStand extends EntityLiving { +@@ -712,31 +747,37 @@ public class EntityArmorStand extends EntityLiving { public void setHeadPose(Vector3f vector3f) { this.headPose = vector3f; this.datawatcher.set(EntityArmorStand.c, vector3f); @@ -140,7 +140,7 @@ index 9e7b4f6feb..627925e3ba 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 e1972f7935..dbf42f882f 100644 +index e1972f793..dbf42f882 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2266,52 +2266,7 @@ public abstract class EntityLiving extends Entity { @@ -256,7 +256,7 @@ index e1972f7935..dbf42f882f 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 { @@ -276,5 +276,5 @@ index 9f5c3b92e3..07ce93f17c 100644 // Paper end } -- -2.22.0 +2.23.0 diff --git a/Spigot-Server-Patches/0286-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0286-Send-nearby-packets-from-world-player-list-not-serve.patch index aeecdf40c..ba176f812 100644 --- a/Spigot-Server-Patches/0286-Send-nearby-packets-from-world-player-list-not-serve.patch +++ b/Spigot-Server-Patches/0286-Send-nearby-packets-from-world-player-list-not-serve.patch @@ -1,4 +1,4 @@ -From 41148d70a24ea6d749e0cd2d771950bbbd743531 Mon Sep 17 00:00:00 2001 +From 868e01ec8a8ef2b709271eb8ad7bc05166bd876a 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 @@ -68,10 +68,10 @@ index a0465c85f..55d469e37 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 766bb4bc1..88186aac8 100644 +index 1adc71021..d74ec389a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2012,7 +2012,7 @@ public class CraftWorld implements World { +@@ -2014,7 +2014,7 @@ public class CraftWorld implements World { double z = loc.getZ(); PacketPlayOutCustomSoundEffect packet = new PacketPlayOutCustomSoundEffect(new MinecraftKey(sound), SoundCategory.valueOf(category.name()), new Vec3D(x, y, z), volume, pitch); diff --git a/Spigot-Server-Patches/0297-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0297-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch index 0aee16bbf..09fc97307 100644 --- a/Spigot-Server-Patches/0297-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch +++ b/Spigot-Server-Patches/0297-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch @@ -1,4 +1,4 @@ -From 5a13dc15364bbaa85ab22e5e84b53db16e953ed1 Mon Sep 17 00:00:00 2001 +From c3d01d0c1a1da22dca1cc88fa0cc6457e4227e93 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 @@ -6,10 +6,10 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 80d75bf02..35266e22e 100644 +index d74ec389a..c0dca07b6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -496,7 +496,7 @@ public class CraftWorld implements World { +@@ -498,7 +498,7 @@ public class CraftWorld implements World { @Override public boolean loadChunk(int x, int z, boolean generate) { org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot @@ -19,5 +19,5 @@ index 80d75bf02..35266e22e 100644 // If generate = false, but the chunk already exists, we will get this back. if (chunk instanceof ProtoChunkExtension) { -- -2.22.0 +2.23.0 diff --git a/Spigot-Server-Patches/0300-Improve-death-events.patch b/Spigot-Server-Patches/0300-Improve-death-events.patch index 698e8da4e..1207205b5 100644 --- a/Spigot-Server-Patches/0300-Improve-death-events.patch +++ b/Spigot-Server-Patches/0300-Improve-death-events.patch @@ -1,4 +1,4 @@ -From 11a05d88ac3b775120ee4c8319d2c249400e45f2 Mon Sep 17 00:00:00 2001 +From 808e7819999eaa9241cb08623263349328435165 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 7811beb807..f9b097fd6f 100644 +index 7811beb80..f9b097fd6 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1517,6 +1517,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -47,10 +47,10 @@ index 7811beb807..f9b097fd6f 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 627925e3ba..e516db2701 100644 +index aa9e69bce..75ac07537 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java -@@ -683,7 +683,8 @@ public class EntityArmorStand extends EntityLiving { +@@ -688,7 +688,8 @@ public class EntityArmorStand extends EntityLiving { @Override public void killEntity() { @@ -61,7 +61,7 @@ index 627925e3ba..e516db2701 100644 } diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java -index 85231309fd..1da2f013fc 100644 +index e22e99df3..ca38ccf76 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 85231309fd..1da2f013fc 100644 public static boolean a(EntityFox entityfox, EntityLiving entityliving) { diff --git a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java -index 2483cfd28a..2a988366cd 100644 +index 2483cfd28..2a988366c 100644 --- a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java @@ -55,11 +55,19 @@ public abstract class EntityHorseChestedAbstract extends EntityHorseAbstract { @@ -119,7 +119,7 @@ index 2483cfd28a..2a988366cd 100644 public void b(NBTTagCompound nbttagcompound) { super.b(nbttagcompound); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index b09712ca91..1e53af2cce 100644 +index b09712ca9..1e53af2cc 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 { @@ -273,7 +273,7 @@ index b09712ca91..1e53af2cce 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 dcd48d8b3d..d7bc6e3297 100644 +index 7e37164c0..1b35e6c47 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 { @@ -324,7 +324,7 @@ index dcd48d8b3d..d7bc6e3297 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 { @@ -351,7 +351,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 2c99a1e9df..e9458dc65f 100644 +index 2c99a1e9d..e9458dc65 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1722,7 +1722,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -372,10 +372,10 @@ index 2c99a1e9df..e9458dc65f 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 5309a4e304..4074100c44 100644 +index e22389457..6eee86dc8 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 { +@@ -745,9 +745,16 @@ public class CraftEventFactory { public static EntityDeathEvent callEntityDeathEvent(EntityLiving victim, List drops) { CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity(); EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward()); @@ -392,7 +392,7 @@ index 5309a4e304..4074100c44 100644 victim.expToDrop = event.getDroppedExp(); for (org.bukkit.inventory.ItemStack stack : event.getDrops()) { -@@ -754,8 +761,15 @@ public class CraftEventFactory { +@@ -763,8 +770,15 @@ public class CraftEventFactory { CraftPlayer entity = victim.getBukkitEntity(); PlayerDeathEvent event = new PlayerDeathEvent(entity, drops, victim.getExpReward(), 0, deathMessage); event.setKeepInventory(keepInventory); @@ -408,7 +408,7 @@ index 5309a4e304..4074100c44 100644 victim.keepLevel = event.getKeepLevel(); victim.newLevel = event.getNewLevel(); -@@ -772,6 +786,31 @@ public class CraftEventFactory { +@@ -781,6 +795,31 @@ public class CraftEventFactory { return event; } @@ -441,5 +441,5 @@ index 5309a4e304..4074100c44 100644 * Server methods */ -- -2.22.0 +2.23.0 diff --git a/Spigot-Server-Patches/0318-Add-sun-related-API.patch b/Spigot-Server-Patches/0318-Add-sun-related-API.patch index a6b70bc33..e531477f3 100644 --- a/Spigot-Server-Patches/0318-Add-sun-related-API.patch +++ b/Spigot-Server-Patches/0318-Add-sun-related-API.patch @@ -1,4 +1,4 @@ -From 50b3fb0d0ba696c8beab8c69d65176a992a2f8fa Mon Sep 17 00:00:00 2001 +From 72e4d2214ccb12a300545872fbeef8dfb54e54b8 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 00:54:21 -0500 Subject: [PATCH] Add sun related API @@ -29,10 +29,10 @@ index c60279da8..1c3285f5c 100644 return this.u < 4; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 35266e22e..c3b43783b 100644 +index c0dca07b6..0b891cd0f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -837,6 +837,13 @@ public class CraftWorld implements World { +@@ -839,6 +839,13 @@ public class CraftWorld implements World { } } @@ -63,5 +63,5 @@ index 53c2d154e..56c233872 100644 + // Paper end } -- -2.22.0 +2.23.0 diff --git a/Spigot-Server-Patches/0337-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0337-Fix-SpongeAbsortEvent-handling.patch index 37347beee..e3c2b2f50 100644 --- a/Spigot-Server-Patches/0337-Fix-SpongeAbsortEvent-handling.patch +++ b/Spigot-Server-Patches/0337-Fix-SpongeAbsortEvent-handling.patch @@ -1,4 +1,4 @@ -From 79ed057b17bb20598620f69371aa58c5e00854f9 Mon Sep 17 00:00:00 2001 +From baf72ff0e019bc0e5195cebbd153b519f3ed2711 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 3aa4cb6401..79ed7a7b44 100644 +index f687e86c4..e077359b0 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,10 +19,10 @@ index 3aa4cb6401..79ed7a7b44 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 685a30f3f..9edf937a6 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 { +@@ -115,8 +115,11 @@ public class BlockSponge extends Block { // NOP } else if (material == Material.WATER_PLANT || material == Material.REPLACEABLE_WATER_PLANT) { TileEntity tileentity = iblockdata.getBlock().isTileEntity() ? world.getTileEntity(blockposition2) : null; @@ -37,5 +37,5 @@ index 4e281ce6dd..6a64af71b9 100644 } world.setTypeAndData(blockposition2, block.getHandle(), block.getFlag()); -- -2.22.0 +2.23.0 diff --git a/Spigot-Server-Patches/0376-Add-Heightmap-API.patch b/Spigot-Server-Patches/0376-Add-Heightmap-API.patch index c030d9ac3..bb7febcbd 100644 --- a/Spigot-Server-Patches/0376-Add-Heightmap-API.patch +++ b/Spigot-Server-Patches/0376-Add-Heightmap-API.patch @@ -1,4 +1,4 @@ -From b6785908cc19749b88052d1099b8ef5ab429a620 Mon Sep 17 00:00:00 2001 +From d31426814089ec50b9ef2091354fb28b73ff61d3 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 1 Jan 2019 02:22:01 -0800 Subject: [PATCH] Add Heightmap API @@ -20,10 +20,10 @@ index dd2a9c6e5..e3b4e30e6 100644 if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index c3b43783b..5bb567f0b 100644 +index 0b891cd0f..48365737b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -336,6 +336,29 @@ public class CraftWorld implements World { +@@ -338,6 +338,29 @@ public class CraftWorld implements World { return world.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, new BlockPosition(x, 0, z)).getY(); } @@ -54,5 +54,5 @@ index c3b43783b..5bb567f0b 100644 public Location getSpawnLocation() { BlockPosition spawn = world.getSpawn(); -- -2.22.0 +2.23.0 diff --git a/Spigot-Server-Patches/0385-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0385-improve-CraftWorld-isChunkLoaded.patch index b314fa30c..2b6539a0b 100644 --- a/Spigot-Server-Patches/0385-improve-CraftWorld-isChunkLoaded.patch +++ b/Spigot-Server-Patches/0385-improve-CraftWorld-isChunkLoaded.patch @@ -1,4 +1,4 @@ -From 90d05dc9e70d89f1d55c4f96b06311ab0a7e37a7 Mon Sep 17 00:00:00 2001 +From 867ec51a5786f5870834e23afdc68c9185b05456 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,10 +9,10 @@ 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 91b65fde05..b6ca8a9e94 100644 +index 48365737b..67f0f9a89 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -400,14 +400,13 @@ public class CraftWorld implements World { +@@ -402,14 +402,13 @@ public class CraftWorld implements World { @Override public boolean isChunkLoaded(int x, int z) { @@ -30,5 +30,5 @@ index 91b65fde05..b6ca8a9e94 100644 throw new RuntimeException(ex); } -- -2.22.1 +2.23.0 diff --git a/Spigot-Server-Patches/0386-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0386-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 157e680ae..ea3433289 100644 --- a/Spigot-Server-Patches/0386-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0386-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From 913c2e4cbc7dce4c56d2efea4869acac83b227e6 Mon Sep 17 00:00:00 2001 +From 0a2f16aa2502f4b1b923430bfe2bb3207be3d516 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 @@ -196,10 +196,10 @@ index 0f8f54d8e..8a3124fed 100644 public LongSet getForceLoadedChunks() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index b6ca8a9e9..3948de467 100644 +index 67f0f9a89..c49b74c68 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1850,15 +1850,21 @@ public class CraftWorld implements World { +@@ -1852,15 +1852,21 @@ public class CraftWorld implements World { @Override public void setKeepSpawnInMemory(boolean keepLoaded) { diff --git a/Spigot-Server-Patches/0387-Fix-some-generation-concurrency-issues.patch b/Spigot-Server-Patches/0387-Fix-some-generation-concurrency-issues.patch index fddd2f559..3b44f6f0c 100644 --- a/Spigot-Server-Patches/0387-Fix-some-generation-concurrency-issues.patch +++ b/Spigot-Server-Patches/0387-Fix-some-generation-concurrency-issues.patch @@ -1,24 +1,11 @@ -From 7ba63ef522932812bb156de4d28dfde7336b6872 Mon Sep 17 00:00:00 2001 +From b5f68bce15b03752bc7ceca98de47efcb5fe6468 Mon Sep 17 00:00:00 2001 From: Shane Freeder 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 8ecbd945c2..fec41a142f 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; - public class DefinedStructureManager implements IResourcePackListener { - - private static final Logger LOGGER = LogManager.getLogger(); -- private final Map b = Maps.newHashMap(); -+ private final Map b = Maps.newConcurrentMap(); // Paper - private final DataFixer c; - 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 e3b4e30e65..10c149faec 100644 +index e3b4e30e6..10c149fae 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 +33,7 @@ index e3b4e30e65..10c149faec 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 ddf7268676..c2188ceef1 100644 +index ddf726867..c2188ceef 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; @@ -209,5 +196,5 @@ index ddf7268676..c2188ceef1 100644 } } -- -2.22.1 +2.23.0 diff --git a/Spigot-Server-Patches/0394-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0394-Fix-World-isChunkGenerated-calls.patch index aa779b923..c428a6ae4 100644 --- a/Spigot-Server-Patches/0394-Fix-World-isChunkGenerated-calls.patch +++ b/Spigot-Server-Patches/0394-Fix-World-isChunkGenerated-calls.patch @@ -1,4 +1,4 @@ -From 512506f02da806b43410269c54caa4164b192188 Mon Sep 17 00:00:00 2001 +From 431147e9f64a4ffe67f25ed2dfdccf8469e92ff0 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 15 Jun 2019 08:54:33 -0700 Subject: [PATCH] Fix World#isChunkGenerated calls @@ -279,7 +279,7 @@ index 6f34d8aea..d2b328945 100644 printOversizedLog("ChunkTooLarge even after reduction. Trying in overzealous mode.", regionfile.file, chunkX, chunkZ); // Eek, major fail. We have retry logic, so reduce threshholds and fall back diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 3948de467..20e9fd8a7 100644 +index c49b74c68..088f0800f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -18,6 +18,7 @@ import java.util.Objects; @@ -288,9 +288,9 @@ index 3948de467..20e9fd8a7 100644 import java.util.UUID; +import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; + import java.util.stream.Collectors; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; - import it.unimi.dsi.fastutil.objects.ObjectSortedSet; -@@ -405,8 +406,22 @@ public class CraftWorld implements World { +@@ -407,8 +408,22 @@ public class CraftWorld implements World { @Override public boolean isChunkGenerated(int x, int z) { @@ -314,7 +314,7 @@ index 3948de467..20e9fd8a7 100644 } catch (IOException ex) { throw new RuntimeException(ex); } -@@ -518,20 +533,49 @@ public class CraftWorld implements World { +@@ -520,20 +535,49 @@ public class CraftWorld implements World { @Override public boolean loadChunk(int x, int z, boolean generate) { org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot diff --git a/Spigot-Server-Patches/0410-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0410-Asynchronous-chunk-IO-and-loading.patch index a7e95ee6e..8ea850f0e 100644 --- a/Spigot-Server-Patches/0410-Asynchronous-chunk-IO-and-loading.patch +++ b/Spigot-Server-Patches/0410-Asynchronous-chunk-IO-and-loading.patch @@ -1,4 +1,4 @@ -From 5f7499a5fbc7f2e64fae45fa52bf74839749267a Mon Sep 17 00:00:00 2001 +From ff18dd64465a554b12f1a701bbcce73a9d91074c Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 13 Jul 2019 09:23:10 -0700 Subject: [PATCH] Asynchronous chunk IO and loading @@ -3638,7 +3638,7 @@ index 316959064..0e98b7803 100644 HAS_SPACE(VillagePlaceRecord::d), IS_OCCUPIED(VillagePlaceRecord::e), ANY((villageplacerecord) -> { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 4497f6a60..cf981632c 100644 +index f1ad7be75..0c1f4e6e1 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -78,6 +78,79 @@ public class WorldServer extends World { @@ -3731,10 +3731,10 @@ index 4497f6a60..cf981632c 100644 public void doTick(BooleanSupplier booleansupplier) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 20e9fd8a7..0e98f0022 100644 +index 088f0800f..5e552029a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -551,22 +551,23 @@ public class CraftWorld implements World { +@@ -553,22 +553,23 @@ public class CraftWorld implements World { return true; } @@ -3766,8 +3766,8 @@ index 20e9fd8a7..0e98f0022 100644 // fall through to load // we do this so we do not re-read the chunk data on disk -@@ -2306,6 +2307,25 @@ public class CraftWorld implements World { - return (nearest == null) ? null : new Location(this, nearest.getX(), nearest.getY(), nearest.getZ()); +@@ -2324,6 +2325,25 @@ public class CraftWorld implements World { + return persistentRaid.a.values().stream().map(CraftRaid::new).collect(Collectors.toList()); } + // Paper start diff --git a/work/Bukkit b/work/Bukkit index e970fd727..ff0672ca6 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit e970fd7273a9408f0207bfc9da7add4ecb801017 +Subproject commit ff0672ca667beac3622f9efca9a0d701afcc94c7 diff --git a/work/CraftBukkit b/work/CraftBukkit index b2bcde89d..96bc85f0b 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit b2bcde89d9267709f81fda53afa7cd3d7204c7b6 +Subproject commit 96bc85f0b45e4f9150903a46e4a062ecc0501cc9 diff --git a/work/Spigot b/work/Spigot index 798ea6ab8..065a3734e 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 798ea6ab892b769b5ba354bc1c1170ad934080bc +Subproject commit 065a3734e85cc81787512247ef77a3a474b67f1b