removed all instances of new CraftEntity* where appropriate.

Entity.getBukkitEntity() is now used instead.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
index 670bcef5..0cd6b62c 100644
--- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java
+++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
@@ -7,6 +7,7 @@ import java.util.logging.Logger;
 // CraftBukkit start
 import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Player;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.player.PlayerEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
@@ -94,7 +95,8 @@ public class ServerConfigurationManager {
         // in the event, check with plugins to see if it's ok, and THEN kick
         // depending on the outcome.
         EntityPlayerMP entity = new EntityPlayerMP(c, ((World) (c.e)), s, new ItemInWorldManager(((World) (c.e))));
-        PlayerLoginEvent event = new PlayerLoginEvent(Type.PLAYER_LOGIN, new CraftPlayer(server, entity));
+        Player player = (entity == null)?null:(Player)entity.getBukkitEntity();
+        PlayerLoginEvent event = new PlayerLoginEvent(Type.PLAYER_LOGIN, player);
         // CraftBukkit end
 
         String s2 = ((netloginhandler.b.b())).toString();