diff options
| author | Nassim Jahnke <[email protected]> | 2024-02-23 14:37:33 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-02-23 14:37:33 +0100 |
| commit | 71c84c8132a463ca26978b852bbbf33ae42cd4ce (patch) | |
| tree | bbdde5e8056d16ba6778e56165db39b1f6d44468 /patches/server/0469-Expose-LivingEntity-hurt-direction.patch | |
| parent | 3ea95efdebba7254e842dec66214f71de4721993 (diff) | |
| download | Paper-71c84c8132a463ca26978b852bbbf33ae42cd4ce.tar.gz Paper-71c84c8132a463ca26978b852bbbf33ae42cd4ce.zip | |
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear 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:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
Diffstat (limited to 'patches/server/0469-Expose-LivingEntity-hurt-direction.patch')
| -rw-r--r-- | patches/server/0469-Expose-LivingEntity-hurt-direction.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0469-Expose-LivingEntity-hurt-direction.patch b/patches/server/0469-Expose-LivingEntity-hurt-direction.patch index 1cb5f9dcf7..73f36c0bb3 100644 --- a/patches/server/0469-Expose-LivingEntity-hurt-direction.patch +++ b/patches/server/0469-Expose-LivingEntity-hurt-direction.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose LivingEntity hurt direction diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index d00d6cf28212ed72f49953a198caa447aefc138c..203f36776f41c46172b77a195d3702dd6af7409e 100644 +index 603e003fbd39870a0e249151885b3b8f3e120afe..6fe21c29aa9d119490fbf1d69eb03c146674cde5 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -179,7 +179,7 @@ public abstract class Player extends LivingEntity { +@@ -180,7 +180,7 @@ public abstract class Player extends LivingEntity { private Optional<GlobalPos> lastDeathLocation; @Nullable public FishingHook fishing; @@ -36,7 +36,7 @@ index 93644aefd2e6c97eca2735812b2b7b4bd039cfb5..40f848d117c1a4f4fc2f11861c5f1420 public int getSleepTicks() { return this.getHandle().sleepCounter; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index e71f71988790af1a09f65d73dd081490002b821c..06f25a9453bcc8f304cc83b599f8a54112a6ed01 100644 +index aac0fb198fb912dc59dc56f449e586839600fa13..3b2d54d7a365e268107c4abc5a15c996954e5e9c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -961,5 +961,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { |