mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-29 23:09:33 +01:00
2f782a6652
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 CraftBukkit Changes:17543ecfSPIGOT-5035: Error Using Virtual Merchant GUI0fc6922bSPIGOT-5028: Villager#setVillagerExperience() doesn't workbdbdbe44SPIGOT-5024: Fox error - Unknown target reason
23 lines
1.1 KiB
Diff
23 lines
1.1 KiB
Diff
From 11c2fdaa7ce9519c578c7f93572d32ebcf12c49e Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Wed, 21 Sep 2016 23:48:39 -0400
|
|
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 43827ba087..e86943872d 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -191,6 +191,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
@Override
|
|
public void a(NBTTagCompound nbttagcompound) {
|
|
super.a(nbttagcompound);
|
|
+ if (this.locY > 300) this.locY = 257; // Paper - bring down to a saner Y level if out of world
|
|
if (nbttagcompound.hasKeyOfType("playerGameType", 99)) {
|
|
if (this.getMinecraftServer().getForceGamemode()) {
|
|
this.playerInteractManager.setGameMode(this.getMinecraftServer().getGamemode());
|
|
--
|
|
2.21.0
|
|
|