aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch
diff options
context:
space:
mode:
authorAikar <[email protected]>2020-06-30 01:20:29 -0400
committerAikar <[email protected]>2020-06-30 01:20:29 -0400
commitab347c4c96b66cf4e67ac303b25fd86d4d17e2af (patch)
tree316c0ee6ebf1e4211aa0daade9ec325826be4e1e /Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch
parente2e09326d535695c9004da485576f6f16d8027e2 (diff)
downloadPaper-ab347c4c96b66cf4e67ac303b25fd86d4d17e2af.tar.gz
Paper-ab347c4c96b66cf4e67ac303b25fd86d4d17e2af.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: 42d5a714 SPIGOT-5899: Hoglins API similar to Piglins 2c1ee10e SPIGOT-5887: ClickType doesn't include off hand swaps 5ff7c7ce SPIGOT-5886: Missing BlockData CraftBukkit Changes: 7560f5f5 SPIGOT-5905: Fix hex colours not being allowed in MOTD d47c47ee SPIGOT-5889: Villager using composter should call EntityChangeBlockEvent 2fe6b4a3 SPIGOT-5899: Hoglins API similar to Piglins e09dbeca SPIGOT-5887: ClickType doesn't include off hand swaps 23aac2a5 SPIGOT-5903: EntityDismountEvent cannot be triggered asynchronously 92cbf656 SPIGOT-5884: Tab completions lost on reloadData / minecraft:reload fb4e54ad SPIGOT-5902: PlayerRespawnEvent places player at spawn before event is called aa8f3d5a SPIGOT-5901: Structures are generated in all worlds based on the setting for the main world a0c35937 SPIGOT-5895: PlayerChangedWorldEvent#getFrom is incorrect 89c0a5c3 SPIGOT-5886: Missing BlockData Spigot Changes: 0287a20d SPIGOT-5903: EntityDismountEvent cannot be triggered asynchronously
Diffstat (limited to 'Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch')
-rw-r--r--Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch
index b523521a58..b6b7c7786b 100644
--- a/Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Auto fix bad Y levels on player login
Bring down to a saner Y level if super high, as this can cause the server to crash
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 177f865688c40d0ecca72771007e2271626ab5cc..b7f7dd59fd9deaff9ec3797b395c91c91ce5b54c 100644
+index ab89e508ee8b8142fb7c0b5101b0b0e157a68f35..1f98d4bec282c46355e325dcb9fe0cb23394ba9e 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -206,6 +206,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -203,6 +203,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public void loadData(NBTTagCompound nbttagcompound) {
super.loadData(nbttagcompound);