From 064e95dcd2d5e50a444e3dff5ed74ab518c9881c Mon Sep 17 00:00:00 2001
From: Robotia <spuri4096@gmail.com>
Date: Mon, 1 Feb 2016 17:35:21 -0500
Subject: [PATCH] Reorder respawn + dimensionchange for #55

---
 .../server/management/ServerConfigurationManager.java.patch     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patches/net/minecraft/server/management/ServerConfigurationManager.java.patch b/patches/net/minecraft/server/management/ServerConfigurationManager.java.patch
index 55a2d5e..8d1ecf9 100644
--- a/patches/net/minecraft/server/management/ServerConfigurationManager.java.patch
+++ b/patches/net/minecraft/server/management/ServerConfigurationManager.java.patch
@@ -625,9 +625,9 @@
 +        // If world changed then fire the appropriate change world event else respawn
 +        if (fromWorld != location.getWorld())
 +        {
++            FMLCommonHandler.instance().firePlayerRespawnEvent(entityplayermp1);
 +            FMLCommonHandler.instance().firePlayerChangedDimensionEvent(entityplayermp1, ((CraftWorld) fromWorld).getHandle().provider.dimensionId,
 +                    ((CraftWorld) location.getWorld()).getHandle().provider.dimensionId, (CraftWorld) fromWorld); // Cauldron - fire forge changed dimension event
-+            FMLCommonHandler.instance().firePlayerRespawnEvent(entityplayermp1);
 +        }
 +        else
 +            FMLCommonHandler.instance().firePlayerRespawnEvent(entityplayermp1);