diff options
| author | Spottedleaf <[email protected]> | 2019-09-21 21:12:45 -0700 |
|---|---|---|
| committer | Zach <[email protected]> | 2019-09-21 23:12:45 -0500 |
| commit | c68dbb864cfadd2c55ab0e2eedefff7f929e281d (patch) | |
| tree | 9420b8fe9220b9e70c22d7bb922ab6611f39605d /Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch | |
| parent | 1e5219940c5ca5014c54abda8d6cd3cbea5ee40e (diff) | |
| download | Paper-c68dbb864cfadd2c55ab0e2eedefff7f929e281d.tar.gz Paper-c68dbb864cfadd2c55ab0e2eedefff7f929e281d.zip | |
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#2576)
* Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
6527cb58 SPIGOT-5329: Clarify isGlowing documentation
5ddb414f Make Lantern extend BlockData
cb888903 Fix typos in previous commits
2a5e0ca2 Bring EnchantItemEvent documentation in line with EnchantmentOffer
3c5fcea2 SPIGOT-5317: Create accessors for player absorption hearts
c6e0d625 SPIGOT-5320: Clarify scope of ExactChoice
CraftBukkit Changes:
a3fdef8c SPIGOT-5331: Add support for Java 13
6ddeb980 SPIGOT-5317: Create accessors for player absorption hearts
5d335e96 SPIGOT-5315: Cannot serialize armor stand ItemMeta
Spigot Changes:
94af569b SPIGOT-5319: Async catcher for getNearbyEntities
Diffstat (limited to 'Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch')
| -rw-r--r-- | Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 dd1e6aec16..7f2cd8db29 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 @@ -1,14 +1,14 @@ -From e17fd478da771d89e0b77adb036d3152650f0827 Mon Sep 17 00:00:00 2001 +From 8114e0e26ee38a3683d2167e0cba2ff3423bb941 Mon Sep 17 00:00:00 2001 From: mrapple <[email protected]> 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 82b3c0a7de..aa50435bec 100644 +index 029c2d475..7e9aff668 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -598,4 +598,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -611,4 +611,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public <T> void setMemory(MemoryKey<T> memoryKey, T t) { getHandle().getBehaviorController().setMemory(CraftMemoryKey.fromMemoryKey(memoryKey), CraftMemoryMapper.toNms(t)); } @@ -26,5 +26,5 @@ index 82b3c0a7de..aa50435bec 100644 + // Paper end } -- -2.22.0 +2.22.1 |