Don't set spawn world in PlayerInitialSpawnEvent

Fixes GH-85 and GH-157

Spigot-Server-Patches/0056-Add-PlayerInitialSpawnEvent.patch

@@ -1,4 +1,4 @@
-From df94d296af159e68e0b487c19c5b75fb19a9a605 Mon Sep 17 00:00:00 2001
+From 89d808a64409fe199f0cda9e3ef0163805a4bfc6 Mon Sep 17 00:00:00 2001
 From: Steve Anton <anxuiz.nx@gmail.com>
 Date: Thu, 3 Mar 2016 00:09:38 -0600
 Subject: [PATCH] Add PlayerInitialSpawnEvent
@@ -6,10 +6,10 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent
 For modifying a player's initial spawn location as they join the server
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ef76652..60b02f1 100644
+index ef76652..b636a71 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -99,6 +99,22 @@ public abstract class PlayerList {
+@@ -99,6 +99,21 @@ public abstract class PlayerList {
          }
          // CraftBukkit end
  
@@ -26,12 +26,11 @@ index ef76652..60b02f1 100644
 +        entityplayer.yaw = newLoc.getYaw();
 +        entityplayer.pitch = newLoc.getPitch();
 +        entityplayer.dimension = ((CraftWorld) newLoc.getWorld()).getHandle().dimension;
-+        entityplayer.spawnWorld = entityplayer.world.worldData.getName();
 +        // Paper end
 +
          entityplayer.spawnIn(this.server.getWorldServer(entityplayer.dimension));
          entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
          String s1 = "local";
 -- 
-2.7.1.windows.2
+2.7.4