1 files changed, 7 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
index b2a4e9a1..71a56c3f 100644
--- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java
+++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
@@ -112,16 +112,18 @@ public class ServerConfigurationManager {
     }
 
     public String c(EntityPlayer entityplayer) { // CraftBukkit - changed return type
-        this.n.a(entityplayer);
-        entityplayer.world.d(entityplayer); // CraftBukkit
-        this.b.remove(entityplayer);
-
         // CraftBukkit start
+        // Quitting must be before we do final save of data, in case plugins need to modify it
         ((WorldServer) entityplayer.world).manager.b(entityplayer);
         PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(server.getPlayer(entityplayer), "\u00A7e" + entityplayer.name + " left the game.");
         server.getPluginManager().callEvent(playerQuitEvent);
-        return playerQuitEvent.getQuitMessage();
         // CraftBukkit end
+
+        this.n.a(entityplayer);
+        entityplayer.world.d(entityplayer); // CraftBukkit
+        this.b.remove(entityplayer);
+
+        return playerQuitEvent.getQuitMessage(); // CraftBukkit
     }
 
     public EntityPlayer a(NetLoginHandler netloginhandler, String s, String s1) {