diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
index e828c4ddb5..61c02e4b0b 100644
--- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java
+++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
@@ -75,6 +75,9 @@ public class ServerConfigurationManager {
 
         this.c.e.a(entityplayer);
         this.d.a(entityplayer);
+
+        // CraftBukkit
+        server.getPluginManager().callEvent(new PlayerEvent(PlayerEvent.Type.PLAYER_JOIN, server.getPlayer(entityplayer)));
     }
 
     public void b(EntityPlayer entityplayer) {