@@ -32,15 +32,24 @@ public class OpenPlayer extends CraftPlayer {
 | 
				
			|||||||
        super(server, entity);
 | 
					        super(server, entity);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Override
 | 
				
			||||||
 | 
					    public void loadData() {
 | 
				
			||||||
 | 
					        // See CraftPlayer#loadData
 | 
				
			||||||
 | 
					        NBTTagCompound loaded = this.server.getHandle().playerFileData.load(this.getHandle());
 | 
				
			||||||
 | 
					        if (loaded != null) {
 | 
				
			||||||
 | 
					            readExtraData(loaded);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
    public void saveData() {
 | 
					    public void saveData() {
 | 
				
			||||||
        super.saveData();
 | 
					 | 
				
			||||||
        EntityPlayer player = this.getHandle();
 | 
					        EntityPlayer player = this.getHandle();
 | 
				
			||||||
        // See net.minecraft.server.WorldNBTStorage#save(EntityPlayer)
 | 
					        // See net.minecraft.server.WorldNBTStorage#save(EntityPlayer)
 | 
				
			||||||
        try {
 | 
					        try {
 | 
				
			||||||
            WorldNBTStorage worldNBTStorage = player.server.getPlayerList().playerFileData;
 | 
					            WorldNBTStorage worldNBTStorage = player.server.getPlayerList().playerFileData;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            NBTTagCompound playerData = player.save(new NBTTagCompound());
 | 
					            NBTTagCompound playerData = player.save(new NBTTagCompound());
 | 
				
			||||||
 | 
					            setExtraData(playerData);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if (!isOnline()) {
 | 
					            if (!isOnline()) {
 | 
				
			||||||
                // Special case: save old vehicle data
 | 
					                // Special case: save old vehicle data
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -57,8 +57,7 @@ public class PlayerDataManager implements IPlayerDataManager {
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @NotNull
 | 
					    public static @NotNull EntityPlayer getHandle(final Player player) {
 | 
				
			||||||
    public static EntityPlayer getHandle(final Player player) {
 | 
					 | 
				
			||||||
        if (player instanceof CraftPlayer) {
 | 
					        if (player instanceof CraftPlayer) {
 | 
				
			||||||
            return ((CraftPlayer) player).getHandle();
 | 
					            return ((CraftPlayer) player).getHandle();
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
@@ -78,9 +77,8 @@ public class PlayerDataManager implements IPlayerDataManager {
 | 
				
			|||||||
        return nmsPlayer;
 | 
					        return nmsPlayer;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Nullable
 | 
					 | 
				
			||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
    public Player loadPlayer(@NotNull final OfflinePlayer offline) {
 | 
					    public @Nullable Player loadPlayer(@NotNull final OfflinePlayer offline) {
 | 
				
			||||||
        // Ensure player has data
 | 
					        // Ensure player has data
 | 
				
			||||||
        if (!offline.hasPlayedBefore()) {
 | 
					        if (!offline.hasPlayedBefore()) {
 | 
				
			||||||
            return null;
 | 
					            return null;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user