From 4d15e07baee4d529f3b1e18ea71022f645c90ddf Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Wed, 5 May 2021 08:38:38 -0300
Subject: [PATCH] merge conflcts

---
 src/main/java/carpet/patches/EntityPlayerMPFake.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/java/carpet/patches/EntityPlayerMPFake.java b/src/main/java/carpet/patches/EntityPlayerMPFake.java
index 8c405be9..34674f7b 100644
--- a/src/main/java/carpet/patches/EntityPlayerMPFake.java
+++ b/src/main/java/carpet/patches/EntityPlayerMPFake.java
@@ -36,11 +36,6 @@ public class EntityPlayerMPFake extends ServerPlayerEntity
     {
         //prolly half of that crap is not necessary, but it works
         ServerWorld worldIn = server.getWorld(dimensionId);
-        GameProfile gameprofile = server.getUserCache().findByName(username);
-        if (gameprofile == null)
-        {
-            return null;
-        ServerPlayerInteractionManager interactionManagerIn = new ServerPlayerInteractionManager(worldIn);
         UserCache.setUseRemote(false);
         GameProfile gameprofile;
         try {