Lag patch for fake players...! (needs testing)

CyberdyneCC · Aug 17, 2016 · 706c47a · 706c47a
1 parent 9d0865a
commit 706c47a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/patches/net/minecraftforge/common/util/FakePlayerFactory.java.patch b/patches/net/minecraftforge/common/util/FakePlayerFactory.java.patch
@@ -1,5 +1,14 @@
 --- ../src-base/minecraft/net/minecraftforge/common/util/FakePlayerFactory.java
 +++ ../src-work/minecraft/net/minecraftforge/common/util/FakePlayerFactory.java
+@@ -16,7 +16,7 @@
+ {
+     private static GameProfile MINECRAFT = new GameProfile(UUID.fromString("41C82C87-7AfB-4024-BA57-13D2C99CAE77"), "[Minecraft]");
+     // Map of all active fake player usernames to their entities
+-    private static Map<GameProfile, FakePlayer> fakePlayers = Maps.newHashMap();
++    public static Map<GameProfile, FakePlayer> fakePlayers = Maps.newHashMap();
+     private static FakePlayer MINECRAFT_PLAYER = null;
+
+     public static FakePlayer getMinecraft(WorldServer world)
 @@ -35,12 +35,24 @@
       */
      public static FakePlayer get(WorldServer world, GameProfile username)

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
@@ -9,6 +9,7 @@
 
 import com.mojang.authlib.GameProfile;
 
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
 
@@ -150,8 +151,8 @@ public Player getPlayer() {
                 return (player.playerNetServerHandler != null) ? player.playerNetServerHandler.getPlayerB() : null; // Cauldron
             }
         }
-
-        return null;
+        EntityPlayer player = net.minecraftforge.common.util.FakePlayerFactory.fakePlayers.get(profile);
+        return player != null ? (Player)player.getBukkitEntity() : null;
     }
 
     @Override