diff options
author | Nassim Jahnke <[email protected]> | 2022-05-17 11:51:46 +0200 |
---|---|---|
committer | Nassim Jahnke <[email protected]> | 2022-05-17 11:51:46 +0200 |
commit | 73bd35d07624fde87498e6e5151b2a13baae25b1 (patch) | |
tree | 84fbb768b2f77cfb79969f1ceab6a0529b29dc93 /patches/server/0008-Adventure.patch | |
parent | 0116751101d8d1cbdb373b33a06ac265aa4e4e28 (diff) | |
download | Paper-73bd35d07624fde87498e6e5151b2a13baae25b1.tar.gz Paper-73bd35d07624fde87498e6e5151b2a13baae25b1.zip |
Updated Upstream (Bukkit/CraftBukkit)
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:
218294b1 PR-743: Support setting individual Wither head targets
CraftBukkit Changes:
d48f2d1a PR-1047: Support setting individual Wither head targets
518f1bee SPIGOT-6948: Motion from Explosion after Respawn
f3c7a6ac SPIGOT-7019: Add yaw in World#getSpawnLocation
Diffstat (limited to 'patches/server/0008-Adventure.patch')
-rw-r--r-- | patches/server/0008-Adventure.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0008-Adventure.patch b/patches/server/0008-Adventure.patch index 28080b8753..4d51d90abc 100644 --- a/patches/server/0008-Adventure.patch +++ b/patches/server/0008-Adventure.patch @@ -1163,7 +1163,7 @@ index 762a9392ffac3042356709dddd15bb3516048bed..3544e2dc2522e9d6305d727d56e73490 buf.writeComponent(this.footer); } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 3700c14c8fe5a52ad6eb6d1ca58232beea16c2d7..a29450df13bc32d5bc700a944541793a696a94d2 100644 +index 3431a70a07c08fdc20c7a8d667e6275f212b549e..d4d444b5864073fe86bfc7b5a68344b5aae8c05f 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -145,6 +145,7 @@ import net.minecraft.world.scores.Score; @@ -1777,7 +1777,7 @@ index d29c6d0536619fab5a48fbb52115dac09e7d7ca3..75871f74a25ee34db89a431de584b998 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index ee84148faf92daad40adbf90f89c5c19ea36ebcc..b889662e794cc4e00fae8a4ab5174af698fc0da2 100644 +index b8b47416b66ec2272ce9ffdc06b0a1dd91b4c05a..5476dc1e80093d7684bc238bae102cbb691cec4f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -143,6 +143,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -1788,7 +1788,7 @@ index ee84148faf92daad40adbf90f89c5c19ea36ebcc..b889662e794cc4e00fae8a4ab5174af6 private static final Random rand = new Random(); -@@ -1862,4 +1863,18 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -1863,4 +1864,18 @@ public class CraftWorld extends CraftRegionAccessor implements World { return this.spigot; } // Spigot end |