From 8515b9dd10a3b274443519e6868924b79e56e161 Mon Sep 17 00:00:00 2001 From: tterrag Date: Sat, 13 Apr 2019 21:42:42 -0400 Subject: [PATCH] Fix compile error in FakePlayer from cherry pick --- src/main/java/net/minecraftforge/common/util/FakePlayer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/common/util/FakePlayer.java b/src/main/java/net/minecraftforge/common/util/FakePlayer.java index ad290eaa52..9f1970e309 100644 --- a/src/main/java/net/minecraftforge/common/util/FakePlayer.java +++ b/src/main/java/net/minecraftforge/common/util/FakePlayer.java @@ -35,6 +35,7 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.math.Vec3d; import net.minecraft.world.WorldServer; import net.minecraft.world.dimension.DimensionType; +import net.minecraftforge.fml.server.ServerLifecycleHooks; //Preliminary, simple Fake Player class public class FakePlayer extends EntityPlayerMP @@ -55,5 +56,5 @@ public class FakePlayer extends EntityPlayerMP @Override public void tick(){ return; } @Override public Entity changeDimension(DimensionType dim, ITeleporter teleporter){ return this; } @Override public void handleClientSettings(CPacketClientSettings pkt){ return; } - @Override @Nullable public MinecraftServer getServer() { return FMLCommonHandler.instance().getMinecraftServerInstance(); } + @Override @Nullable public MinecraftServer getServer() { return ServerLifecycleHooks.getCurrentServer(); } }