diff options
| author | Shane Freeder <[email protected]> | 2024-02-16 22:44:38 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-02-16 23:44:38 +0100 |
| commit | 7f85940143163783a384d6d967c2c0ac7f5d25f2 (patch) | |
| tree | ca3b8cbed0d9abc6b45abf67080c07799aadd4ba /patches/api/0006-Adventure.patch | |
| parent | 37df12143c4f19eb6017619b7e7abeb0f848598a (diff) | |
| download | Paper-7f85940143163783a384d6d967c2c0ac7f5d25f2.tar.gz Paper-7f85940143163783a384d6d967c2c0ac7f5d25f2.zip | |
Updated Upstream (Bukkit) (#10255)
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:
58ce1b0f Improve compatibility of new DamageSource API
Diffstat (limited to 'patches/api/0006-Adventure.patch')
| -rw-r--r-- | patches/api/0006-Adventure.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch index eb57e4f25e..5a408070fe 100644 --- a/patches/api/0006-Adventure.patch +++ b/patches/api/0006-Adventure.patch @@ -2116,7 +2116,7 @@ index 7ad7bcf9a9333c8d6d1d7cab53a6d457ec20bbf6..c4f86ba1037f3f0e5d697a0962d71d6f + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index cc577b5af6832ea9c98aceb587de378095277ada..0025139f403cfc80ace9f8584ccf42d3a5cbb718 100644 +index 53450c104a25151094961a58ffa0d809e3b9a064..474765f40801a766c853018ea6e1adcd010375d2 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable; @@ -2128,7 +2128,7 @@ index cc577b5af6832ea9c98aceb587de378095277ada..0025139f403cfc80ace9f8584ccf42d3 /** * Gets the entity's current position -@@ -763,4 +763,20 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -765,4 +765,20 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @Override Spigot spigot(); // Spigot end |