diff --git a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 1422256e9..9ceb3d613 100644 --- a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -5,10 +5,10 @@ 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 dd6eff5cc56b6276fa897f0f892259c6804c3b05..ec585c7499eb88d10436ef1d461bace0c54a6f07 100644 +index 468a5e13fa789a116daae49b6ab304e5dfa6ee85..3154b1cb18b1cf97705ccd2e52bd87bd6cf5d8cf 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -563,4 +563,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -591,4 +591,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource */ @NotNull public EntityCategory getCategory(); diff --git a/Spigot-API-Patches/0064-LivingEntity-setKiller.patch b/Spigot-API-Patches/0064-LivingEntity-setKiller.patch index f95331f27..30e5a4960 100644 --- a/Spigot-API-Patches/0064-LivingEntity-setKiller.patch +++ b/Spigot-API-Patches/0064-LivingEntity-setKiller.patch @@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#setKiller diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 5b0c95ab7372c7accd190b9052b587637106c4af..f0018823e17fab49e0167ece1c8c9eda2d562b87 100644 +index 3154b1cb18b1cf97705ccd2e52bd87bd6cf5d8cf..a2bdecc8b27652460064126f8e5bb8d038f5d11a 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -251,6 +251,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -279,6 +279,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @Nullable public Player getKiller(); diff --git a/Spigot-API-Patches/0106-Make-shield-blocking-delay-configurable.patch b/Spigot-API-Patches/0106-Make-shield-blocking-delay-configurable.patch index 8964bcbb9..bf68165a2 100644 --- a/Spigot-API-Patches/0106-Make-shield-blocking-delay-configurable.patch +++ b/Spigot-API-Patches/0106-Make-shield-blocking-delay-configurable.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Make shield blocking delay configurable diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 30604ea038021032745ec586cee57c0089ad2d4b..022a6ef9158db937291051d6c4dfbc27f747bc3d 100644 +index a2bdecc8b27652460064126f8e5bb8d038f5d11a..1d4ddb01c3d8d4619276c6b8ebb2c7f290df7d8b 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -586,5 +586,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -614,5 +614,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param arrows Number of arrows to stick in this entity */ void setArrowsStuck(int arrows); diff --git a/Spigot-API-Patches/0113-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-API-Patches/0113-LivingEntity-Hand-Raised-Item-Use-API.patch index 8d9fffb16..0727a365e 100644 --- a/Spigot-API-Patches/0113-LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/Spigot-API-Patches/0113-LivingEntity-Hand-Raised-Item-Use-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API How long an entity has raised hands to charge an attack or use an item diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 022a6ef9158db937291051d6c4dfbc27f747bc3d..069d9131406d7e29db56f51940a0809a0dd9e703 100644 +index 1d4ddb01c3d8d4619276c6b8ebb2c7f290df7d8b..e0f77cf3a3aa8a741f0ee5c077ff56e80605be76 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -12,6 +12,7 @@ import org.bukkit.attribute.Attributable; @@ -17,7 +17,7 @@ index 022a6ef9158db937291051d6c4dfbc27f747bc3d..069d9131406d7e29db56f51940a0809a import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import org.bukkit.projectiles.ProjectileSource; -@@ -600,5 +601,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -628,5 +629,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param delay Delay in ticks */ void setShieldBlockingDelay(int delay); diff --git a/Spigot-API-Patches/0189-Entity-Jump-API.patch b/Spigot-API-Patches/0189-Entity-Jump-API.patch index d7affd6e8..2a36efb4a 100644 --- a/Spigot-API-Patches/0189-Entity-Jump-API.patch +++ b/Spigot-API-Patches/0189-Entity-Jump-API.patch @@ -57,10 +57,10 @@ index 0000000000000000000000000000000000000000..f0067c2e953d18e1a33536980071ba3f + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index d470f0364e8be5398f1dad864389f7ac3df586ff..ff02b79dcac07b86a1cc8fd360965b39ee595eb9 100644 +index 0624099fcd28c7f108131cb0f58d323818379838..d225a59f149cdc770ee3243f9604291c28f5a2ed 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -743,5 +743,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -771,5 +771,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @return Whether or not this entity is using or charging an attack (Bow pulled back, drinking potion, eating food) */ boolean isHandRaised(); diff --git a/Spigot-API-Patches/0220-Add-playPickupItemAnimation-to-LivingEntity.patch b/Spigot-API-Patches/0220-Add-playPickupItemAnimation-to-LivingEntity.patch index 20288b33d..edb928399 100644 --- a/Spigot-API-Patches/0220-Add-playPickupItemAnimation-to-LivingEntity.patch +++ b/Spigot-API-Patches/0220-Add-playPickupItemAnimation-to-LivingEntity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index ff02b79dcac07b86a1cc8fd360965b39ee595eb9..9099e762907d38900a42b75dff1b6831b50aecb9 100644 +index d225a59f149cdc770ee3243f9604291c28f5a2ed..f3813210e63d9859c0461833a502b43361a2e134 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -763,5 +763,28 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -791,5 +791,28 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param jumping entity jump state */ void setJumping(boolean jumping); diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch index 4e9f822f1..fffee5a92 100644 --- a/Spigot-Server-Patches/0004-MC-Utils.patch +++ b/Spigot-Server-Patches/0004-MC-Utils.patch @@ -3109,10 +3109,10 @@ index 05b1aa66d1dc7bad96236c0cf2c85ddf209a5422..5da6528672d0f14766ca99ce5d2cc40b // CraftBukkit start - fire event setGoalTarget(entityliving, EntityTargetEvent.TargetReason.UNKNOWN, true); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index e8f313e2b4ff4aa431243e8edb02c100390efc24..78b027465ab727b7706590d00a46e75184606432 100644 +index 58bfdb34a31a3150954f57dde9c83e91c89ee3c1..3ee9be26bbfbf1fa2c4133da3e95c8ac3f533fa4 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -137,6 +137,7 @@ public abstract class EntityLiving extends Entity { +@@ -138,6 +138,7 @@ public abstract class EntityLiving extends Entity { public boolean collides = true; public Set collidableExemptions = new HashSet<>(); public boolean canPickUpLoot; @@ -3133,7 +3133,7 @@ index 07c48d777a71a979fb1f0063eef2e613e448d2eb..8a5d6869c269369d45cfe4e61853c442 super(entitytypes, world); this.f = 5; diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 0e23f117432680346a31b4b43b29ba6981a5c30a..5a06220f876c868ac2ddb4aeaad9f91f0804f2a5 100644 +index 6dab17d6bcf15a362ce35e744f425dff603dac32..9b46c931edfc3a821c6c0125f8258b6b550d7342 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -93,6 +93,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -4190,7 +4190,7 @@ index 43168f3836eb8823f3b2046882664ba45f1be678..127c03c321e1414e0d174c8d81a7851c @Override diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 4791b59fc2740bdc81b62748d3edbf2b2a83e043..c7a7e2cf54b4ca7fd65fca63c0f102f479a0f3e5 100644 +index e00c3d6ea480c28e6f8ef6d4c36c13fc08035908..81a99c156c7f626964c3e93491d8bd1d6647e960 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -67,9 +67,9 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch index bc97ac85b..631a54c6c 100644 --- a/Spigot-Server-Patches/0009-Timings-v2.patch +++ b/Spigot-Server-Patches/0009-Timings-v2.patch @@ -1042,10 +1042,10 @@ index fc6930327625bf951bb0ba21df5eb1a559a2b295..afaf32db9c53d164f13f5afcd4202b40 protected BlockPosition ao() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 78b027465ab727b7706590d00a46e75184606432..380165b54e118df19e6adefd35ad0bc039a7ac51 100644 +index 3ee9be26bbfbf1fa2c4133da3e95c8ac3f533fa4..6f9fe8959e7ca47effead4ab2a59c75d4781eb00 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -41,7 +41,7 @@ import org.bukkit.event.entity.EntityTeleportEvent; +@@ -42,7 +42,7 @@ import org.bukkit.event.entity.EntityTeleportEvent; import org.bukkit.event.player.PlayerItemConsumeEvent; // CraftBukkit end @@ -1054,7 +1054,7 @@ index 78b027465ab727b7706590d00a46e75184606432..380165b54e118df19e6adefd35ad0bc0 public abstract class EntityLiving extends Entity { -@@ -2334,7 +2334,6 @@ public abstract class EntityLiving extends Entity { +@@ -2345,7 +2345,6 @@ public abstract class EntityLiving extends Entity { @Override public void tick() { @@ -1062,7 +1062,7 @@ index 78b027465ab727b7706590d00a46e75184606432..380165b54e118df19e6adefd35ad0bc0 super.tick(); this.t(); this.v(); -@@ -2383,9 +2382,7 @@ public abstract class EntityLiving extends Entity { +@@ -2394,9 +2393,7 @@ public abstract class EntityLiving extends Entity { } } @@ -1072,7 +1072,7 @@ index 78b027465ab727b7706590d00a46e75184606432..380165b54e118df19e6adefd35ad0bc0 double d0 = this.locX() - this.lastX; double d1 = this.locZ() - this.lastZ; float f = (float) (d0 * d0 + d1 * d1); -@@ -2465,8 +2462,6 @@ public abstract class EntityLiving extends Entity { +@@ -2476,8 +2473,6 @@ public abstract class EntityLiving extends Entity { if (this.isSleeping()) { this.pitch = 0.0F; } @@ -1081,7 +1081,7 @@ index 78b027465ab727b7706590d00a46e75184606432..380165b54e118df19e6adefd35ad0bc0 } private void p() { -@@ -2648,7 +2643,6 @@ public abstract class EntityLiving extends Entity { +@@ -2659,7 +2654,6 @@ public abstract class EntityLiving extends Entity { this.setMot(d4, d5, d6); this.world.getMethodProfiler().enter("ai"); @@ -1089,7 +1089,7 @@ index 78b027465ab727b7706590d00a46e75184606432..380165b54e118df19e6adefd35ad0bc0 if (this.isFrozen()) { this.jumping = false; this.aR = 0.0F; -@@ -2658,7 +2652,6 @@ public abstract class EntityLiving extends Entity { +@@ -2669,7 +2663,6 @@ public abstract class EntityLiving extends Entity { this.doTick(); this.world.getMethodProfiler().exit(); } @@ -1097,7 +1097,7 @@ index 78b027465ab727b7706590d00a46e75184606432..380165b54e118df19e6adefd35ad0bc0 this.world.getMethodProfiler().exit(); this.world.getMethodProfiler().enter("jump"); -@@ -2693,9 +2686,9 @@ public abstract class EntityLiving extends Entity { +@@ -2704,9 +2697,9 @@ public abstract class EntityLiving extends Entity { this.r(); AxisAlignedBB axisalignedbb = this.getBoundingBox(); @@ -1109,7 +1109,7 @@ index 78b027465ab727b7706590d00a46e75184606432..380165b54e118df19e6adefd35ad0bc0 this.world.getMethodProfiler().exit(); this.world.getMethodProfiler().enter("push"); if (this.bf > 0) { -@@ -2703,9 +2696,7 @@ public abstract class EntityLiving extends Entity { +@@ -2714,9 +2707,7 @@ public abstract class EntityLiving extends Entity { this.a(axisalignedbb, this.getBoundingBox()); } diff --git a/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch index fff74164c..0d65d197b 100644 --- a/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch +++ b/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch @@ -19,10 +19,10 @@ index f038d3f7dc7d1034a3ee9f2384a85642f224836e..25e0717186366af580e512eedfd403b8 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 380165b54e118df19e6adefd35ad0bc039a7ac51..df5984cf80da32e5997581171d0eb2bdbbf22244 100644 +index 6f9fe8959e7ca47effead4ab2a59c75d4781eb00..0b05cc912a70ed1aaa70e9a66d789e95c78c5fc1 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -1183,6 +1183,7 @@ public abstract class EntityLiving extends Entity { +@@ -1184,6 +1184,7 @@ public abstract class EntityLiving extends Entity { } } @@ -30,7 +30,7 @@ index 380165b54e118df19e6adefd35ad0bc039a7ac51..df5984cf80da32e5997581171d0eb2bd if (flag1) { if (flag) { this.world.broadcastEntityEffect(this, (byte) 29); -@@ -1201,6 +1202,7 @@ public abstract class EntityLiving extends Entity { +@@ -1202,6 +1203,7 @@ public abstract class EntityLiving extends Entity { b0 = 2; } @@ -38,7 +38,7 @@ index 380165b54e118df19e6adefd35ad0bc039a7ac51..df5984cf80da32e5997581171d0eb2bd this.world.broadcastEntityEffect(this, b0); } -@@ -1224,6 +1226,7 @@ public abstract class EntityLiving extends Entity { +@@ -1225,6 +1227,7 @@ public abstract class EntityLiving extends Entity { } } @@ -47,7 +47,7 @@ index 380165b54e118df19e6adefd35ad0bc039a7ac51..df5984cf80da32e5997581171d0eb2bd if (!this.f(damagesource)) { SoundEffect soundeffect = this.getSoundDeath(); diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index 19f7312ee31baebbbccc3126b28418e7b817d247..7b6c3a667ea67b25f9f12d4049dfc51b1c9fb69d 100644 +index 88d2fa33e4c9f90f2aa80b3afbf28edbdbeb03db..b7d635ca2cbe9bf7e2e3a2ae5fa7a20f39dd913b 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -189,14 +189,14 @@ public class Explosion { diff --git a/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch index 249908194..b3d806ffb 100644 --- a/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch +++ b/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch @@ -37,10 +37,10 @@ index c222539ac9f0a2b9f7e4a6ded873db4ca2b2e7b6..9295f5aa306d062bf95cd10e13796315 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index df5984cf80da32e5997581171d0eb2bdbbf22244..ff47c899302c7cdedce2190d57745e265e1783d0 100644 +index 0b05cc912a70ed1aaa70e9a66d789e95c78c5fc1..60ffbec4bb28f8e0661183f6e21d547878774387 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -641,6 +641,7 @@ public abstract class EntityLiving extends Entity { +@@ -642,6 +642,7 @@ public abstract class EntityLiving extends Entity { if (nbttagcompound.hasKeyOfType("Team", 8)) { String s = nbttagcompound.getString("Team"); ScoreboardTeam scoreboardteam = this.world.getScoreboard().getTeam(s); diff --git a/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 251716548..3b95cab4a 100644 --- a/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -5,10 +5,10 @@ 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 c608732fb2b7c3d80a1fe12c007e0237caadcbfc..dd12147fd5b37b0b6e54568d65f571534d0b3c67 100644 +index c635a5ca8961b9b6d742251e339dd46bd08b6ef0..283c65af3dedef650cf956db9aa5b582e2b6e6c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -657,4 +657,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -678,4 +678,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { throw new UnsupportedOperationException("Unsupported monster type: " + type + ". This is a bug, report this to Spigot."); } diff --git a/Spigot-Server-Patches/0066-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0066-Custom-replacement-for-eaten-items.patch index df994d9a7..af06d42d7 100644 --- a/Spigot-Server-Patches/0066-Custom-replacement-for-eaten-items.patch +++ b/Spigot-Server-Patches/0066-Custom-replacement-for-eaten-items.patch @@ -5,10 +5,10 @@ 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 ff47c899302c7cdedce2190d57745e265e1783d0..76ec25889cfc9a89a48d9319e1db9d81240306c4 100644 +index 60ffbec4bb28f8e0661183f6e21d547878774387..011aa803cdce6c0179d786eebe4541357aeb09f0 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -3081,9 +3081,10 @@ public abstract class EntityLiving extends Entity { +@@ -3092,9 +3092,10 @@ public abstract class EntityLiving extends Entity { this.b(this.activeItem, 16); // CraftBukkit start - fire PlayerItemConsumeEvent ItemStack itemstack; @@ -20,7 +20,7 @@ index ff47c899302c7cdedce2190d57745e265e1783d0..76ec25889cfc9a89a48d9319e1db9d81 world.getServer().getPluginManager().callEvent(event); if (event.isCancelled()) { -@@ -3097,6 +3098,13 @@ public abstract class EntityLiving extends Entity { +@@ -3108,6 +3109,13 @@ public abstract class EntityLiving extends Entity { } else { itemstack = this.activeItem.a(this.world, this); } @@ -34,7 +34,7 @@ index ff47c899302c7cdedce2190d57745e265e1783d0..76ec25889cfc9a89a48d9319e1db9d81 // CraftBukkit end if (itemstack != this.activeItem) { -@@ -3104,6 +3112,11 @@ public abstract class EntityLiving extends Entity { +@@ -3115,6 +3123,11 @@ public abstract class EntityLiving extends Entity { } this.clearActiveItem(); diff --git a/Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch index 397075bb9..32bf26c91 100644 --- a/Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -5,10 +5,10 @@ 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 76ec25889cfc9a89a48d9319e1db9d81240306c4..c2d02112eff5c7dabb55e801ae9b2970af3c07ec 100644 +index 011aa803cdce6c0179d786eebe4541357aeb09f0..8f78b214414a1283d7fd97785f59946c1032619f 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -602,7 +602,13 @@ public abstract class EntityLiving extends Entity { +@@ -603,7 +603,13 @@ public abstract class EntityLiving extends Entity { @Override public void loadData(NBTTagCompound nbttagcompound) { @@ -23,7 +23,7 @@ index 76ec25889cfc9a89a48d9319e1db9d81240306c4..c2d02112eff5c7dabb55e801ae9b2970 if (nbttagcompound.hasKeyOfType("Attributes", 9) && this.world != null && !this.world.isClientSide) { this.getAttributeMap().a(nbttagcompound.getList("Attributes", 10)); } -@@ -1051,6 +1057,10 @@ public abstract class EntityLiving extends Entity { +@@ -1052,6 +1058,10 @@ public abstract class EntityLiving extends Entity { } public void setHealth(float f) { @@ -34,7 +34,7 @@ index 76ec25889cfc9a89a48d9319e1db9d81240306c4..c2d02112eff5c7dabb55e801ae9b2970 // CraftBukkit start - Handle scaled health if (this instanceof EntityPlayer) { org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity(); -@@ -2921,7 +2931,7 @@ public abstract class EntityLiving extends Entity { +@@ -2932,7 +2942,7 @@ public abstract class EntityLiving extends Entity { } public void setAbsorptionHearts(float f) { diff --git a/Spigot-Server-Patches/0092-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0092-EntityRegainHealthEvent-isFastRegen-API.patch index 81d9b52fd..52a399991 100644 --- a/Spigot-Server-Patches/0092-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-Server-Patches/0092-EntityRegainHealthEvent-isFastRegen-API.patch @@ -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 c2d02112eff5c7dabb55e801ae9b2970af3c07ec..61b4e385ceae74d75db6e1f1942a133a2e843773 100644 +index 8f78b214414a1283d7fd97785f59946c1032619f..06674ffcd4cb08a78b9a390d53ddb3934bf6c7d3 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -1030,10 +1030,16 @@ public abstract class EntityLiving extends Entity { +@@ -1031,10 +1031,16 @@ public abstract class EntityLiving extends Entity { } public void heal(float f, EntityRegainHealthEvent.RegainReason regainReason) { diff --git a/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch index 76aee754b..f8355e2c9 100644 --- a/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch +++ b/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch @@ -38,10 +38,10 @@ index 0182836a801da077ca0e6fcc75e7095454fb2349..17ae6530bda22144866e94e8449220d1 entitywitch.prepare(worldserver, worldserver.getDamageScaler(entitywitch.getChunkCoordinates()), 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 3f1edffa421524ef7646e70d8311e9161ed776a7..9ae73eab4a484731bf4b36fdf16d01ae7c364947 100644 +index 0c98f678ee979d4f4d6f4265e36a64b57e55ae26..e6420b1d59c8db78e3ad313c6709f64664e5aced 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1083,6 +1083,14 @@ public class CraftEventFactory { +@@ -1084,6 +1084,14 @@ public class CraftEventFactory { return event; } diff --git a/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch index 3d20d446b..3f49b0c1d 100644 --- a/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch @@ -18,7 +18,7 @@ index 23d5b7cb1a5cbe3409a0741af08b2fac8d1a58c1..604bdc5ab98071db88ac3e93ebf11869 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 9ae73eab4a484731bf4b36fdf16d01ae7c364947..331b3e8df03eb737964def18ab4267f6a71315e2 100644 +index e6420b1d59c8db78e3ad313c6709f64664e5aced..d423313fd949ff1adf3f6d9c5f339a465e0f0b9e 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -123,6 +123,7 @@ import org.bukkit.entity.ThrownPotion; @@ -29,7 +29,7 @@ index 9ae73eab4a484731bf4b36fdf16d01ae7c364947..331b3e8df03eb737964def18ab4267f6 import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.Event.Result; -@@ -1042,6 +1043,17 @@ public class CraftEventFactory { +@@ -1043,6 +1044,17 @@ public class CraftEventFactory { return event; } diff --git a/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch index 5b255351c..993f134f2 100644 --- a/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch +++ b/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch @@ -71,10 +71,10 @@ index 7391fd31148dbde60e34955841a296f454ac768e..53a8ea7d1eff84abe6c49464d556aa27 this.checkBlockCollisions(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 331b3e8df03eb737964def18ab4267f6a71315e2..de3565ec373066af1715e8e11117d22ae57e3c93 100644 +index d423313fd949ff1adf3f6d9c5f339a465e0f0b9e..7239e9b9d072af9d1610fd2e06a123505e31a110 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1187,6 +1187,16 @@ public class CraftEventFactory { +@@ -1188,6 +1188,16 @@ public class CraftEventFactory { return CraftItemStack.asNMSCopy(bitem); } diff --git a/Spigot-Server-Patches/0137-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0137-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index f37fd8b40..4f5e7d235 100644 --- a/Spigot-Server-Patches/0137-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-Server-Patches/0137-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -173,10 +173,10 @@ index 13dad7a2db788bf900a48bab0a4ef0c4f4b5ddc3..83fa99b1cf784eb7f30b14f9f0743cba // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 61b4e385ceae74d75db6e1f1942a133a2e843773..8627486dab34f1dccdab96e42d2d429ac78b2e77 100644 +index 06674ffcd4cb08a78b9a390d53ddb3934bf6c7d3..a1b5a02cb21b9c8257c4c3d9ad8025f8ebad9d46 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -1487,7 +1487,8 @@ public abstract class EntityLiving extends Entity { +@@ -1488,7 +1488,8 @@ public abstract class EntityLiving extends Entity { int j = EntityExperienceOrb.getOrbValue(i); i -= j; @@ -239,7 +239,7 @@ index c830b3c2145effc16314c6216be8af935416cb58..f1a509063c09e603140c74255a3fb901 } diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 136bb85aace4efc34e1fe804bbccc78bf7495b41..ee59d76d31b8b8cfd39d612b1e6040891f2256f4 100644 +index 56f36e7eecab6a5bd68f25faec2896e39ed6a217..e413d14d6bf89b3eaf2ec06ba8634a83758d65b9 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -377,7 +377,7 @@ public class PlayerInteractManager { diff --git a/Spigot-Server-Patches/0138-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0138-Cap-Entity-Collisions.patch index de5eb3ed9..137677b8b 100644 --- a/Spigot-Server-Patches/0138-Cap-Entity-Collisions.patch +++ b/Spigot-Server-Patches/0138-Cap-Entity-Collisions.patch @@ -27,7 +27,7 @@ index 255b4081314162cbe344b008158c6f4584795fb8..04ee0856a8c62e1afb438d4fddf40e60 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index df77b4e6d5fb3e0ff795ae36402b4c902a613225..6684e17974e498108352870c3b5535cc6c8f63c0 100644 +index 55b4c8abeb0033b15a255ec36e1998678d836dd2..a734de8641a61e6764ca68c194e1bd68142db55e 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -185,6 +185,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -39,10 +39,10 @@ index df77b4e6d5fb3e0ff795ae36402b4c902a613225..6684e17974e498108352870c3b5535cc // Spigot end diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 8627486dab34f1dccdab96e42d2d429ac78b2e77..6aa83e4d5e734d32863f8c4421f3c8ebdb01efab 100644 +index a1b5a02cb21b9c8257c4c3d9ad8025f8ebad9d46..6ba023e9a57f24538f06f456a64f054082b7f3ac 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2779,8 +2779,11 @@ public abstract class EntityLiving extends Entity { +@@ -2790,8 +2790,11 @@ public abstract class EntityLiving extends Entity { } } diff --git a/Spigot-Server-Patches/0141-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0141-Do-not-let-armorstands-drown.patch index 76aa08b1d..96803003d 100644 --- a/Spigot-Server-Patches/0141-Do-not-let-armorstands-drown.patch +++ b/Spigot-Server-Patches/0141-Do-not-let-armorstands-drown.patch @@ -20,10 +20,10 @@ index 73e5bd74f6f9b1532d4abf8d8a0383c851daf35f..9017b98799bde141002282a2709a3ad9 // Paper end } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 6aa83e4d5e734d32863f8c4421f3c8ebdb01efab..729726782446085a6c3b811c4b540ff154c6c115 100644 +index 6ba023e9a57f24538f06f456a64f054082b7f3ac..37ebefa8b1e4344a50643bcc13c31083f911d043 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -244,6 +244,7 @@ public abstract class EntityLiving extends Entity { +@@ -245,6 +245,7 @@ public abstract class EntityLiving extends Entity { super.a(d0, flag, iblockdata, blockposition); } @@ -31,7 +31,7 @@ index 6aa83e4d5e734d32863f8c4421f3c8ebdb01efab..729726782446085a6c3b811c4b540ff1 public boolean cL() { return this.getMonsterType() == EnumMonsterType.UNDEAD; } -@@ -287,7 +288,7 @@ public abstract class EntityLiving extends Entity { +@@ -288,7 +289,7 @@ public abstract class EntityLiving extends Entity { if (this.isAlive()) { if (this.a((Tag) TagsFluid.WATER) && !this.world.getType(new BlockPosition(this.locX(), this.getHeadY(), this.locZ())).a(Blocks.BUBBLE_COLUMN)) { diff --git a/Spigot-Server-Patches/0166-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0166-LivingEntity-setKiller.patch index 85ec9fe20..c37318acb 100644 --- a/Spigot-Server-Patches/0166-LivingEntity-setKiller.patch +++ b/Spigot-Server-Patches/0166-LivingEntity-setKiller.patch @@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#setKiller diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 729726782446085a6c3b811c4b540ff154c6c115..e8e91a415daef307a3793dd36ebb71d3cbd7b079 100644 +index 37ebefa8b1e4344a50643bcc13c31083f911d043..01130113c699047002640ccacf6210ca9a536ec1 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -86,7 +86,7 @@ public abstract class EntityLiving extends Entity { +@@ -87,7 +87,7 @@ public abstract class EntityLiving extends Entity { public float aE; @Nullable public EntityHuman killer; @@ -18,10 +18,10 @@ index 729726782446085a6c3b811c4b540ff154c6c115..e8e91a415daef307a3793dd36ebb71d3 protected int ticksFarFromPlayer; protected float aJ; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index dd12147fd5b37b0b6e54568d65f571534d0b3c67..0fade6225316e507c989bb265f94a1fa882473ce 100644 +index 283c65af3dedef650cf956db9aa5b582e2b6e6c3..057d7e09d153edb2f1e5c83ada33fc2089d00cbf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -323,6 +323,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -344,6 +344,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { return getHandle().killer == null ? null : (Player) getHandle().killer.getBukkitEntity(); } diff --git a/Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch index cd09035fd..a472e9223 100644 --- a/Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch +++ b/Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch @@ -20,10 +20,10 @@ index e30f48caf2ce4f48f371b2594b765c27bc9e9778..2d8b354d707e8b5b0e7cd644fb93bc8f + } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index de3565ec373066af1715e8e11117d22ae57e3c93..de207045cb007ca0b464d9f57f7f95ddeeb9bf6b 100644 +index 7239e9b9d072af9d1610fd2e06a123505e31a110..cc2f749ae12a165581328e6dab39fa74e08a7222 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -584,16 +584,32 @@ public class CraftEventFactory { +@@ -585,16 +585,32 @@ public class CraftEventFactory { EntityExperienceOrb xp = (EntityExperienceOrb) entity; double radius = world.spigotConfig.expMerge; if (radius > 0) { diff --git a/Spigot-Server-Patches/0177-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0177-Add-PlayerArmorChangeEvent.patch index d86b85b30..f835115b4 100644 --- a/Spigot-Server-Patches/0177-Add-PlayerArmorChangeEvent.patch +++ b/Spigot-Server-Patches/0177-Add-PlayerArmorChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index e8e91a415daef307a3793dd36ebb71d3cbd7b079..edd9fd66780fa8f7d3b1d807918a0cd8adb42b66 100644 +index 01130113c699047002640ccacf6210ca9a536ec1..77f95e26d1e5d3c505d412f863a85c7c3880ef0e 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1,5 +1,6 @@ @@ -15,7 +15,7 @@ index e8e91a415daef307a3793dd36ebb71d3cbd7b079..edd9fd66780fa8f7d3b1d807918a0cd8 import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -@@ -2522,6 +2523,13 @@ public abstract class EntityLiving extends Entity { +@@ -2533,6 +2534,13 @@ public abstract class EntityLiving extends Entity { ItemStack itemstack1 = this.getEquipment(enumitemslot); if (!ItemStack.matches(itemstack1, itemstack)) { diff --git a/Spigot-Server-Patches/0184-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0184-ExperienceOrbMergeEvent.patch index f81d7bf2c..800f37386 100644 --- a/Spigot-Server-Patches/0184-ExperienceOrbMergeEvent.patch +++ b/Spigot-Server-Patches/0184-ExperienceOrbMergeEvent.patch @@ -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 de207045cb007ca0b464d9f57f7f95ddeeb9bf6b..8964687af2c86d4226c9c13c2d0a23bdaa7c4dae 100644 +index cc2f749ae12a165581328e6dab39fa74e08a7222..e5fce28f7e2d544b98047aac2c3291e216e1d64e 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -594,7 +594,7 @@ public class CraftEventFactory { +@@ -595,7 +595,7 @@ public class CraftEventFactory { if (e instanceof EntityExperienceOrb) { EntityExperienceOrb loopItem = (EntityExperienceOrb) e; // Paper start diff --git a/Spigot-Server-Patches/0227-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0227-Make-shield-blocking-delay-configurable.patch index 6f1335923..5afa8fca5 100644 --- a/Spigot-Server-Patches/0227-Make-shield-blocking-delay-configurable.patch +++ b/Spigot-Server-Patches/0227-Make-shield-blocking-delay-configurable.patch @@ -19,10 +19,10 @@ index 69009246f12cc3acb0055af746e01097fa668e1b..35075ffac394153e28039809e0ed48fe + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index edd9fd66780fa8f7d3b1d807918a0cd8adb42b66..a425ca17bfe5b6b4d1048e09d3723b0208dc8430 100644 +index 77f95e26d1e5d3c505d412f863a85c7c3880ef0e..5db1dc0692c3435d7cd1ed2d1c6796ddd6ec8cf0 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -3187,7 +3187,7 @@ public abstract class EntityLiving extends Entity { +@@ -3198,7 +3198,7 @@ public abstract class EntityLiving extends Entity { if (this.isHandRaised() && !this.activeItem.isEmpty()) { Item item = this.activeItem.getItem(); @@ -31,7 +31,7 @@ index edd9fd66780fa8f7d3b1d807918a0cd8adb42b66..a425ca17bfe5b6b4d1048e09d3723b02 } else { return false; } -@@ -3443,4 +3443,15 @@ public abstract class EntityLiving extends Entity { +@@ -3454,4 +3454,15 @@ public abstract class EntityLiving extends Entity { public void broadcastItemBreak(EnumHand enumhand) { this.broadcastItemBreak(enumhand == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND); } @@ -48,10 +48,10 @@ index edd9fd66780fa8f7d3b1d807918a0cd8adb42b66..a425ca17bfe5b6b4d1048e09d3723b02 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 0fade6225316e507c989bb265f94a1fa882473ce..86ebd689189c442e3fec81e13fe912a2ff60e253 100644 +index 057d7e09d153edb2f1e5c83ada33fc2089d00cbf..caace62396e2612737ee5031bbbea699c5887fd2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -678,5 +678,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -699,5 +699,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public void setArrowsStuck(int arrows) { getHandle().setArrowCount(arrows); } diff --git a/Spigot-Server-Patches/0230-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0230-Implement-EntityKnockbackByEntityEvent.patch index f77073fc6..62cd2e443 100644 --- a/Spigot-Server-Patches/0230-Implement-EntityKnockbackByEntityEvent.patch +++ b/Spigot-Server-Patches/0230-Implement-EntityKnockbackByEntityEvent.patch @@ -41,10 +41,10 @@ index 5e3ab1e430c81ebfa9214020ffb1b3c61344ec55..95f1a9d7d5f381a0e345a7973c402136 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index a425ca17bfe5b6b4d1048e09d3723b0208dc8430..fb1b1014c0538b84491c315e4f868b9854b4b640 100644 +index 5db1dc0692c3435d7cd1ed2d1c6796ddd6ec8cf0..9ef4929554a98f4ea0f2265670817404ebb6029f 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -1239,7 +1239,7 @@ public abstract class EntityLiving extends Entity { +@@ -1240,7 +1240,7 @@ public abstract class EntityLiving extends Entity { } this.ap = (float) (MathHelper.d(d1, d0) * 57.2957763671875D - (double) this.yaw); @@ -53,7 +53,7 @@ index a425ca17bfe5b6b4d1048e09d3723b0208dc8430..fb1b1014c0538b84491c315e4f868b98 } else { this.ap = (float) ((int) (Math.random() * 2.0D) * 180); } -@@ -1287,7 +1287,7 @@ public abstract class EntityLiving extends Entity { +@@ -1288,7 +1288,7 @@ public abstract class EntityLiving extends Entity { } protected void e(EntityLiving entityliving) { @@ -62,7 +62,7 @@ index a425ca17bfe5b6b4d1048e09d3723b0208dc8430..fb1b1014c0538b84491c315e4f868b98 } private boolean f(DamageSource damagesource) { -@@ -1523,6 +1523,11 @@ public abstract class EntityLiving extends Entity { +@@ -1524,6 +1524,11 @@ public abstract class EntityLiving extends Entity { } public void a(float f, double d0, double d1) { @@ -74,7 +74,7 @@ index a425ca17bfe5b6b4d1048e09d3723b0208dc8430..fb1b1014c0538b84491c315e4f868b98 f = (float) ((double) f * (1.0D - this.b(GenericAttributes.KNOCKBACK_RESISTANCE))); if (f > 0.0F) { this.impulse = true; -@@ -1530,6 +1535,16 @@ public abstract class EntityLiving extends Entity { +@@ -1531,6 +1536,16 @@ public abstract class EntityLiving extends Entity { Vec3D vec3d1 = (new Vec3D(d0, 0.0D, d1)).d().a((double) f); this.setMot(vec3d.x / 2.0D - vec3d1.x, this.onGround ? Math.min(0.4D, vec3d.y / 2.0D + (double) f) : vec3d.y, vec3d.z / 2.0D - vec3d1.z); diff --git a/Spigot-Server-Patches/0232-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0232-LivingEntity-Hand-Raised-Item-Use-API.patch index 3066d60a7..11b0499d4 100644 --- a/Spigot-Server-Patches/0232-LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/Spigot-Server-Patches/0232-LivingEntity-Hand-Raised-Item-Use-API.patch @@ -6,10 +6,10 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API How long an entity has raised hands to charge an attack or use an item diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index fb1b1014c0538b84491c315e4f868b9854b4b640..84c330fd8f808775a42f0d0eddfe359b9d2f0c5b 100644 +index 9ef4929554a98f4ea0f2265670817404ebb6029f..4c48ff8fad90686da65097e4be6bcedca9761c3d 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -118,7 +118,7 @@ public abstract class EntityLiving extends Entity { +@@ -119,7 +119,7 @@ public abstract class EntityLiving extends Entity { private float bu; private int jumpTicks; private float bw; @@ -18,7 +18,7 @@ index fb1b1014c0538b84491c315e4f868b9854b4b640..84c330fd8f808775a42f0d0eddfe359b protected int bd; protected int be; private BlockPosition bx; -@@ -3170,10 +3170,12 @@ public abstract class EntityLiving extends Entity { +@@ -3181,10 +3181,12 @@ public abstract class EntityLiving extends Entity { return this.activeItem; } @@ -32,10 +32,10 @@ index fb1b1014c0538b84491c315e4f868b9854b4b640..84c330fd8f808775a42f0d0eddfe359b return this.isHandRaised() ? this.activeItem.k() - this.dY() : 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 86ebd689189c442e3fec81e13fe912a2ff60e253..993128183c13c2c01665215f1157c70277249a1d 100644 +index caace62396e2612737ee5031bbbea699c5887fd2..b54961ead096d05e147e32ab16c25c382a7756c6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -688,5 +688,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -709,5 +709,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public void setShieldBlockingDelay(int delay) { getHandle().setShieldBlockingDelay(delay); } diff --git a/Spigot-Server-Patches/0236-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0236-InventoryCloseEvent-Reason-API.patch index bf7ed128f..749bcfe76 100644 --- a/Spigot-Server-Patches/0236-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0236-InventoryCloseEvent-Reason-API.patch @@ -34,7 +34,7 @@ index 0f7e162b342ac589dc357508a1dcd1ab02d1fe3e..cc20b73a993d021789840ed2ee7ba1fc this.activeContainer = this.defaultContainer; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index af3d0ffd6d8b3a7f794e5084551cd6d31df10fc1..a7dc4aabf10c9b9b10897e7540c4da9b0a2b6eb8 100644 +index 4451fed44db1dc8b727b2bef3e0275bc9c829d6a..80962f5b1b00d5f5e07cdc1404d926d23da0159d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -412,7 +412,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -193,10 +193,10 @@ index 23889ce169baf956cfb39f1ec21a8369f80c5555..25175230583bbd6fcfc864dcbae4111d // 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 8964687af2c86d4226c9c13c2d0a23bdaa7c4dae..db916dc8fb4375392080e7a9d54b996991be865f 100644 +index e5fce28f7e2d544b98047aac2c3291e216e1d64e..0980c1f19340ac2bb044ff896f5ee6153c95bbd6 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1172,7 +1172,7 @@ public class CraftEventFactory { +@@ -1173,7 +1173,7 @@ public class CraftEventFactory { public static Container callInventoryOpenEvent(EntityPlayer player, Container container, boolean cancelled) { if (player.activeContainer != player.defaultContainer) { // fire INVENTORY_CLOSE if one already open @@ -205,7 +205,7 @@ index 8964687af2c86d4226c9c13c2d0a23bdaa7c4dae..db916dc8fb4375392080e7a9d54b9969 } CraftServer server = player.world.getServer(); -@@ -1337,12 +1337,22 @@ public class CraftEventFactory { +@@ -1338,12 +1338,22 @@ public class CraftEventFactory { return event; } diff --git a/Spigot-Server-Patches/0250-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0250-Vanished-players-don-t-have-rights.patch index ed1255a9d..797164fd1 100644 --- a/Spigot-Server-Patches/0250-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0250-Vanished-players-don-t-have-rights.patch @@ -147,10 +147,10 @@ index 7cacffaab40d47f6fdd53bb526e9146a33f2ebc4..b7380f2ef554dc5f562340b7c59fd23c public boolean s_() { return this.isClientSide; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index db916dc8fb4375392080e7a9d54b996991be865f..ee0212645425d70f4f5279f08d12bd75688eb6b1 100644 +index 0980c1f19340ac2bb044ff896f5ee6153c95bbd6..462cc4539c98787bb0c7e5925d8b6b06874120ca 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1208,6 +1208,14 @@ public class CraftEventFactory { +@@ -1209,6 +1209,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/0261-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0261-Add-hand-to-bucket-events.patch index 2ebc04a2d..9eb6316e3 100644 --- a/Spigot-Server-Patches/0261-Add-hand-to-bucket-events.patch +++ b/Spigot-Server-Patches/0261-Add-hand-to-bucket-events.patch @@ -126,10 +126,10 @@ index 13370a4a0d210bd3b14a26f60b1cd9a9a3a6c941..0b7047863bb3a3f3d61491bb1924b94a public float v() { return this.worldData.d(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index ee0212645425d70f4f5279f08d12bd75688eb6b1..b9dae2166f235b279a4d2a211177a1e00c5c4f31 100644 +index 462cc4539c98787bb0c7e5925d8b6b06874120ca..95f01296b1a7763f33ec17ab4e11d85549ca95c0 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -233,7 +233,7 @@ public class CraftEventFactory { +@@ -234,7 +234,7 @@ public class CraftEventFactory { public static Entity entityDamage; // For use in EntityDamageByEntityEvent // helper methods @@ -138,7 +138,7 @@ index ee0212645425d70f4f5279f08d12bd75688eb6b1..b9dae2166f235b279a4d2a211177a1e0 int spawnSize = Bukkit.getServer().getSpawnRadius(); if (world.getDimensionKey() != World.OVERWORLD) return true; -@@ -412,6 +412,20 @@ public class CraftEventFactory { +@@ -413,6 +413,20 @@ public class CraftEventFactory { } private static PlayerEvent getPlayerBucketEvent(boolean isFilling, WorldServer world, EntityHuman who, BlockPosition changed, BlockPosition clicked, EnumDirection clickedFace, ItemStack itemstack, net.minecraft.server.Item item) { @@ -159,7 +159,7 @@ index ee0212645425d70f4f5279f08d12bd75688eb6b1..b9dae2166f235b279a4d2a211177a1e0 Player player = (Player) who.getBukkitEntity(); CraftItemStack itemInHand = CraftItemStack.asNewCraftStack(item); Material bucket = CraftMagicNumbers.getMaterial(itemstack.getItem()); -@@ -424,10 +438,10 @@ public class CraftEventFactory { +@@ -425,10 +439,10 @@ public class CraftEventFactory { PlayerEvent event; if (isFilling) { diff --git a/Spigot-Server-Patches/0269-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0269-Allow-disabling-armour-stand-ticking.patch index cc0a727b7..015f7baa6 100644 --- a/Spigot-Server-Patches/0269-Allow-disabling-armour-stand-ticking.patch +++ b/Spigot-Server-Patches/0269-Allow-disabling-armour-stand-ticking.patch @@ -137,10 +137,10 @@ index 944c34a7011a0cfc447014e2931c8742f324fe59..4a4c2a7b117428137bed65ed66f207d6 this.datawatcher.set(EntityArmorStand.bh, vector3f); } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 84c330fd8f808775a42f0d0eddfe359b9d2f0c5b..adc2ba97b0f258ae9fdbde0bcee02f63fc9fbac7 100644 +index 4c48ff8fad90686da65097e4be6bcedca9761c3d..14fb5f34c683ec93c57b5383aef339dcbbf9e19a 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2502,6 +2502,7 @@ public abstract class EntityLiving extends Entity { +@@ -2513,6 +2513,7 @@ public abstract class EntityLiving extends Entity { } } diff --git a/Spigot-Server-Patches/0280-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0280-Add-ray-tracing-methods-to-LivingEntity.patch index 3388a3f4f..72bb8738f 100644 --- a/Spigot-Server-Patches/0280-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-Server-Patches/0280-Add-ray-tracing-methods-to-LivingEntity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index adc2ba97b0f258ae9fdbde0bcee02f63fc9fbac7..5ebd2d25cc52de3f1a091f0620d6b46be4fca784 100644 +index 14fb5f34c683ec93c57b5383aef339dcbbf9e19a..1971768fc5a7ebd8422474610d81d40fcef24cdc 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -3462,6 +3462,23 @@ public abstract class EntityLiving extends Entity { +@@ -3473,6 +3473,23 @@ public abstract class EntityLiving extends Entity { this.broadcastItemBreak(enumhand == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND); } // Paper start @@ -33,7 +33,7 @@ index adc2ba97b0f258ae9fdbde0bcee02f63fc9fbac7..5ebd2d25cc52de3f1a091f0620d6b46b public int getShieldBlockingDelay() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 993128183c13c2c01665215f1157c70277249a1d..63f46a4c6fda5a08f89d68da879ce4ad83056cf5 100644 +index b54961ead096d05e147e32ab16c25c382a7756c6..52b503442e96814f17b0a95a201e4c2bd356cd60 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -201,6 +201,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0282-Improve-death-events.patch b/Spigot-Server-Patches/0282-Improve-death-events.patch index e66c5c06b..c4c716cec 100644 --- a/Spigot-Server-Patches/0282-Improve-death-events.patch +++ b/Spigot-Server-Patches/0282-Improve-death-events.patch @@ -119,10 +119,10 @@ index 29d1b9bb4e481b6d6fb7185d9adf17f5ec07d4a1..c14d722e9b1ed61d2878ca752797871b public void saveData(NBTTagCompound nbttagcompound) { super.saveData(nbttagcompound); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 5ebd2d25cc52de3f1a091f0620d6b46be4fca784..b4b45d93188494ae0639ae4eb9c764a48fe21607 100644 +index 1971768fc5a7ebd8422474610d81d40fcef24cdc..e95091c10ca14ddc20b904e2759fb63504c177a0 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -95,7 +95,7 @@ public abstract class EntityLiving extends Entity { +@@ -96,7 +96,7 @@ public abstract class EntityLiving extends Entity { protected float aL; protected float aM; protected float aN; @@ -131,7 +131,7 @@ index 5ebd2d25cc52de3f1a091f0620d6b46be4fca784..b4b45d93188494ae0639ae4eb9c764a4 public float lastDamage; protected boolean jumping; public float aR; -@@ -139,6 +139,7 @@ public abstract class EntityLiving extends Entity { +@@ -140,6 +140,7 @@ public abstract class EntityLiving extends Entity { public Set collidableExemptions = new HashSet<>(); public boolean canPickUpLoot; public org.bukkit.craftbukkit.entity.CraftLivingEntity getBukkitLivingEntity() { return (org.bukkit.craftbukkit.entity.CraftLivingEntity) super.getBukkitEntity(); } // Paper @@ -139,7 +139,7 @@ index 5ebd2d25cc52de3f1a091f0620d6b46be4fca784..b4b45d93188494ae0639ae4eb9c764a4 @Override public float getBukkitYaw() { -@@ -1248,13 +1249,17 @@ public abstract class EntityLiving extends Entity { +@@ -1249,13 +1250,17 @@ public abstract class EntityLiving extends Entity { if (knockbackCancelled) this.world.broadcastEntityEffect(this, (byte) 2); // Paper - Disable explosion knockback if (this.dk()) { if (!this.f(damagesource)) { @@ -161,7 +161,7 @@ index 5ebd2d25cc52de3f1a091f0620d6b46be4fca784..b4b45d93188494ae0639ae4eb9c764a4 } } else if (flag1) { this.c(damagesource); -@@ -1393,6 +1398,7 @@ public abstract class EntityLiving extends Entity { +@@ -1394,6 +1399,7 @@ public abstract class EntityLiving extends Entity { Entity entity = damagesource.getEntity(); EntityLiving entityliving = this.getKillingEntity(); @@ -169,7 +169,7 @@ index 5ebd2d25cc52de3f1a091f0620d6b46be4fca784..b4b45d93188494ae0639ae4eb9c764a4 if (this.aO >= 0 && entityliving != null) { entityliving.a(this, this.aO, damagesource); } -@@ -1400,20 +1406,40 @@ public abstract class EntityLiving extends Entity { +@@ -1401,20 +1407,40 @@ public abstract class EntityLiving extends Entity { if (this.isSleeping()) { this.entityWakeup(); } @@ -213,7 +213,7 @@ index 5ebd2d25cc52de3f1a091f0620d6b46be4fca784..b4b45d93188494ae0639ae4eb9c764a4 } } -@@ -1421,7 +1447,7 @@ public abstract class EntityLiving extends Entity { +@@ -1422,7 +1448,7 @@ public abstract class EntityLiving extends Entity { if (!this.world.isClientSide) { boolean flag = false; @@ -222,7 +222,7 @@ index 5ebd2d25cc52de3f1a091f0620d6b46be4fca784..b4b45d93188494ae0639ae4eb9c764a4 if (this.world.getGameRules().getBoolean(GameRules.MOB_GRIEFING)) { BlockPosition blockposition = this.getChunkCoordinates(); IBlockData iblockdata = Blocks.WITHER_ROSE.getBlockData(); -@@ -1442,7 +1468,8 @@ public abstract class EntityLiving extends Entity { +@@ -1443,7 +1469,8 @@ public abstract class EntityLiving extends Entity { } } @@ -232,7 +232,7 @@ index 5ebd2d25cc52de3f1a091f0620d6b46be4fca784..b4b45d93188494ae0639ae4eb9c764a4 Entity entity = damagesource.getEntity(); int i; -@@ -1460,15 +1487,18 @@ public abstract class EntityLiving extends Entity { +@@ -1461,15 +1488,18 @@ public abstract class EntityLiving extends Entity { this.dropDeathLoot(damagesource, i, flag); } // CraftBukkit start - Call death event @@ -252,7 +252,7 @@ index 5ebd2d25cc52de3f1a091f0620d6b46be4fca784..b4b45d93188494ae0639ae4eb9c764a4 // CraftBukkit start public int getExpReward() { -@@ -1553,6 +1583,7 @@ public abstract class EntityLiving extends Entity { +@@ -1554,6 +1584,7 @@ public abstract class EntityLiving extends Entity { return SoundEffects.ENTITY_GENERIC_HURT; } @@ -260,7 +260,7 @@ index 5ebd2d25cc52de3f1a091f0620d6b46be4fca784..b4b45d93188494ae0639ae4eb9c764a4 @Nullable protected SoundEffect getSoundDeath() { return SoundEffects.ENTITY_GENERIC_DEATH; -@@ -2072,10 +2103,12 @@ public abstract class EntityLiving extends Entity { +@@ -2083,10 +2114,12 @@ public abstract class EntityLiving extends Entity { } @@ -274,7 +274,7 @@ index 5ebd2d25cc52de3f1a091f0620d6b46be4fca784..b4b45d93188494ae0639ae4eb9c764a4 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 a7dc4aabf10c9b9b10897e7540c4da9b0a2b6eb8..d6586e2c36f89328ba482230ae7d6a050966ed27 100644 +index 80962f5b1b00d5f5e07cdc1404d926d23da0159d..e7340fd1acd711e07d466882debb7225559cc21a 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -82,6 +82,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -373,10 +373,10 @@ index b90b35c08cdc9bb44aaf9f4824289fd0824c937f..28a04cb8a90ad82b86f658ad17675ab5 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 b9dae2166f235b279a4d2a211177a1e00c5c4f31..90ab1c85f9b9055172e01fe4ba899c9eda6f5cfa 100644 +index 95f01296b1a7763f33ec17ab4e11d85549ca95c0..460f473b0158f2392261a55db12fa735969de470 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -790,9 +790,16 @@ public class CraftEventFactory { +@@ -791,9 +791,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()); @@ -393,7 +393,7 @@ index b9dae2166f235b279a4d2a211177a1e00c5c4f31..90ab1c85f9b9055172e01fe4ba899c9e victim.expToDrop = event.getDroppedExp(); for (org.bukkit.inventory.ItemStack stack : event.getDrops()) { -@@ -808,8 +815,15 @@ public class CraftEventFactory { +@@ -809,8 +816,15 @@ public class CraftEventFactory { CraftPlayer entity = victim.getBukkitEntity(); PlayerDeathEvent event = new PlayerDeathEvent(entity, drops, victim.getExpReward(), 0, deathMessage); event.setKeepInventory(keepInventory); @@ -409,7 +409,7 @@ index b9dae2166f235b279a4d2a211177a1e00c5c4f31..90ab1c85f9b9055172e01fe4ba899c9e victim.keepLevel = event.getKeepLevel(); victim.newLevel = event.getNewLevel(); -@@ -826,6 +840,31 @@ public class CraftEventFactory { +@@ -827,6 +841,31 @@ public class CraftEventFactory { return event; } diff --git a/Spigot-Server-Patches/0318-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0318-force-entity-dismount-during-teleportation.patch index f759a50c9..7c84dc18c 100644 --- a/Spigot-Server-Patches/0318-force-entity-dismount-during-teleportation.patch +++ b/Spigot-Server-Patches/0318-force-entity-dismount-during-teleportation.patch @@ -91,10 +91,10 @@ index a6265c71973b67a0b49a41e2163a6f48876f1b41..272f4ff0a59350a088d6699a9fcb6bb9 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index b4b45d93188494ae0639ae4eb9c764a48fe21607..7c239b95c9f8dfa76d397979e6b3fdcc9ff55022 100644 +index e95091c10ca14ddc20b904e2759fb63504c177a0..f23a4ef2a0479b6a7508f99fa8753375d60ac440 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2892,11 +2892,13 @@ public abstract class EntityLiving extends Entity { +@@ -2903,11 +2903,13 @@ public abstract class EntityLiving extends Entity { return ((Byte) this.datawatcher.get(EntityLiving.ag) & 4) != 0; } @@ -112,7 +112,7 @@ index b4b45d93188494ae0639ae4eb9c764a48fe21607..7c239b95c9f8dfa76d397979e6b3fdcc this.a(entity); } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 01d679cfa6ad8f5dc5bb4539197a59cb00c65337..d27868d71af20579dff1109e78029b19347da058 100644 +index 777b2f7e77d2b59d5a439252daf9d317ab82a838..04bd11742627815890c676df134ec23221cea3e7 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1107,11 +1107,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0338-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0338-Add-LivingEntity-getTargetEntity.patch index f23b92694..ef5931708 100644 --- a/Spigot-Server-Patches/0338-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-Server-Patches/0338-Add-LivingEntity-getTargetEntity.patch @@ -66,10 +66,10 @@ index 915378493d9c5bb501b21eb7aca380580716f4c3..8832ffc0fcf9410ecc07ac100c2c8e3c return 0.0F; } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 7c239b95c9f8dfa76d397979e6b3fdcc9ff55022..f0202dcb31fe637caa6bd998edec4cbc1def8324 100644 +index f23a4ef2a0479b6a7508f99fa8753375d60ac440..6e0fe247f50a729d260792a508ca2f9f641f2650 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -3514,6 +3514,37 @@ public abstract class EntityLiving extends Entity { +@@ -3525,6 +3525,37 @@ public abstract class EntityLiving extends Entity { return world.rayTrace(raytrace); } @@ -120,7 +120,7 @@ index e8e7532493c973ce10d94a41676859674fc4e6f6..50f342c5f6e1ee5865646af0327567d7 return !(entity instanceof EntityHuman) || !entity.isSpectator() && !((EntityHuman) entity).isCreative() && entity.world.getDifficulty() != EnumDifficulty.PEACEFUL; }; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 63f46a4c6fda5a08f89d68da879ce4ad83056cf5..607f0bca1ca454bd60aad82df81702bf15e0ff4a 100644 +index 52b503442e96814f17b0a95a201e4c2bd356cd60..4ce3295aba63d5b685641a6d308d91de9d7537fb 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -221,6 +221,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0380-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0380-Prevent-consuming-the-wrong-itemstack.patch index 6a0e6489f..9d818886f 100644 --- a/Spigot-Server-Patches/0380-Prevent-consuming-the-wrong-itemstack.patch +++ b/Spigot-Server-Patches/0380-Prevent-consuming-the-wrong-itemstack.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Prevent consuming the wrong itemstack diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index f0202dcb31fe637caa6bd998edec4cbc1def8324..cf2850e21ac93ccc5ec95122f715be78bfdabb99 100644 +index 6e0fe247f50a729d260792a508ca2f9f641f2650..501eb0c0f5aac4385b3eef0c334ed0cf1944abe1 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -3077,10 +3077,13 @@ public abstract class EntityLiving extends Entity { +@@ -3088,10 +3088,13 @@ public abstract class EntityLiving extends Entity { this.datawatcher.set(EntityLiving.ag, (byte) j); } @@ -24,7 +24,7 @@ index f0202dcb31fe637caa6bd998edec4cbc1def8324..cf2850e21ac93ccc5ec95122f715be78 this.activeItem = itemstack; this.bd = itemstack.k(); if (!this.world.isClientSide) { -@@ -3158,6 +3161,7 @@ public abstract class EntityLiving extends Entity { +@@ -3169,6 +3172,7 @@ public abstract class EntityLiving extends Entity { this.releaseActiveItem(); } else { if (!this.activeItem.isEmpty() && this.isHandRaised()) { @@ -32,7 +32,7 @@ index f0202dcb31fe637caa6bd998edec4cbc1def8324..cf2850e21ac93ccc5ec95122f715be78 this.b(this.activeItem, 16); // CraftBukkit start - fire PlayerItemConsumeEvent ItemStack itemstack; -@@ -3192,8 +3196,8 @@ public abstract class EntityLiving extends Entity { +@@ -3203,8 +3207,8 @@ public abstract class EntityLiving extends Entity { } this.clearActiveItem(); diff --git a/Spigot-Server-Patches/0389-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0389-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch index 7c9e91eb7..1cf7e77b6 100644 --- a/Spigot-Server-Patches/0389-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch +++ b/Spigot-Server-Patches/0389-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch @@ -7,10 +7,10 @@ Fixes an AssertionError when setting the player's item in hand to null or a new Fixes GH-2718 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index cf2850e21ac93ccc5ec95122f715be78bfdabb99..ad0203c9d61d9651fc81783ea223f161f1a782e4 100644 +index 501eb0c0f5aac4385b3eef0c334ed0cf1944abe1..b36f4b5cd023df2e31feafe52850e2dee3660014 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2038,6 +2038,7 @@ public abstract class EntityLiving extends Entity { +@@ -2049,6 +2049,7 @@ public abstract class EntityLiving extends Entity { return predicate.test(this.getItemInMainHand().getItem()) || predicate.test(this.getItemInOffHand().getItem()); } diff --git a/Spigot-Server-Patches/0401-Lag-compensate-eating.patch b/Spigot-Server-Patches/0401-Lag-compensate-eating.patch index b2beb049c..0351b6518 100644 --- a/Spigot-Server-Patches/0401-Lag-compensate-eating.patch +++ b/Spigot-Server-Patches/0401-Lag-compensate-eating.patch @@ -7,10 +7,10 @@ When the server is lagging, players will wait longer when eating. Change to also use a time check instead if it passes. diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index ad0203c9d61d9651fc81783ea223f161f1a782e4..d022948861c00c022864b5d2071c1956885a1dc7 100644 +index b36f4b5cd023df2e31feafe52850e2dee3660014..9eb7c8e4f58956d652b5b1f636353f0da98c2606 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -119,7 +119,7 @@ public abstract class EntityLiving extends Entity { +@@ -120,7 +120,7 @@ public abstract class EntityLiving extends Entity { private int jumpTicks; private float bw; public ItemStack activeItem; // Paper - public @@ -19,7 +19,7 @@ index ad0203c9d61d9651fc81783ea223f161f1a782e4..d022948861c00c022864b5d2071c1956 protected int be; private BlockPosition bx; private Optional by; -@@ -3027,6 +3027,11 @@ public abstract class EntityLiving extends Entity { +@@ -3038,6 +3038,11 @@ public abstract class EntityLiving extends Entity { return ((Byte) this.datawatcher.get(EntityLiving.ag) & 2) > 0 ? EnumHand.OFF_HAND : EnumHand.MAIN_HAND; } @@ -31,7 +31,7 @@ index ad0203c9d61d9651fc81783ea223f161f1a782e4..d022948861c00c022864b5d2071c1956 private void t() { if (this.isHandRaised()) { if (ItemStack.d(this.b(this.getRaisedHand()), this.activeItem)) { -@@ -3036,7 +3041,12 @@ public abstract class EntityLiving extends Entity { +@@ -3047,7 +3052,12 @@ public abstract class EntityLiving extends Entity { this.b(this.activeItem, 5); } @@ -45,7 +45,7 @@ index ad0203c9d61d9651fc81783ea223f161f1a782e4..d022948861c00c022864b5d2071c1956 this.s(); } } else { -@@ -3086,7 +3096,10 @@ public abstract class EntityLiving extends Entity { +@@ -3097,7 +3107,10 @@ public abstract class EntityLiving extends Entity { if (!itemstack.isEmpty() && !this.isHandRaised() || forceUpdate) { // Paper use override flag this.activeItem = itemstack; @@ -57,7 +57,7 @@ index ad0203c9d61d9651fc81783ea223f161f1a782e4..d022948861c00c022864b5d2071c1956 if (!this.world.isClientSide) { this.c(1, true); this.c(2, enumhand == EnumHand.OFF_HAND); -@@ -3110,7 +3123,10 @@ public abstract class EntityLiving extends Entity { +@@ -3121,7 +3134,10 @@ public abstract class EntityLiving extends Entity { } } else if (!this.isHandRaised() && !this.activeItem.isEmpty()) { this.activeItem = ItemStack.b; @@ -69,7 +69,7 @@ index ad0203c9d61d9651fc81783ea223f161f1a782e4..d022948861c00c022864b5d2071c1956 } } -@@ -3238,7 +3254,10 @@ public abstract class EntityLiving extends Entity { +@@ -3249,7 +3265,10 @@ public abstract class EntityLiving extends Entity { } this.activeItem = ItemStack.b; diff --git a/Spigot-Server-Patches/0406-Entity-Activation-Range-2.0.patch b/Spigot-Server-Patches/0406-Entity-Activation-Range-2.0.patch index eb628880c..7b4ba2f7d 100644 --- a/Spigot-Server-Patches/0406-Entity-Activation-Range-2.0.patch +++ b/Spigot-Server-Patches/0406-Entity-Activation-Range-2.0.patch @@ -108,10 +108,10 @@ index f5203a0058974de7f1e3e9e291908ff37d54dbd0..9cf496b5e59b228ed65dca7b6b2fea72 if (this.isPassenger() && this.getVehicle() instanceof EntityInsentient) { EntityInsentient entityinsentient = (EntityInsentient) this.getVehicle(); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index d022948861c00c022864b5d2071c1956885a1dc7..0442bb347ffbfb9e2102cd490717579b9aafdcd0 100644 +index 9eb7c8e4f58956d652b5b1f636353f0da98c2606..8ba93673ad5516b597cbe185bb8402fb5ab4e6e7 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -97,7 +97,7 @@ public abstract class EntityLiving extends Entity { +@@ -98,7 +98,7 @@ public abstract class EntityLiving extends Entity { protected float aN; protected int aO;protected int getKillCount() { return this.aO; } // Paper - OBFHELPER public float lastDamage; diff --git a/Spigot-Server-Patches/0413-Entity-Jump-API.patch b/Spigot-Server-Patches/0413-Entity-Jump-API.patch index d6dda8730..bd4c2c758 100644 --- a/Spigot-Server-Patches/0413-Entity-Jump-API.patch +++ b/Spigot-Server-Patches/0413-Entity-Jump-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity Jump API diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 0442bb347ffbfb9e2102cd490717579b9aafdcd0..4ecb5076aacd7d779742dc47d5da5a68f58d7c73 100644 +index 8ba93673ad5516b597cbe185bb8402fb5ab4e6e7..1227dfbc0599b59fab6216a60f120f895b1f6f8c 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2752,8 +2752,10 @@ public abstract class EntityLiving extends Entity { +@@ -2763,8 +2763,10 @@ public abstract class EntityLiving extends Entity { } else if (this.aP() && (!this.onGround || d7 > d8)) { this.c((Tag) TagsFluid.LAVA); } else if ((this.onGround || flag && d7 <= d8) && this.jumpTicks == 0) { @@ -34,10 +34,10 @@ index ed8c0073f0c938c2ee8ed0dad2afda21a115b67d..01cc3d94d3fe1f82c94abdfcc92b0d3b } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 607f0bca1ca454bd60aad82df81702bf15e0ff4a..a42db6ae603da8850a29944b63da5928dd2dd40f 100644 +index 4ce3295aba63d5b685641a6d308d91de9d7537fb..32819e4a8fcb1ac5d09ec0568fbb55da7b2d489d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -757,5 +757,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -778,5 +778,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public boolean isHandRaised() { return getHandle().isHandRaised(); } diff --git a/Spigot-Server-Patches/0416-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-Server-Patches/0416-add-hand-to-BlockMultiPlaceEvent.patch index c7d07ec00..75f07134f 100644 --- a/Spigot-Server-Patches/0416-add-hand-to-BlockMultiPlaceEvent.patch +++ b/Spigot-Server-Patches/0416-add-hand-to-BlockMultiPlaceEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 90ab1c85f9b9055172e01fe4ba899c9eda6f5cfa..18981022242cdab6a3d1b17a0f0d1ff988fa8e08 100644 +index 460f473b0158f2392261a55db12fa735969de470..ded7ac09b161135885189e1fb71403ef4856ad30 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -335,13 +335,18 @@ public class CraftEventFactory { +@@ -336,13 +336,18 @@ public class CraftEventFactory { } org.bukkit.inventory.ItemStack item; diff --git a/Spigot-Server-Patches/0449-Don-t-run-entity-collision-code-if-not-needed.patch b/Spigot-Server-Patches/0449-Don-t-run-entity-collision-code-if-not-needed.patch index c2112a5d8..92d2a868c 100644 --- a/Spigot-Server-Patches/0449-Don-t-run-entity-collision-code-if-not-needed.patch +++ b/Spigot-Server-Patches/0449-Don-t-run-entity-collision-code-if-not-needed.patch @@ -7,10 +7,10 @@ Will not run if max entity craming is disabled and the max collisions per entity is less than or equal to 0 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 4ecb5076aacd7d779742dc47d5da5a68f58d7c73..4001510337a0a0b6f464b799c434f5ff10549225 100644 +index 1227dfbc0599b59fab6216a60f120f895b1f6f8c..1e6295d33be71c482da4a53dad4c3aa5ffce5710 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2820,10 +2820,16 @@ public abstract class EntityLiving extends Entity { +@@ -2831,10 +2831,16 @@ public abstract class EntityLiving extends Entity { protected void doTick() {} protected void collideNearby() { diff --git a/Spigot-Server-Patches/0459-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-Server-Patches/0459-Add-PlayerAttackEntityCooldownResetEvent.patch index 81737fb15..35a9be149 100644 --- a/Spigot-Server-Patches/0459-Add-PlayerAttackEntityCooldownResetEvent.patch +++ b/Spigot-Server-Patches/0459-Add-PlayerAttackEntityCooldownResetEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 4001510337a0a0b6f464b799c434f5ff10549225..3fbe27fd980cba07acc793077e80a3053e7cb2d8 100644 +index 1e6295d33be71c482da4a53dad4c3aa5ffce5710..b3e54f14aff15a3cb73de5a8e04de91336c1370e 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -1823,7 +1823,16 @@ public abstract class EntityLiving extends Entity { +@@ -1824,7 +1824,16 @@ public abstract class EntityLiving extends Entity { EntityDamageEvent event = CraftEventFactory.handleLivingEntityDamageEvent(this, damagesource, originalDamage, hardHatModifier, blockingModifier, armorModifier, resistanceModifier, magicModifier, absorptionModifier, hardHat, blocking, armor, resistance, magic, absorption); if (damagesource.getEntity() instanceof EntityHuman) { diff --git a/Spigot-Server-Patches/0463-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/Spigot-Server-Patches/0463-Fix-numerous-item-duplication-issues-and-teleport-is.patch index d84b4ac42..f058da737 100644 --- a/Spigot-Server-Patches/0463-Fix-numerous-item-duplication-issues-and-teleport-is.patch +++ b/Spigot-Server-Patches/0463-Fix-numerous-item-duplication-issues-and-teleport-is.patch @@ -88,10 +88,10 @@ index 587e8e582dfe9c3127ca2b298c4e1db79c2d6c8e..81df71b7e165b8702575176550a587cd } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 18981022242cdab6a3d1b17a0f0d1ff988fa8e08..5e0040078c85daa975568539d8d9a3641ccdd8fb 100644 +index ded7ac09b161135885189e1fb71403ef4856ad30..65de5c4e5ffb993d85af2410c44d0149878b6859 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -810,7 +810,8 @@ public class CraftEventFactory { +@@ -811,7 +811,8 @@ public class CraftEventFactory { for (org.bukkit.inventory.ItemStack stack : event.getDrops()) { if (stack == null || stack.getType() == Material.AIR || stack.getAmount() == 0) continue; diff --git a/Spigot-Server-Patches/0477-Fix-PotionEffect-ignores-icon-flag.patch b/Spigot-Server-Patches/0477-Fix-PotionEffect-ignores-icon-flag.patch index 3d7a71715..e81ae0422 100644 --- a/Spigot-Server-Patches/0477-Fix-PotionEffect-ignores-icon-flag.patch +++ b/Spigot-Server-Patches/0477-Fix-PotionEffect-ignores-icon-flag.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix PotionEffect ignores icon flag diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index a42db6ae603da8850a29944b63da5928dd2dd40f..76781281c0a6e7528b79002a0645902d33c8ae04 100644 +index 32819e4a8fcb1ac5d09ec0568fbb55da7b2d489d..9577af4ffbf15e970f342976838315e023b4d83b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -389,7 +389,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -410,7 +410,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @Override public boolean addPotionEffect(PotionEffect effect, boolean force) { diff --git a/Spigot-Server-Patches/0529-Add-PrepareResultEvent.patch b/Spigot-Server-Patches/0529-Add-PrepareResultEvent.patch index ee33b3119..de81d99f6 100644 --- a/Spigot-Server-Patches/0529-Add-PrepareResultEvent.patch +++ b/Spigot-Server-Patches/0529-Add-PrepareResultEvent.patch @@ -106,10 +106,10 @@ index c9505513e7e34637f8eebd68d756834479c1ca0c..5351bf137623a8909fea672c96a6057c private void a(IInventory iinventory, ItemStack itemstack) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 5e0040078c85daa975568539d8d9a3641ccdd8fb..8193b317bfd16f33873ddf5cd298c98ad0875cf6 100644 +index 65de5c4e5ffb993d85af2410c44d0149878b6859..8d5b08cbeb09049d28e2a02c7a5617386eb3fc5e 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1551,19 +1551,44 @@ public class CraftEventFactory { +@@ -1552,19 +1552,44 @@ public class CraftEventFactory { return event; } diff --git a/Spigot-Server-Patches/0531-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/Spigot-Server-Patches/0531-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch index 8dceb6bdb..d1ecd131b 100644 --- a/Spigot-Server-Patches/0531-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch +++ b/Spigot-Server-Patches/0531-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 3fbe27fd980cba07acc793077e80a3053e7cb2d8..f4ea14d66320e6799f0d1a91de9a3c63423a6c3e 100644 +index b3e54f14aff15a3cb73de5a8e04de91336c1370e..c622fb7044f9988a125af48784e239353a6d27d2 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2917,7 +2917,7 @@ public abstract class EntityLiving extends Entity { +@@ -2928,7 +2928,7 @@ public abstract class EntityLiving extends Entity { Entity entity = this.getVehicle(); super.stopRiding(suppressCancellation); // Paper - suppress diff --git a/Spigot-Server-Patches/0558-Add-playPickupItemAnimation-to-LivingEntity.patch b/Spigot-Server-Patches/0558-Add-playPickupItemAnimation-to-LivingEntity.patch index 25cfe9bbd..ac6473c77 100644 --- a/Spigot-Server-Patches/0558-Add-playPickupItemAnimation-to-LivingEntity.patch +++ b/Spigot-Server-Patches/0558-Add-playPickupItemAnimation-to-LivingEntity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 76781281c0a6e7528b79002a0645902d33c8ae04..0819c31979540443576411ba8135e01a8db59775 100644 +index 9577af4ffbf15e970f342976838315e023b4d83b..22705cda3d2ec7f0c037a7e130572d6e18d0b91b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -772,5 +772,9 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -793,5 +793,9 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { } } diff --git a/work/Bukkit b/work/Bukkit index 565a57274..b56e8160a 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 565a57274a4c8259ffdd9792b70c0a9fe5adb214 +Subproject commit b56e8160a9514bb58a7348432255489e85dff8cf diff --git a/work/CraftBukkit b/work/CraftBukkit index 927200a96..39806409e 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 927200a96161a3cbfb0eaff1ba4474abe608298a +Subproject commit 39806409e71c5df7a22b55919923b05e5402b5d9