From b61aec52a4004d19895afcb7e45c095d41fb9e0f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 25 Jun 2017 18:00:32 -0500 Subject: [PATCH] Update upstream B/CB --- ...working-with-arrows-stuck-in-living-.patch | 8 +- Spigot-Server-Patches/0006-Timings-v2.patch | 74 +++++++++---------- .../0037-Disable-explosion-knockback.patch | 12 +-- ...working-with-arrows-stuck-in-living-.patch | 6 +- ...8-Custom-replacement-for-eaten-items.patch | 10 +-- ...th-absorb-values-and-repair-bad-data.patch | 14 ++-- ...ityRegainHealthEvent-isFastRegen-API.patch | 10 +-- .../0143-Toggleable-Elytra-Wall-Damage.patch | 12 +-- .../0200-Cap-Entity-Collisions.patch | 12 +-- .../0205-Do-not-let-armorstands-drown.patch | 12 +-- ...PlayerPickupItemEvent-setFlyAtPlayer.patch | 8 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 13 files changed, 91 insertions(+), 91 deletions(-) diff --git a/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 1bf4594db..19670f48b 100644 --- a/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,14 +1,14 @@ -From 303cfe3bc6d7b8af240cfde20784cbdfaee21c8e Mon Sep 17 00:00:00 2001 +From 5ef20af4d2a072437de748eaa6e247164cc4254e Mon Sep 17 00:00:00 2001 From: mrapple Date: Sun, 25 Nov 2012 13:47:27 -0600 Subject: [PATCH] Add methods for working with arrows stuck in living entities diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 5423af84..bbf09c75 100644 +index fc41a43d..d6597ca7 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -391,4 +391,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti +@@ -389,4 +389,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti * @return collision status */ boolean isCollidable(); @@ -29,5 +29,5 @@ index 5423af84..bbf09c75 100644 + // Paper end } -- -2.11.0 +2.13.0 diff --git a/Spigot-Server-Patches/0006-Timings-v2.patch b/Spigot-Server-Patches/0006-Timings-v2.patch index 054191671..e7f6668e8 100644 --- a/Spigot-Server-Patches/0006-Timings-v2.patch +++ b/Spigot-Server-Patches/0006-Timings-v2.patch @@ -1,4 +1,4 @@ -From 5979879916b84a6f957e27e246095631dd0c686e Mon Sep 17 00:00:00 2001 +From 35ea7e4784570de2a846da831771238800f715d0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java new file mode 100644 -index 00000000..1b33390d +index 000000000..1b33390de --- /dev/null +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -0,0 +1,125 @@ @@ -137,7 +137,7 @@ index 00000000..1b33390d +} diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java new file mode 100644 -index 00000000..089154f6 +index 000000000..089154f62 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java @@ -0,0 +1,131 @@ @@ -274,7 +274,7 @@ index 00000000..089154f6 +} diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java new file mode 100644 -index 00000000..e7789117 +index 000000000..e7789117b --- /dev/null +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java @@ -0,0 +1,101 @@ @@ -380,7 +380,7 @@ index 00000000..e7789117 + } +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 5ab2cf6e..b5795b6d 100644 +index 5ab2cf6ee..b5795b6d3 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit; @@ -424,7 +424,7 @@ index 5ab2cf6e..b5795b6d 100644 + } } diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 7501a1a2..1701804b 100644 +index 7501a1a28..1701804b1 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -35,6 +35,15 @@ public class Block { @@ -444,7 +444,7 @@ index 7501a1a2..1701804b 100644 public static int getId(Block block) { return Block.REGISTRY.a(block); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index d268fec3..52f6242d 100644 +index d268fec39..52f6242d7 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -900,7 +900,7 @@ public class Chunk { @@ -492,7 +492,7 @@ index d268fec3..52f6242d 100644 private void z() { diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 9dcab42d..c1b0d6ce 100644 +index 9dcab42de..c1b0d6cea 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -195,7 +195,7 @@ public class ChunkProviderServer implements IChunkProvider { @@ -514,7 +514,7 @@ index 9dcab42d..c1b0d6ce 100644 this.chunkLoader.a(this.world, chunk); } catch (IOException ioexception) { diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index a4fca0ca..161ea817 100644 +index a4fca0ca9..161ea8172 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -388,7 +388,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { @@ -554,7 +554,7 @@ index a4fca0ca..161ea817 100644 // return chunk; // CraftBukkit } diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 7fe2796f..2feeb855 100644 +index 7fe2796fe..2feeb855b 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -24,7 +24,7 @@ import java.io.PrintStream; @@ -607,7 +607,7 @@ index 7fe2796f..2feeb855 100644 return waitable.get(); } catch (java.util.concurrent.ExecutionException e) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index e3e9a213..000a0051 100644 +index e3e9a2136..000a0051f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -25,7 +25,8 @@ import org.bukkit.block.BlockFace; @@ -646,7 +646,7 @@ index e3e9a213..000a0051 100644 public void recalcPosition() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index bc2da331..f446020a 100644 +index 27580a938..35812d561 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -658,7 +658,7 @@ index bc2da331..f446020a 100644 public abstract class EntityLiving extends Entity { -@@ -1861,7 +1861,6 @@ public abstract class EntityLiving extends Entity { +@@ -1862,7 +1862,6 @@ public abstract class EntityLiving extends Entity { } public void B_() { @@ -666,7 +666,7 @@ index bc2da331..f446020a 100644 super.B_(); this.cI(); if (!this.world.isClientSide) { -@@ -1934,9 +1933,7 @@ public abstract class EntityLiving extends Entity { +@@ -1935,9 +1934,7 @@ public abstract class EntityLiving extends Entity { } } @@ -676,7 +676,7 @@ index bc2da331..f446020a 100644 double d0 = this.locX - this.lastX; double d1 = this.locZ - this.lastZ; float f = (float) (d0 * d0 + d1 * d1); -@@ -2012,8 +2009,6 @@ public abstract class EntityLiving extends Entity { +@@ -2013,8 +2010,6 @@ public abstract class EntityLiving extends Entity { } else { this.bq = 0; } @@ -685,7 +685,7 @@ index bc2da331..f446020a 100644 } protected float g(float f, float f1) { -@@ -2078,7 +2073,6 @@ public abstract class EntityLiving extends Entity { +@@ -2079,7 +2074,6 @@ public abstract class EntityLiving extends Entity { } this.world.methodProfiler.a("ai"); @@ -693,7 +693,7 @@ index bc2da331..f446020a 100644 if (this.isFrozen()) { this.bd = false; this.be = 0.0F; -@@ -2089,7 +2083,6 @@ public abstract class EntityLiving extends Entity { +@@ -2090,7 +2084,6 @@ public abstract class EntityLiving extends Entity { this.doTick(); this.world.methodProfiler.b(); } @@ -701,7 +701,7 @@ index bc2da331..f446020a 100644 this.world.methodProfiler.b(); this.world.methodProfiler.a("jump"); -@@ -2112,14 +2105,10 @@ public abstract class EntityLiving extends Entity { +@@ -2113,14 +2106,10 @@ public abstract class EntityLiving extends Entity { this.bg *= 0.98F; this.bh *= 0.9F; this.r(); @@ -717,7 +717,7 @@ index bc2da331..f446020a 100644 } diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java -index 284d1204..3aab5420 100644 +index 284d1204d..3aab54206 100644 --- a/src/main/java/net/minecraft/server/EntityTracker.java +++ b/src/main/java/net/minecraft/server/EntityTracker.java @@ -175,7 +175,7 @@ public class EntityTracker { @@ -748,7 +748,7 @@ index 284d1204..3aab5420 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e396b382..43b4e552 100644 +index e396b3822..43b4e552b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -47,8 +47,8 @@ import org.bukkit.Bukkit; @@ -895,7 +895,7 @@ index e396b382..43b4e552 100644 this.methodProfiler.b(); } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index eeac3499..e4ed2e99 100644 +index eeac34998..e4ed2e991 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1,5 +1,6 @@ @@ -995,7 +995,7 @@ index eeac3499..e4ed2e99 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index ddd36a3c..42b05bee 100644 +index ddd36a3c6..42b05bee8 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -1043,7 +1043,7 @@ index ddd36a3c..42b05bee 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java -index f74b0679..1fc632e0 100644 +index f74b06794..1fc632e0c 100644 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java @@ -1,15 +1,21 @@ @@ -1073,7 +1073,7 @@ index f74b0679..1fc632e0 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 788e0e1b..b7ebbc9f 100644 +index 788e0e1b5..b7ebbc9ff 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1,5 +1,6 @@ @@ -1097,7 +1097,7 @@ index 788e0e1b..b7ebbc9f 100644 public void addWhitelist(GameProfile gameprofile) { diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java -index 74e3f42c..2580a4cf 100644 +index 74e3f42cd..2580a4cf6 100644 --- a/src/main/java/net/minecraft/server/StructureGenerator.java +++ b/src/main/java/net/minecraft/server/StructureGenerator.java @@ -1,5 +1,7 @@ @@ -1139,7 +1139,7 @@ index 74e3f42c..2580a4cf 100644 return flag; } diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 591f4ad7..e02f0c44 100644 +index 591f4ad7f..e02f0c442 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -4,12 +4,13 @@ import javax.annotation.Nullable; @@ -1159,7 +1159,7 @@ index 591f4ad7..e02f0c44 100644 private static final RegistryMaterials> f = new RegistryMaterials(); protected World world; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index fd204ad7..aaa524b3 100644 +index fd204ad7a..aaa524b3d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -18,11 +18,11 @@ import com.google.common.collect.Maps; @@ -1265,7 +1265,7 @@ index fd204ad7..aaa524b3 100644 public boolean b(AxisAlignedBB axisalignedbb) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 8afe1d3d..00b09397 100644 +index 8afe1d3d3..00b093976 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -304,13 +304,13 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -1399,7 +1399,7 @@ index 8afe1d3d..00b09397 100644 // CraftBukkit start diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 83a4692a..5c05ae40 100644 +index 83a4692af..5c05ae407 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1743,6 +1743,7 @@ public final class CraftServer implements Server { @@ -1437,7 +1437,7 @@ index 83a4692a..5c05ae40 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java deleted file mode 100644 -index 311a2c3f..00000000 +index 311a2c3f6..000000000 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java +++ /dev/null @@ -1,174 +0,0 @@ @@ -1616,7 +1616,7 @@ index 311a2c3f..00000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java -index 3a95b446..b5efb9c3 100644 +index 3a95b4465..b5efb9c3f 100644 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java @@ -1,6 +1,8 @@ @@ -1660,7 +1660,7 @@ index 3a95b446..b5efb9c3 100644 public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 001b6040..d4c8fafe 100644 +index 001b6040f..d4c8fafe7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -38,7 +38,7 @@ import org.bukkit.configuration.serialization.DelegateDeserialization; @@ -1686,7 +1686,7 @@ index 001b6040..d4c8fafe 100644 public Player.Spigot spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index 92d217bc..9952b64b 100644 +index 92d217bce..9952b64be 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger; @@ -1762,7 +1762,7 @@ index 92d217bc..9952b64b 100644 private boolean isReady(final int currentTick) { diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java -index 220e39ab..afc6c17e 100644 +index 220e39abe..afc6c17e6 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java @@ -1,8 +1,8 @@ @@ -1844,7 +1844,7 @@ index 220e39ab..afc6c17e 100644 - // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java -index e52ef47b..3d90b342 100644 +index e52ef47b7..3d90b3426 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java @@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon; @@ -1856,7 +1856,7 @@ index e52ef47b..3d90b342 100644 this.value = value; } diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 2bd690fd..38be7ed7 100644 +index 2bd690fdf..38be7ed71 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -29,7 +29,7 @@ import net.minecraft.server.EntityWither; @@ -1918,5 +1918,5 @@ index 2bd690fd..38be7ed7 100644 } } -- -2.13.1.windows.2 +2.13.0 diff --git a/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch index a38ab72f2..f03f61033 100644 --- a/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch +++ b/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch @@ -1,4 +1,4 @@ -From add952595402a6d97bde481631fb6ddca700c3f1 Mon Sep 17 00:00:00 2001 +From f2e3d1efa08111d4321edd7f215ea33c2a3e488d Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:48:03 -0600 Subject: [PATCH] Disable explosion knockback @@ -19,10 +19,10 @@ index a197af84f..2217f680c 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index f446020af..6b9b55020 100644 +index 35812d561..d99413337 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -900,6 +900,7 @@ public abstract class EntityLiving extends Entity { +@@ -901,6 +901,7 @@ public abstract class EntityLiving extends Entity { } } @@ -30,7 +30,7 @@ index f446020af..6b9b55020 100644 if (flag1) { if (flag) { this.world.broadcastEntityEffect(this, (byte) 29); -@@ -916,6 +917,7 @@ public abstract class EntityLiving extends Entity { +@@ -917,6 +918,7 @@ public abstract class EntityLiving extends Entity { b0 = 2; } @@ -38,7 +38,7 @@ index f446020af..6b9b55020 100644 this.world.broadcastEntityEffect(this, b0); } -@@ -939,6 +941,8 @@ public abstract class EntityLiving extends Entity { +@@ -940,6 +942,8 @@ public abstract class EntityLiving extends Entity { } } @@ -70,5 +70,5 @@ index e7f0e84d4..e148901e5 100644 } } -- -2.13.1 +2.13.0 diff --git a/Spigot-Server-Patches/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 0c0a4d9b8..c507f14e2 100644 --- a/Spigot-Server-Patches/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-Server-Patches/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,14 +1,14 @@ -From 6d78130c5cdd3c5e947ca2f4cd3c2c4bc9eff7c3 Mon Sep 17 00:00:00 2001 +From 1569e10a8346a25585e49ff76a7fff77777fb766 Mon Sep 17 00:00:00 2001 From: mrapple Date: Sun, 25 Nov 2012 13:43:39 -0600 Subject: [PATCH] Add methods for working with arrows stuck in living entities diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 062a0fd55..8ed91e82a 100644 +index 06f2ddd85..3c3e8b873 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -572,4 +572,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -570,4 +570,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public boolean isCollidable() { return getHandle().collides; } diff --git a/Spigot-Server-Patches/0078-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0078-Custom-replacement-for-eaten-items.patch index 835ee4979..6ba67042a 100644 --- a/Spigot-Server-Patches/0078-Custom-replacement-for-eaten-items.patch +++ b/Spigot-Server-Patches/0078-Custom-replacement-for-eaten-items.patch @@ -1,14 +1,14 @@ -From 470c1176b532ba1eb828a2a1152d1ac2402c879e Mon Sep 17 00:00:00 2001 +From a6c9a8ea8103132cf67dbd2973e5a0f868eda957 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 21 Jun 2015 15:07:20 -0400 Subject: [PATCH] Custom replacement for eaten items diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 6b9b55020..fe9cd7769 100644 +index d99413337..83c55dff6 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2369,12 +2369,13 @@ public abstract class EntityLiving extends Entity { +@@ -2370,12 +2370,13 @@ public abstract class EntityLiving extends Entity { protected void v() { if (!this.activeItem.isEmpty() && this.isHandRaised()) { @@ -23,7 +23,7 @@ index 6b9b55020..fe9cd7769 100644 world.getServer().getPluginManager().callEvent(event); if (event.isCancelled()) { -@@ -2389,9 +2390,21 @@ public abstract class EntityLiving extends Entity { +@@ -2390,9 +2391,21 @@ public abstract class EntityLiving extends Entity { itemstack = this.activeItem.a(this.world, this); } @@ -46,5 +46,5 @@ index 6b9b55020..fe9cd7769 100644 } -- -2.13.1 +2.13.0 diff --git a/Spigot-Server-Patches/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch index b3962c2ed..2de01a501 100644 --- a/Spigot-Server-Patches/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -1,14 +1,14 @@ -From bbbe4a9875c7f57a00a7c0d252d5a359d5433134 Mon Sep 17 00:00:00 2001 +From 8bfcb4fc727ef2d3720eb23140d6e07757d1f147 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 27 Sep 2015 01:18:02 -0400 Subject: [PATCH] handle NaN health/absorb values and repair bad data diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 582eaa4ea..e0a793709 100644 +index 83c55dff6..e9552ff21 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -482,7 +482,13 @@ public abstract class EntityLiving extends Entity { +@@ -483,7 +483,13 @@ public abstract class EntityLiving extends Entity { } public void a(NBTTagCompound nbttagcompound) { @@ -23,7 +23,7 @@ index 582eaa4ea..e0a793709 100644 if (nbttagcompound.hasKeyOfType("Attributes", 9) && this.world != null && !this.world.isClientSide) { GenericAttributes.a(this.getAttributeMap(), nbttagcompound.getList("Attributes", 10)); } -@@ -785,6 +791,10 @@ public abstract class EntityLiving extends Entity { +@@ -786,6 +792,10 @@ public abstract class EntityLiving extends Entity { } public void setHealth(float f) { @@ -34,7 +34,7 @@ index 582eaa4ea..e0a793709 100644 // CraftBukkit start - Handle scaled health if (this instanceof EntityPlayer) { org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity(); -@@ -2257,7 +2267,7 @@ public abstract class EntityLiving extends Entity { +@@ -2258,7 +2268,7 @@ public abstract class EntityLiving extends Entity { } public void setAbsorptionHearts(float f) { @@ -44,7 +44,7 @@ index 582eaa4ea..e0a793709 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ab164c11e..cf210d43b 100644 +index 03faaf143..74944159a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1384,6 +1384,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -56,5 +56,5 @@ index ab164c11e..cf210d43b 100644 } -- -2.13.0.windows.1 +2.13.0 diff --git a/Spigot-Server-Patches/0118-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0118-EntityRegainHealthEvent-isFastRegen-API.patch index 226806815..3393b3303 100644 --- a/Spigot-Server-Patches/0118-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-Server-Patches/0118-EntityRegainHealthEvent-isFastRegen-API.patch @@ -1,4 +1,4 @@ -From 0a5272c5551934c1eebec91ceabf8407dae0ab0d Mon Sep 17 00:00:00 2001 +From ebfa499c5bd1e3ae80c5a66e9ed471d75e845ed4 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 01:43:11 -0500 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API @@ -6,10 +6,10 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API Don't even get me started diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 6f2d1a18..3d1897d6 100644 +index e9552ff21..f5b04ca48 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -767,10 +767,16 @@ public abstract class EntityLiving extends Entity { +@@ -768,10 +768,16 @@ public abstract class EntityLiving extends Entity { } public void heal(float f, EntityRegainHealthEvent.RegainReason regainReason) { @@ -28,7 +28,7 @@ index 6f2d1a18..3d1897d6 100644 if (!event.isCancelled()) { diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java -index d42db9b4..c715138e 100644 +index d42db9b45..c715138ee 100644 --- a/src/main/java/net/minecraft/server/FoodMetaData.java +++ b/src/main/java/net/minecraft/server/FoodMetaData.java @@ -65,7 +65,7 @@ public class FoodMetaData { @@ -41,5 +41,5 @@ index d42db9b4..c715138e 100644 this.foodTickTimer = 0; } -- -2.13.1.windows.2 +2.13.0 diff --git a/Spigot-Server-Patches/0143-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0143-Toggleable-Elytra-Wall-Damage.patch index e544adca3..81064cbb7 100644 --- a/Spigot-Server-Patches/0143-Toggleable-Elytra-Wall-Damage.patch +++ b/Spigot-Server-Patches/0143-Toggleable-Elytra-Wall-Damage.patch @@ -1,4 +1,4 @@ -From a5e58644e7ecfb1d71ad0c9a2ca9744fe93ccd6b Mon Sep 17 00:00:00 2001 +From bd6532cf43d9fa4c84e78f1e543b3c9927a476b5 Mon Sep 17 00:00:00 2001 From: Jadon Fowler Date: Sat, 18 Jun 2016 23:13:59 -0700 Subject: [PATCH] Toggleable Elytra Wall Damage @@ -7,7 +7,7 @@ Instead of calculating the damage taken from hitting a wall, you can disable it in the config. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index ef60c15b..cec9ea74 100644 +index ef60c15bd..cec9ea74c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -355,4 +355,9 @@ public class PaperWorldConfig { @@ -21,10 +21,10 @@ index ef60c15b..cec9ea74 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 3d1897d6..e50f7a3c 100644 +index f5b04ca48..3086a36f9 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -1731,6 +1731,7 @@ public abstract class EntityLiving extends Entity { +@@ -1732,6 +1732,7 @@ public abstract class EntityLiving extends Entity { this.motY = 0.30000001192092896D; } } else if (this.cP()) { @@ -32,7 +32,7 @@ index 3d1897d6..e50f7a3c 100644 if (this.motY > -0.5D) { this.fallDistance = 1.0F; } -@@ -1780,6 +1781,7 @@ public abstract class EntityLiving extends Entity { +@@ -1781,6 +1782,7 @@ public abstract class EntityLiving extends Entity { this.damageEntity(DamageSource.FLY_INTO_WALL, f8); } } @@ -41,5 +41,5 @@ index 3d1897d6..e50f7a3c 100644 if (this.onGround && !this.world.isClientSide) { if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit -- -2.13.1.windows.2 +2.13.0 diff --git a/Spigot-Server-Patches/0200-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0200-Cap-Entity-Collisions.patch index fc30cd7be..5ae111738 100644 --- a/Spigot-Server-Patches/0200-Cap-Entity-Collisions.patch +++ b/Spigot-Server-Patches/0200-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From 8ed42f41c0181423f8b14ff1c4272a910e57ecfb Mon Sep 17 00:00:00 2001 +From 766b36dd128cf649b95adc019f16fad3fd2aa761 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 22 Jan 2017 18:07:56 -0500 Subject: [PATCH] Cap Entity Collisions @@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped. You can set this to 0 to disable collisions. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 70af657f..af953dda 100644 +index 70af657f5..af953dda4 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -410,4 +410,10 @@ public class PaperWorldConfig { @@ -27,7 +27,7 @@ index 70af657f..af953dda 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 147f00fe..d34ec4ff 100644 +index 147f00fe8..d34ec4ff1 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -169,6 +169,7 @@ public abstract class Entity implements ICommandListener { @@ -39,10 +39,10 @@ index 147f00fe..d34ec4ff 100644 // Spigot end diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 194d55c3..b18fc969 100644 +index b437ebf26..35e473a26 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2182,8 +2182,11 @@ public abstract class EntityLiving extends Entity { +@@ -2183,8 +2183,11 @@ public abstract class EntityLiving extends Entity { } } @@ -56,5 +56,5 @@ index 194d55c3..b18fc969 100644 this.C(entity); } -- -2.13.1.windows.2 +2.13.0 diff --git a/Spigot-Server-Patches/0205-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0205-Do-not-let-armorstands-drown.patch index 5940f0ba4..12cca8e8f 100644 --- a/Spigot-Server-Patches/0205-Do-not-let-armorstands-drown.patch +++ b/Spigot-Server-Patches/0205-Do-not-let-armorstands-drown.patch @@ -1,11 +1,11 @@ -From be2b2064c8a9c7b00529977852106d4d19537ce8 Mon Sep 17 00:00:00 2001 +From 292babe90273d8107d09d1c0a3b331b616c67f58 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 036498c0..f25ee906 100644 +index 036498c09..f25ee9061 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -772,5 +772,10 @@ public class EntityArmorStand extends EntityLiving { @@ -20,10 +20,10 @@ index 036498c0..f25ee906 100644 // Paper end } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index b18fc969..3c7c4390 100644 +index 35e473a26..66b82bbfb 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -189,6 +189,7 @@ public abstract class EntityLiving extends Entity { +@@ -190,6 +190,7 @@ public abstract class EntityLiving extends Entity { super.a(d0, flag, iblockdata, blockposition); } @@ -31,7 +31,7 @@ index b18fc969..3c7c4390 100644 public boolean bN() { return false; } -@@ -223,7 +224,7 @@ public abstract class EntityLiving extends Entity { +@@ -224,7 +225,7 @@ public abstract class EntityLiving extends Entity { if (this.isAlive()) { if (this.a(Material.WATER)) { @@ -41,5 +41,5 @@ index b18fc969..3c7c4390 100644 if (this.getAirTicks() == -20) { this.setAirTicks(0); -- -2.13.1.windows.2 +2.13.0 diff --git a/Spigot-Server-Patches/0214-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0214-PlayerPickupItemEvent-setFlyAtPlayer.patch index 44cc6f76a..1783bb690 100644 --- a/Spigot-Server-Patches/0214-PlayerPickupItemEvent-setFlyAtPlayer.patch +++ b/Spigot-Server-Patches/0214-PlayerPickupItemEvent-setFlyAtPlayer.patch @@ -1,11 +1,11 @@ -From 55935073e08bcccfc096d7a35b1ab26571c0fa53 Mon Sep 17 00:00:00 2001 +From 063ea4b06d53bcfedb783b7b937482af565db81d Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 May 2017 06:26:09 -0500 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 08315599..6ed3d790 100644 +index dc52ef45b..fa207c579 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -329,6 +329,7 @@ public class EntityItem extends Entity implements HopperPusher { @@ -17,7 +17,7 @@ index 08315599..6ed3d790 100644 if (this.pickupDelay <= 0 && canHold > 0) { itemstack.setCount(canHold); @@ -336,8 +337,14 @@ public class EntityItem extends Entity implements HopperPusher { - // event.setCancelled(!entityhuman.canPickUpLoot); TODO + event.setCancelled(!entityhuman.canPickUpLoot); this.world.getServer().getPluginManager().callEvent(event); itemstack.setCount(canHold + remaining); + flyAtPlayer = event.getFlyAtPlayer(); // Paper @@ -45,5 +45,5 @@ index 08315599..6ed3d790 100644 this.die(); itemstack.setCount(i); -- -2.13.1.windows.2 +2.13.0 diff --git a/work/Bukkit b/work/Bukkit index f068554c9..d01a9a06a 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit f068554c9d1051d21457b943fc6c96b3682d7ca4 +Subproject commit d01a9a06ad79797315c75c9f64f65b9982356e30 diff --git a/work/CraftBukkit b/work/CraftBukkit index 753a8e700..d7cd7275f 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 753a8e700db5216abcc53eb56a9c26226c1ad9ed +Subproject commit d7cd7275f28ce2ace4dc2051e77a9c5ec80743f1