aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch
diff options
context:
space:
mode:
authorAikar <[email protected]>2020-07-03 02:08:00 -0400
committerAikar <[email protected]>2020-07-03 02:19:33 -0400
commitb3f265d1b1397081cc8133fc4540413b78ed4c37 (patch)
tree78700563448a5f00a75f56f5910f7013edab7eb1 /Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch
parentfcbeac8a992eb18ef31de4886a1311bf8364dbe4 (diff)
downloadPaper-b3f265d1b1397081cc8133fc4540413b78ed4c37.tar.gz
Paper-b3f265d1b1397081cc8133fc4540413b78ed4c37.zip
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: 0ca45a21 #503: Add PlayerHarvestBlockEvent dfa80a52 SPIGOT-5930: Add PlayerRespawnEvent#isAnchorSpawn CraftBukkit Changes: 145921e2 #676: Add PlayerHarvestBlockEvent 47abffa2 SPIGOT-5929: Angered zombified piglins do not inherit killed_by_player status 7f6b4f58 SPIGOT-5930: Add PlayerRespawnEvent#isAnchorSpawn 94eff632 SPIGOT-5867, MC-193339: NPE during shutdown when rcon enabled with no password 068618eb SPIGOT-5927: Some items NBT data disappears Spigot Changes: beb7d47c Rebuild patches Fixes #3738
Diffstat (limited to 'Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch')
-rw-r--r--Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch
index 7dbef00671..d7effbc682 100644
--- a/Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Workaround for setting passengers on players
SPIGOT-1915 & GH-114
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3d28ed4de1956d5ca7d11b63934a2bc174ef9d76..0654819e8fbbe923b1aa439983af020dc39c6734 100644
+index 2e8105fe1d0f5f953ac8ba94df3e8eb66b7813d7..532698f80bb2e266f27ae1d4b70c80138560b8cc 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -773,6 +773,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {