From f0e5baa8e561368de5dc53859728fee766617abd Mon Sep 17 00:00:00 2001
From: cpw <cpw@weeksfamily.ca>
Date: Mon, 7 Mar 2016 00:23:00 -0500
Subject: [PATCH] Few more compile fixups

---
 .../minecraftforge/common/util/FakePlayer.java    | 15 ++++++++-------
 .../minecraftforge/event/ForgeEventFactory.java   |  3 ++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/net/minecraftforge/common/util/FakePlayer.java b/src/main/java/net/minecraftforge/common/util/FakePlayer.java
index 27223a93e5..c9ba77dd98 100644
--- a/src/main/java/net/minecraftforge/common/util/FakePlayer.java
+++ b/src/main/java/net/minecraftforge/common/util/FakePlayer.java
@@ -2,15 +2,16 @@ package net.minecraftforge.common.util;
 
 import com.mojang.authlib.GameProfile;
 
+import net.minecraft.entity.Entity;
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.network.play.client.C15PacketClientSettings;
-import net.minecraft.server.management.ItemInWorldManager;
+import net.minecraft.network.play.client.CPacketClientSettings;
+import net.minecraft.server.management.PlayerInteractionManager;
 import net.minecraft.stats.StatBase;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.Vec3;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
 
@@ -19,10 +20,10 @@ public class FakePlayer extends EntityPlayerMP
 {
     public FakePlayer(WorldServer world, GameProfile name)
     {
-        super(FMLCommonHandler.instance().getMinecraftServerInstance(), world, name, new ItemInWorldManager(world));
+        super(FMLCommonHandler.instance().getMinecraftServerInstance(), world, name, new PlayerInteractionManager(world));
     }
 
-    @Override public Vec3 getPositionVector(){ return new Vec3(0, 0, 0); }
+    @Override public Vec3d getPositionVector(){ return new Vec3d(0, 0, 0); }
     @Override public boolean canCommandSenderUseCommand(int i, String s){ return false; }
     @Override public void addChatComponentMessage(ITextComponent chatmessagecomponent){}
     @Override public void addStat(StatBase par1StatBase, int par2){}
@@ -31,6 +32,6 @@ public class FakePlayer extends EntityPlayerMP
     @Override public boolean canAttackPlayer(EntityPlayer player){ return false; }
     @Override public void onDeath(DamageSource source){ return; }
     @Override public void onUpdate(){ return; }
-    @Override public void travelToDimension(int dim){ return; }
-    @Override public void handleClientSettings(C15PacketClientSettings pkt){ return; }
+    @Override public Entity func_184204_a(int dim){ return this; }
+    @Override public void handleClientSettings(CPacketClientSettings pkt){ return; }
 }
diff --git a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java
index 0c1fcaeb0e..0a4c646df0 100644
--- a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java
+++ b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java
@@ -27,6 +27,7 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.world.Explosion;
 import net.minecraft.world.World;
@@ -133,7 +134,7 @@ public class ForgeEventFactory
         return onPlayerInteract(player, action, world, pos, face, null);
     }
 
-    public static PlayerInteractEvent onPlayerInteract(EntityPlayer player, Action action, World world, BlockPos pos, EnumFacing face, Vec3 localPos)
+    public static PlayerInteractEvent onPlayerInteract(EntityPlayer player, Action action, World world, BlockPos pos, EnumFacing face, Vec3d localPos)
     {
         PlayerInteractEvent event = new PlayerInteractEvent(player, action, pos, face, world, localPos);
         MinecraftForge.EVENT_BUS.post(event);